KSP-CKAN · HebaruSan · Dec 31, 2023 · Dec 31, 2023
diff --git a/Cmdline/ConsoleUser.cs b/Cmdline/ConsoleUser.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Text.RegularExpressions;
 using log4net;
 
 namespace CKAN.CmdLine
@@ -255,27 +254,31 @@ public void RaiseError(string message, params object[] args)
         /// <param name="percent">Progress in percent</param>
         public void RaiseProgress(string message, int percent)
         {
-            if (Regex.IsMatch(message, Properties.Resources.UserProgressDownloadSubstring, RegexOptions.IgnoreCase))
-            {
-                // In headless mode, only print a new message if the percent has changed,
-                // to reduce clutter in Jenkins for large downloads
-                if (!Headless || percent != previousPercent)
-                {
-                    // The \r at the front here causes download messages to *overwrite* each other.
-                    Console.Write("\r{0} - {1}%           ", message, percent);
-                    previousPercent = percent;
-                }
-            }
-            else
+            // The percent looks weird on non-download messages.
+            // The leading newline makes sure we don't end up with a mess from previous
+            // download messages.
+            GoToStartOfLine();
+            Console.Write("{0}", message);
+
+            // This message leaves the cursor at the end of a line of text
+            atStartOfLine = false;
+        }
+
+        public void RaiseProgress(int percent, long bytesPerSecond, long bytesLeft)
+        {
+            if (!Headless || percent != previousPercent)
             {
-                // The percent looks weird on non-download messages.
-                // The leading newline makes sure we don't end up with a mess from previous
-                // download messages.
                 GoToStartOfLine();
-                Console.Write("{0}", message);
+                var fullMsg = string.Format(CKAN.Properties.Resources.NetAsyncDownloaderProgress,
+                                            CkanModule.FmtSize(bytesPerSecond),
+                                            CkanModule.FmtSize(bytesLeft));
+                // The \r at the front here causes download messages to *overwrite* each other.
+                Console.Write("\r{0} - {1}%           ", fullMsg, percent);
+                previousPercent = percent;
+
+                // This message leaves the cursor at the end of a line of text
+                atStartOfLine = false;
             }
-            // These messages leave the cursor at the end of a line of text
-            atStartOfLine = false;
         }
 
         /// <summary>

diff --git a/ConsoleUI/Toolkit/ConsoleScreen.cs b/ConsoleUI/Toolkit/ConsoleScreen.cs
@@ -204,6 +204,21 @@ public void RaiseProgress(string message, int percent)
             Draw(userTheme);
         }
 
+        /// <summary>
+        /// Update a user visible progress bar
+        /// </summary>
+        /// <param name="percent">Value 0-100 representing the progress</param>
+        /// <param name="bytesPerSecond">Current download rate</param>
+        /// <param name="bytesLeft">Bytes remaining in the downloads</param>
+        public void RaiseProgress(int percent, long bytesPerSecond, long bytesLeft)
+        {
+            var fullMsg = string.Format(CKAN.Properties.Resources.NetAsyncDownloaderProgress,
+                                        CkanModule.FmtSize(bytesPerSecond),
+                                        CkanModule.FmtSize(bytesLeft));
+            Progress(fullMsg, percent);
+            Draw(userTheme);
+        }
+
         /// <summary>
         /// Forward a RaiseProgress request to child classes
         /// </summary>

