Merge pull request #1 from pjf/394_tests

Extra tests for GameData pathed installs
KSP-CKAN · Nov 18, 2014 · fd3f99d · fd3f99d
2 parents 2e1a084 + d5e2393
commit fd3f99d
Show file tree

Hide file tree

Showing 20 changed files with 636 additions and 786 deletions.
diff --git a/CKAN/CKAN/ModuleInstaller.cs b/CKAN/CKAN/ModuleInstaller.cs
@@ -157,7 +157,8 @@ public static string CachedOrDownload(string identifier, Version version, Uri ur
         // TODO: Break this up into smaller pieces! It's huge!
         public void InstallList(
             List<string> modules,
-            RelationshipResolverOptions options
+            RelationshipResolverOptions options,
+            NetAsyncDownloader downloader = null
         )
         {
             onReportProgress = onReportProgress ?? ((message, progress) => { });
@@ -195,7 +196,11 @@ RelationshipResolverOptions options
 
             if (downloads.Count > 0)
             {
-                var downloader = new NetAsyncDownloader();
+                if (downloader == null)
+                {
+                    downloader = new NetAsyncDownloader();
+                }
+
                 downloader.DownloadModules(ksp.Cache, downloads, onReportProgress);
             }
 

diff --git a/CKAN/CKAN/Net/NetAsyncDownloader.cs b/CKAN/CKAN/Net/NetAsyncDownloader.cs
@@ -159,6 +159,11 @@ public void DownloadModules(
             // If the user cancelled our progress, then signal that.
             if (downloadCanceled)
             {
+                foreach (var download in downloads)
+                {
+                    download.agent.CancelAsync();
+                }
+
                 throw new CancelledActionKraken("Download cancelled by user");
             }
 
@@ -242,17 +247,17 @@ public void CancelDownload()
         {
             log.Debug("Cancelling download");
 
-            foreach (var download in downloads)
+            downloadCanceled = true;
+
+            lock (download_complete_lock)
             {
-                download.agent.CancelAsync();
+               Monitor.Pulse(download_complete_lock);
             }
 
             if (onCompleted != null)
             {
                 onCompleted(null, null, null);
             }
-
-            downloadCanceled = true;
         }
 
         /// <summary>

diff --git a/CKAN/GUI/ApplyChangesDialog.Designer.cs b/CKAN/GUI/ApplyChangesDialog.Designer.cs
diff --git a/CKAN/GUI/ApplyChangesDialog.resx b/CKAN/GUI/ApplyChangesDialog.resx
diff --git a/CKAN/GUI/CKAN-GUI.csproj b/CKAN/GUI/CKAN-GUI.csproj
@@ -36,12 +36,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApplyChangesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ApplyChangesDialog.Designer.cs">
-      <DependentUpon>ApplyChangesDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="ChooseKSPInstance.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -62,15 +56,22 @@
     <Compile Include="KSPCommandLineOptionsDialog.Designer.cs">
       <DependentUpon>KSPCommandLineOptionsDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="MainChangeset.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="MainModInfo.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="MainWait.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="RenameInstanceDialog.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="RenameInstanceDialog.Designer.cs">
       <DependentUpon>RenameInstanceDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="TabController.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="Main.cs">
       <SubType>Form</SubType>
@@ -104,21 +105,12 @@
     <Compile Include="SettingsDialog.Designer.cs">
       <DependentUpon>SettingsDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="WaitDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="WaitDialog.Designer.cs">
-      <DependentUpon>WaitDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="YesNoDialog.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="YesNoDialog.Designer.cs">
       <DependentUpon>YesNoDialog.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="ApplyChangesDialog.resx">
-      <DependentUpon>ApplyChangesDialog.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="ChooseKSPInstance.resx">
       <DependentUpon>ChooseKSPInstance.cs</DependentUpon>
     </EmbeddedResource>
@@ -151,9 +143,6 @@
     <EmbeddedResource Include="SettingsDialog.resx">
       <DependentUpon>SettingsDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WaitDialog.resx">
-      <DependentUpon>WaitDialog.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="YesNoDialog.resx">
       <DependentUpon>YesNoDialog.cs</DependentUpon>
     </EmbeddedResource>
@@ -202,4 +191,4 @@
   <ItemGroup>
     <None Include="Resources\ksp.jpg" />
   </ItemGroup>
-</Project>
+</Project>