Use shared installer code in GUI

KSP-CKAN · Dec 24, 2017 · 13792f1 · 13792f1
1 parent 91e248c
commit 13792f1
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 202 deletions.
diff --git a/Core/ModuleInstaller.cs b/Core/ModuleInstaller.cs
@@ -190,12 +190,12 @@ public void InstallList(
             {
                 if (!ksp.Cache.IsCachedZip(module.download))
                 {
-                    User.RaiseMessage(" * {0} {1}", module.name, module.version);
+                    User.RaiseMessage(" * {0} {1} ({2})", module.name, module.version, module.download.Host);
                     downloads.Add(module);
                 }
                 else
                 {
-                    User.RaiseMessage(" * {0} {1}(cached)", module.name, module.version);
+                    User.RaiseMessage(" * {0} {1} (cached)", module.name, module.version);
                 }
             }
 
@@ -255,23 +255,6 @@ public void InstallList(
             User.RaiseProgress("Done!\r\n", 100);
         }
 
-        public ModuleResolution ResolveModules(IEnumerable<CkanModule> modules, RelationshipResolverOptions options)
-        {
-            var resolver = new RelationshipResolver(modules, options, registry_manager.registry, ksp.VersionCriteria());
-            return new ModuleResolution(resolver.ModList(), m => ksp.Cache.IsCachedZip(m.download));
-        }
-
-        public void EnsureCache(List<CkanModule> modules, IDownloader downloader = null)
-        {
-            if (!modules.Any())
-            {
-                return;
-            }
-
-            downloader = downloader ?? new NetAsyncModulesDownloader(User);
-            downloader.DownloadModules(ksp.Cache, modules);
-        }
-
         public void InstallList(ModuleResolution modules, RelationshipResolverOptions options)
         {
             // We're about to install all our mods; so begin our transaction.
@@ -1035,7 +1018,7 @@ public void AddRemove(IEnumerable<CkanModule> add = null, IEnumerable<string> re
         /// Will *re-install* with warning even if an upgrade is not available.
         /// Throws ModuleNotFoundKraken if module is not installed, or not available.
         /// </summary>
-        public void Upgrade(IEnumerable<string> identifiers, NetAsyncModulesDownloader netAsyncDownloader, bool enforceConsistency = true)
+        public void Upgrade(IEnumerable<string> identifiers, IDownloader netAsyncDownloader, bool enforceConsistency = true)
         {
             var options = new RelationshipResolverOptions();
 
@@ -1052,7 +1035,7 @@ public void Upgrade(IEnumerable<string> identifiers, NetAsyncModulesDownloader n
         /// Will *re-install* or *downgrade* (with a warning) as well as upgrade.
         /// Throws ModuleNotFoundKraken if a module is not installed.
         /// </summary>
-        public void Upgrade(IEnumerable<CkanModule> modules, NetAsyncModulesDownloader netAsyncDownloader, bool enforceConsistency = true)
+        public void Upgrade(IEnumerable<CkanModule> modules, IDownloader netAsyncDownloader, bool enforceConsistency = true)
         {
             // Start by making sure we've downloaded everything.
             DownloadModules(modules, netAsyncDownloader);
@@ -1112,7 +1095,7 @@ public void Upgrade(IEnumerable<CkanModule> modules, NetAsyncModulesDownloader n
         /// <summary>
         /// Makes sure all the specified mods are downloaded.
         /// </summary>
-        private void DownloadModules(IEnumerable<CkanModule> mods, NetAsyncModulesDownloader downloader)
+        private void DownloadModules(IEnumerable<CkanModule> mods, IDownloader downloader)
         {
             List<CkanModule> downloads = mods.Where(module => !ksp.Cache.IsCachedZip(module.download)).ToList();
 

diff --git a/Core/Net/AutoUpdate.cs b/Core/Net/AutoUpdate.cs
@@ -193,7 +193,7 @@ internal Tuple<Uri, long> RetrieveUrl(dynamic response, int whichOne)
         internal dynamic MakeRequest(Uri url)
         {
             var web = new WebClient();
-            web.Headers.Add("user-agent", Net.UserAgentString);
+            web.Headers.Add("User-Agent", Net.UserAgentString);
 
             try
             {

diff --git a/Core/Net/NetAsyncDownloader.cs b/Core/Net/NetAsyncDownloader.cs
@@ -39,7 +39,7 @@ public NetAsyncDownloaderDownloadPart(Uri url, long expectedSize, string path =
                 size = expectedSize;
                 lastProgressUpdateTime = DateTime.Now;
 
-                agent.Headers.Add("user-agent", Net.UserAgentString);
+                agent.Headers.Add("User-Agent", Net.UserAgentString);
             }
         }