fix: fixed the download error.

ArchiDog1998 · Apr 10, 2023 · 8dd6e92 · 8dd6e92
1 parent ce4adf3
commit 8dd6e92
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/Resources/downloadList.json b/Resources/downloadList.json
@@ -1,4 +1,5 @@
 [
+  "https://github.com/ArchiDog1998/FFXIVRotations/releases/latest/download/DefaultRotations.dll",
   "https://github.com/ArchiDog1998/FFXIVRotations/releases/latest/download/ExtraRotations.dll",
   "Some url"
 ]
diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
@@ -55,8 +55,8 @@ public static string GetAuthor(this Assembly assembly)
         try
         {
             var name = assembly.GetName().Name;
-            return RotationLoadContext.AssemblyPaths.TryGetValue(name, out var path) 
-                ? FileVersionInfo.GetVersionInfo(path)?.CompanyName : name
+            return (RotationLoadContext.AssemblyPaths.TryGetValue(name, out var path) 
+                ? FileVersionInfo.GetVersionInfo(path)?.CompanyName : name)
                 ?? name ?? "Unknown";
         }
         catch

diff --git a/RotationSolver/RotationLoadContext.cs b/RotationSolver/RotationLoadContext.cs
@@ -50,7 +50,6 @@ protected override Assembly Load(AssemblyName assemblyName)
                 //
             }
         }
-
         return base.Load(assemblyName);
     }
 
@@ -61,13 +60,14 @@ private Assembly LoadFromFile(string filePath)
         if (!File.Exists(pdbPath)) return LoadFromStream(file);
         using var pdbFile = File.Open(pdbPath, FileMode.Open, FileAccess.Read, FileShare.Read);
         var assembly = LoadFromStream(file, pdbFile);
-        AssemblyPaths[assembly.GetName().Name] = filePath;
         return assembly;
     }
 
     public static Assembly LoadFrom(string filePath)
     {
         var loadContext = new RotationLoadContext(new FileInfo(filePath).Directory);
-        return loadContext.LoadFromFile(filePath);
+        var assembly = loadContext.LoadFromFile(filePath);
+        AssemblyPaths[assembly.GetName().Name] = filePath;
+        return assembly;
     }
 }
diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
@@ -60,13 +60,18 @@ public static async void GetAllCustomRotations()
                     {
                         if (File.Exists(filePath))
                         {
-                            if(new FileInfo(filePath).Length == response.Content.Headers.ContentLength)
+                            if (new FileInfo(filePath).Length == response.Content.Headers.ContentLength)
                             {
                                 continue;
                             }
+                            File.Delete(filePath);
+                        }
+
+                        using(var stream = new FileStream(filePath, File.Exists(filePath)
+                            ? FileMode.Open : FileMode.CreateNew))
+                        {
+                            await response.Content.CopyToAsync(stream);
                         }
-                        await response.Content.CopyToAsync(new FileStream(filePath, File.Exists(filePath)
-                            ? FileMode.Open : FileMode.CreateNew));
                     }
 
                     hasDownload = true;
@@ -86,7 +91,7 @@ private static void LoadRotationsFromLocal(string relayFolder)
     {
         var directories = Service.Config.OtherLibs
     .Where(Directory.Exists)
-    .Append(Path.GetDirectoryName(Assembly.GetAssembly(typeof(ICustomRotation)).Location))
+    //.Append(Path.GetDirectoryName(Assembly.GetAssembly(typeof(ICustomRotation)).Location))
     .Append(relayFolder);
 
         var assemblies = from dir in directories