Merge #2892 Notify when falling back to archive.org URL

KSP-CKAN · Oct 19, 2019 · fbcb3a9 · fbcb3a9
2 parents 37f5388 + b5e40d9
commit fbcb3a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Normalize install paths (#2887 by: HebaruSan; reviewed: DasSkelett)
 - [Multiple] Fixes for KSP in Windows drive root (#2857 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Use current metadata for installed module compatibility (#2886 by: HebaruSan; reviewed: DasSkelett)
+- [Core] Notify when falling back to archive.org URL (#2892 by: HebaruSan; reviewed: DasSkelett)
 
 ### Internal
 

diff --git a/Core/Net/NetAsyncDownloader.cs b/Core/Net/NetAsyncDownloader.cs
@@ -480,6 +480,11 @@ private void FileDownloadComplete(int index, Exception error)
                 if (!downloads[index].triedFallback && downloads[index].fallbackUrl != null)
                 {
                     log.InfoFormat("Trying fallback URL: {0}", downloads[index].fallbackUrl);
+                    // Encode spaces to avoid confusing URL parsers
+                    User.RaiseMessage("Failed to download \"{0}\", trying fallback \"{1}\"",
+                        downloads[index].url.ToString().Replace(" ", "%20"),
+                        downloads[index].fallbackUrl.ToString().Replace(" ", "%20")
+                    );
                     // Try the fallbackUrl
                     downloads[index].triedFallback = true;
                     downloads[index].Download(downloads[index].fallbackUrl, downloads[index].path);
@@ -503,4 +508,4 @@ private void FileDownloadComplete(int index, Exception error)
             }
         }
     }
-}
+}