From e35ea514809bce211055ce41bf1785e0ac51f492 Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Sun, 10 May 2020 15:35:15 -0600
Subject: [PATCH] Hotfix: support WJ CDN files in the gallery

---
 CHANGELOG.md                                        |  4 ++++
 Wabbajack.CLI/Wabbajack.CLI.csproj                  |  4 ++--
 Wabbajack.Launcher/Wabbajack.Launcher.csproj        |  4 ++--
 Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs |  9 +++++++--
 Wabbajack.Server/Wabbajack.Server.csproj            |  4 ++--
 Wabbajack.Test/TestUtils.cs                         | 11 ++++++++++-
 Wabbajack/Wabbajack.csproj                          |  4 ++--
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59936cca..871aa8f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Changelog
 
+#### Version - 2.0.4.2 - 5/10/2020
+* Hotfix: allow the WJ CDN to be used for gallery modlists
+* Fix a bug with the CDN downloader and modlist compilation
+
 #### Version - 2.0.4.1 - 5/10/2020
 * Hotfix: don't throw a compilation exceptions when metas can't be inferred
 
diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj
index ae6ca940..487bda6b 100644
--- a/Wabbajack.CLI/Wabbajack.CLI.csproj
+++ b/Wabbajack.CLI/Wabbajack.CLI.csproj
@@ -6,8 +6,8 @@
         <AssemblyName>wabbajack-cli</AssemblyName>
         <Company>Wabbajack</Company>
         <Platforms>x64</Platforms>
-        <AssemblyVersion>2.0.4.1</AssemblyVersion>
-        <FileVersion>2.0.4.1</FileVersion>
+        <AssemblyVersion>2.0.4.2</AssemblyVersion>
+        <FileVersion>2.0.4.2</FileVersion>
         <Copyright>Copyright © 2019-2020</Copyright>
         <Description>An automated ModList installer</Description>
         <PublishReadyToRun>true</PublishReadyToRun>        
diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
index 58162f3c..c468a354 100644
--- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj
+++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
@@ -4,8 +4,8 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <UseWPF>true</UseWPF>
-        <AssemblyVersion>2.0.4.1</AssemblyVersion>
-        <FileVersion>2.0.4.1</FileVersion>
+        <AssemblyVersion>2.0.4.2</AssemblyVersion>
+        <FileVersion>2.0.4.2</FileVersion>
         <Copyright>Copyright © 2019-2020</Copyright>
         <Description>Wabbajack Application Launcher</Description>
         <PublishReadyToRun>true</PublishReadyToRun>
diff --git a/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs b/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs
index d0a8720b..b41a595f 100644
--- a/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs
+++ b/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs
@@ -12,7 +12,7 @@ using Wabbajack.Lib.Validation;
 
 namespace Wabbajack.Lib.Downloaders
 {
-    public class WabbajackCDNDownloader : IDownloader
+    public class WabbajackCDNDownloader : IDownloader, IUrlDownloader
     {
         public async Task<AbstractDownloadState?> GetDownloaderState(dynamic archiveINI, bool quickMode = false)
         {
@@ -24,7 +24,12 @@ namespace Wabbajack.Lib.Downloaders
         {
         }
 
-       
+        public AbstractDownloadState? GetDownloaderState(string url)
+        {
+            return StateFromUrl(new Uri(url));
+        }
+
+
         public static AbstractDownloadState? StateFromUrl(Uri url)
         {
             if (url.Host == "wabbajacktest.b-cdn.net" || url.Host == "wabbajack.b-cdn.net")
diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj
index cb89131f..4ec7ed2a 100644
--- a/Wabbajack.Server/Wabbajack.Server.csproj
+++ b/Wabbajack.Server/Wabbajack.Server.csproj
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-        <AssemblyVersion>2.0.4.1</AssemblyVersion>
-        <FileVersion>2.0.4.1</FileVersion>
+        <AssemblyVersion>2.0.4.2</AssemblyVersion>
+        <FileVersion>2.0.4.2</FileVersion>
         <Copyright>Copyright © 2019-2020</Copyright>
         <Description>Wabbajack Server</Description>
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
diff --git a/Wabbajack.Test/TestUtils.cs b/Wabbajack.Test/TestUtils.cs
index b7175090..6ce97b00 100644
--- a/Wabbajack.Test/TestUtils.cs
+++ b/Wabbajack.Test/TestUtils.cs
@@ -216,8 +216,17 @@ namespace Wabbajack.Test
             return InstallFolder.Combine((string)Consts.MO2ModFolderName, mod, file);
         }
 
-        public void VerifyAllFiles()
+        public void VerifyAllFiles(bool gameFileShouldNotExistInGameFolder = true)
         {
+            if (gameFileShouldNotExistInGameFolder)
+            {
+                foreach (var file in Game.MetaData().RequiredFiles!)
+                {
+                    Assert.False(InstallFolder.Combine(Consts.GameFolderFilesDir, (RelativePath)file).Exists);
+                }
+            }
+
+
             var skipFiles = new []{"portable.txt"}.Select(e => (RelativePath)e).ToHashSet();
             foreach (var destFile in InstallFolder.EnumerateFiles())
             {
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 89af1e7b..a87a9507 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -6,8 +6,8 @@
     <UseWPF>true</UseWPF>
     <Platforms>x64</Platforms>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-      <AssemblyVersion>2.0.4.1</AssemblyVersion>
-      <FileVersion>2.0.4.1</FileVersion>
+      <AssemblyVersion>2.0.4.2</AssemblyVersion>
+      <FileVersion>2.0.4.2</FileVersion>
     <Copyright>Copyright © 2019-2020</Copyright>
     <Description>An automated ModList installer</Description>
     <PublishReadyToRun>true</PublishReadyToRun>