diff --git a/Core/ModuleInstaller.cs b/Core/ModuleInstaller.cs
@@ -700,10 +700,12 @@ internal static string CopyZipEntry(ZipFile zipfile, ZipEntry entry, string full
                 foreach (string mod in goners)
                 {
                     int percent_complete = (step++ * 100) / goners.Count;
-                    User.RaiseProgress(
-                        string.Format(Properties.Resources.ModuleInstallerRemovingMod, mod),
-                        percent_complete);
-                    Uninstall(mod, ref possibleConfigOnlyDirs, registry_manager.registry);
+                    var registry = registry_manager.registry;
+                    User.RaiseProgress(string.Format(Properties.Resources.ModuleInstallerRemovingMod,
+                                                     registry.InstalledModule(mod)?.Module.ToString()
+                                                     ?? mod),
+                                       percent_complete);
+                    Uninstall(mod, ref possibleConfigOnlyDirs, registry);
                 }
 
                 // Enforce consistency if we're not installing anything,

diff --git a/Core/Net/NetAsyncDownloader.cs b/Core/Net/NetAsyncDownloader.cs
@@ -346,10 +346,12 @@ private void DownloadModule(NetAsyncDownloaderDownloadPart dl)
         /// true to queue, false to start immediately
         /// </returns>
         private bool shouldQueue(Uri url)
-            => !url.IsFile
+            => !url.IsFile && url.IsAbsoluteUri
                // Ignore inactive downloads
                && downloads.Except(queuedDownloads)
-                           .Any(dl => (!dl.CurrentUri.IsAbsoluteUri || dl.CurrentUri.Host == url.Host)
+                           .Any(dl => dl.CurrentUri != url
+                                      // Look for active downloads from the same host
+                                      && (dl.CurrentUri.IsAbsoluteUri && dl.CurrentUri.Host == url.Host)
                                       // Consider done if no bytes left
                                       && dl.bytesLeft > 0
                                       // Consider done if already tried and failed
@@ -422,11 +424,7 @@ private void FileProgressReport(int index, long bytesDownloaded, long bytesToDow
             }
 
             int totalPercentage = (int)(((totalSize - totalBytesLeft) * 100) / (totalSize));
-            User.RaiseProgress(
-                string.Format(Properties.Resources.NetAsyncDownloaderProgress,
-                    CkanModule.FmtSize(totalBytesPerSecond),
-                    CkanModule.FmtSize(totalBytesLeft)),
-                totalPercentage);
+            User.RaiseProgress(totalPercentage, totalBytesPerSecond, totalBytesLeft);
         }
 
         private void PopFromQueue(string host)

diff --git a/Core/Net/NetAsyncModulesDownloader.cs b/Core/Net/NetAsyncModulesDownloader.cs
@@ -138,8 +138,9 @@ private void ModuleDownloadComplete(Uri url, string filename, Exception error, s
                 CkanModule module = null;
                 try
                 {
-                    module = modules.First(m => m.download?.Any(dlUri => dlUri == url)
-                                                ?? false);
+                    module = modules.First(m => (m.download?.Any(dlUri => dlUri == url)
+                                                 ?? false)
+                                                || m.InternetArchiveDownload == url);
                     User.RaiseMessage(Properties.Resources.NetAsyncDownloaderValidating, module);
                     cache.Store(module, filename,
                         new Progress<long>(percent => StoreProgress?.Invoke(module, 100 - percent, 100)),

diff --git a/Core/Properties/Resources.resx b/Core/Properties/Resources.resx
@@ -121,9 +121,9 @@
   <data name="NetDownloading" xml:space="preserve"><value>Downloading {0}</value></data>
   <data name="NetMissingCertFailed" xml:space="preserve"><value>Failed downloading {0}</value></data>
   <data name="NetInvalidLocation" xml:space="preserve"><value>Invalid URL in Location header: {0}</value></data>
-  <data name="NetAsyncDownloaderDownloading" xml:space="preserve"><value>Downloading "{0}"</value></data>
+  <data name="NetAsyncDownloaderDownloading" xml:space="preserve"><value>Downloading {0} ...</value></data>
   <data name="NetAsyncDownloaderCancelled" xml:space="preserve"><value>Download cancelled by user</value></data>
-  <data name="NetAsyncDownloaderProgress" xml:space="preserve"><value>{0}/sec - downloading - {1} left</value><comment>Should contain UserProgressDownloadSubstring from CmdLine</comment></data>
+  <data name="NetAsyncDownloaderProgress" xml:space="preserve"><value>{0}/sec - downloading - {1} left</value></data>
   <data name="NetAsyncDownloaderTryingFallback" xml:space="preserve"><value>Failed to download "{0}", trying fallback "{1}"</value></data>
   <data name="NetAsyncDownloaderValidating" xml:space="preserve"><value>Finished downloading {0}, validating and storing to cache...</value></data>
   <data name="NetFileCacheCannotFind" xml:space="preserve"><value>Cannot find cache directory: {0}</value></data>
@@ -209,11 +209,11 @@ Install the `mono-complete` package or equivalent for your operating system.</va
   <data name="GameInstanceNoValidName" xml:space="preserve"><value>Could not return a valid name for the new instance</value></data>
   <data name="GameInstanceByPathName" xml:space="preserve"><value>custom</value></data>
   <data name="GameInstancePathNotFound" xml:space="preserve"><value>{0} does not exist</value></data>
-  <data name="ModuleInstallerDownloading" xml:space="preserve"><value>Downloading "{0}"</value></data>
+  <data name="ModuleInstallerDownloading" xml:space="preserve"><value>Downloading {0} ...</value></data>
   <data name="ModuleInstallerNothingToInstall" xml:space="preserve"><value>Nothing to install</value></data>
   <data name="ModuleInstallerAboutToInstall" xml:space="preserve"><value>About to install:</value></data>
   <data name="ModuleInstallerUserDeclined" xml:space="preserve"><value>User declined install list</value></data>
-  <data name="ModuleInstallerInstallingMod" xml:space="preserve"><value>Installing mod "{0}"</value></data>
+  <data name="ModuleInstallerInstallingMod" xml:space="preserve"><value>Installing {0}...</value></data>
   <data name="ModuleInstallerUpdatingRegistry" xml:space="preserve"><value>Updating registry</value></data>
   <data name="ModuleInstallerCommitting" xml:space="preserve"><value>Committing filesystem changes</value></data>
   <data name="ModuleInstallerRescanning" xml:space="preserve"><value>Rescanning {0}</value></data>

diff --git a/Core/Registry/Registry.cs b/Core/Registry/Registry.cs
@@ -1305,10 +1305,11 @@ public IEnumerable<string> GetAllHosts()
             => repoDataMgr.GetAllAvailableModules(repositories.Values)
                           // Pick all latest modules where download is not null
                           // Merge all the URLs into one sequence
-                          .SelectMany(availMod => availMod?.Latest()?.download
-                                                  ?? Enumerable.Empty<Uri>())
+                          .SelectMany(availMod => (availMod?.Latest()?.download
+                                                   ?? Enumerable.Empty<Uri>())
+                                                  .Append(availMod?.Latest()?.InternetArchiveDownload))
                           // Skip relative URLs because they don't have hosts
-                          .Where(dlUri => dlUri.IsAbsoluteUri)
+                          .Where(dlUri => dlUri?.IsAbsoluteUri ?? false)
                           // Group the URLs by host
                           .GroupBy(dlUri => dlUri.Host)
                           // Put most commonly used hosts first

diff --git a/Core/Repositories/RepositoryDataManager.cs b/Core/Repositories/RepositoryDataManager.cs
@@ -172,7 +172,6 @@ public enum UpdateResult
                     targets.Select(t => new FileInfo(t.filename).Length));
                 foreach ((Repository repo, Net.DownloadTarget target) in toUpdate.Zip(targets))
                 {
-                    user.RaiseMessage(Properties.Resources.NetRepoLoadingModulesFromRepo, repo.name);
                     var file = target.filename;
                     msg = string.Format(Properties.Resources.NetRepoLoadingModulesFromRepo,
                                         repo.name);

diff --git a/Core/User.cs b/Core/User.cs
@@ -21,6 +21,7 @@ public interface IUser
         void RaiseError(string message, params object[] args);
 
         void RaiseProgress(string message, int percent);
+        void RaiseProgress(int percent, long bytesPerSecond, long bytesLeft);
         void RaiseMessage(string message, params object[] args);
     }
 
@@ -59,6 +60,10 @@ public void RaiseProgress(string message, int percent)
         {
         }
 
+        public void RaiseProgress(int percent, long bytesPerSecond, long bytesLeft)
+        {
+        }
+
         public void RaiseMessage(string message, params object[] args)
         {
         }

diff --git a/GUI/Controls/EditModSearch.cs b/GUI/Controls/EditModSearch.cs
@@ -68,6 +68,8 @@ public void ExpandCollapse()
         /// </summary>
         public event Action SurrenderFocus;
 
+        public event Action<string> ShowError;
+
         public ModSearch Search
         {
             get => currentSearch;
@@ -141,7 +143,7 @@ private void ImmediateHandler(object sender, EventArgs e)
             }
             catch (Kraken k)
             {
-                Main.Instance?.AddStatusMessage(k.Message);
+                ShowError?.Invoke(k.Message);
             }
         }
 

diff --git a/GUI/Controls/EditModSearches.cs b/GUI/Controls/EditModSearches.cs
@@ -26,6 +26,7 @@ public EditModSearches()
 
         public event Action                  SurrenderFocus;
         public event Action<List<ModSearch>> ApplySearches;
+        public event Action<string>          ShowError;
 
         public void Clear()
         {
@@ -113,6 +114,7 @@ private EditModSearch AddSearch()
             };
             ctl.ApplySearch    += EditModSearch_ApplySearch;
             ctl.SurrenderFocus += EditModSearch_SurrenderFocus;
+            ctl.ShowError      += error => ShowError?.Invoke(error);
 
             editors.Add(ctl);
             Controls.Add(ctl);

diff --git a/GUI/Controls/ManageMods.Designer.cs b/GUI/Controls/ManageMods.Designer.cs