Merge pull request #158 from MacTee/dev

Dev merge - Version 2.3.0.7
- Fixes for issues #151 & #153

KSPModAdmin.Core/Controller/MainController.cs

@@ -654,7 +654,10 @@ protected static void LoadPlugins()
         /// </summary>
         protected static void AsyncTaskDone(object sender)
         {
-            View.cbKSPPath.Enabled = true;
+            View.InvokeIfRequired(() =>
+            {
+                View.cbKSPPath.Enabled = true;
+            });
         }
 
         /// <summary>
@@ -663,7 +666,10 @@ protected static void AsyncTaskDone(object sender)
         /// </summary>
         protected static void AsyncTaskStarted(object sender)
         {
-            View.cbKSPPath.Enabled = false;
+            View.InvokeIfRequired(() =>
+            {
+                View.cbKSPPath.Enabled = false;
+            });
         }
 
         /// <summary>

KSPModAdmin.Core/Controller/ModSelectionController.cs

@@ -1499,10 +1499,10 @@ public static void OpenExportImportDialog()
         public static void CreateZip(List<ModNode> nodes)
         {
             // get path for the zip
-            if (!Directory.Exists(OptionsController.DownloadPath))
+            if (!OptionsController.HasValidDownloadPath)
                 OptionsController.SelectNewDownloadPath();
 
-            if (!Directory.Exists(OptionsController.DownloadPath))
+            if (!OptionsController.HasValidDownloadPath)
             {
                 Messenger.AddInfo(Messages.MSG_ERROR_NO_DOWNLOAD_FOLDER_SELECTED);
                 Messenger.AddInfo(Messages.MSG_ZIP_CREATION_ABORTED);

KSPModAdmin.Core/Controller/OptionsController.cs

@@ -271,6 +271,14 @@ public static int SearchDepth
             set { if (View != null) View.SearchDepth = value; }
         }
 
+        public static bool HasValidDownloadPath
+        {
+            get
+            {
+                return !string.IsNullOrEmpty(DownloadPath) && Directory.Exists(DownloadPath);
+            }
+        }
+
         #endregion
 
         #region Misc
@@ -504,6 +512,7 @@ public static string SelectedLanguage
         /// </summary>
         private OptionsController()
         {
+            OtherAppOptions = new Dictionary<string, string>();
         }
 
         /// <summary>
@@ -701,10 +710,10 @@ private static string GetDownloadMSG(Dictionary<string, string> parameter)
         private static void DownloadNewAdminVersion()
         {
             // get valid download path.
-            if (string.IsNullOrEmpty(DownloadPath) || !Directory.Exists(DownloadPath))
+            if (!OptionsController.HasValidDownloadPath)
                 SelectNewDownloadPath();
 
-            if (!string.IsNullOrEmpty(DownloadPath) && Directory.Exists(DownloadPath))
+            if (OptionsController.HasValidDownloadPath)
             {
                 string filename = View.llblAdminDownload.Text;
                 string url = string.Empty;
@@ -964,7 +973,7 @@ public static void OpenKSPRoot()
         /// </summary>
         public static void OpenDownloadFolder()
         {
-            if (string.IsNullOrEmpty(DownloadPath))
+            if (!OptionsController.HasValidDownloadPath)
             {
                 MessageBox.Show(View.ParentForm, string.Format(Messages.MSG_SELECT_0_FOLDER_FIRST, DOWNLOAD));
                 return;
@@ -1008,7 +1017,7 @@ public static string SelectNewDownloadPath()
 
             string pathUser = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
             string pathDownload = Path.Combine(pathUser, DOWNLOADS);
-            if (!string.IsNullOrEmpty(DownloadPath))
+            if (OptionsController.HasValidDownloadPath)
                 pathDownload = DownloadPath;
 
             FolderSelectDialog dlg = new FolderSelectDialog();

KSPModAdmin.Core/KSPModAdmin.Core.csproj

@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -96,6 +98,15 @@
     <Compile Include="Config\KSPConfig.cs" />
     <Compile Include="Messages.cs" />
     <Compile Include="Model\ICopyModInfo.cs" />
+    <Compile Include="Utils\CKAN\CkanArchive.cs" />
+    <Compile Include="Utils\CKAN\CkanMod.cs" />
+    <Compile Include="Utils\CKAN\CkanRepoManager.cs" />
+    <Compile Include="Utils\CKAN\Json\CkanInstallInfo.cs" />
+    <Compile Include="Utils\CKAN\Json\CkanModInfo.cs" />
+    <Compile Include="Utils\CKAN\Json\CkanRelation.cs" />
+    <Compile Include="Utils\CKAN\Json\CkanRepository.cs" />
+    <Compile Include="Utils\CKAN\Json\CkanResource.cs" />
+    <Compile Include="Utils\CKAN\Json\JsonSingleOrArrayConverter.cs" />
     <Compile Include="Utils\Controls\TabControlEx.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -705,7 +716,6 @@
     <None Include="Resources\folder_add.png" />
     <None Include="Resources\page.png" />
     <None Include="Resources\page_add.png" />
-    <None Include="Settings.StyleCop" />
     <None Include="Utils\Controls\TreeViewAdv\NodeControls\ClassDiagram.cd" />
     <None Include="Utils\SiteHandler\xPathConfigs\CurseForgeXPaths.cfg" />
   </ItemGroup>
@@ -780,7 +790,6 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

KSPModAdmin.Core/Utils/CKAN/CkanArchive.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+
+namespace KSPMODAdmin.Core.Utils.Ckan
+{
+    /// <summary>
+    /// Class that contains all information from a Ckan Repository archive.
+    /// </summary>
+    public class CkanArchive
+    {
+        /// <summary>
+        /// The CKAN Repository information from which this Archive comes from.
+        /// </summary>
+        public CkanRepository Repository { get; set; }
+
+        /// <summary>
+        /// The full path to the CKAN Repository archive.
+        /// </summary>
+        public string FullPath { get; set; }
+
+        /// <summary>
+        /// A List of all Mods that this CKAN Repository Archive contains.
+        /// </summary>
+        public Dictionary<string, CkanMod> Mods { get; set; }
+
+        /// <summary>
+        /// Creates a instance of the class CkanArchive.
+        /// </summary>
+        public CkanArchive()
+        {
+            Mods = new Dictionary<string, CkanMod>();
+        }
+    }
+}

KSPModAdmin.Core/Utils/CKAN/CkanMod.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+
+namespace KSPMODAdmin.Core.Utils.Ckan
+{
+    /// <summary>
+    /// Class that represents a mod entry in a CKAN Repository archive.
+    /// </summary>
+    public class CkanMod
+    {
+        /// <summary>
+        /// Name of the mod.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The all known CKAN ModInfos for this mod.
+        /// </summary>
+        public List<CkanModInfo> ModInfos { get; set; }
+
+        /// <summary>
+        /// Path to the CKAN Repository archive.
+        /// </summary>
+        public string ArchivePath { get; set; }
+
+        /// <summary>
+        /// Creates a new instance of the class CkanMod.
+        /// </summary>
+        public CkanMod()
+        {
+            ModInfos = new List<CkanModInfo>();
+        }
+    }
+}