fix: fixed the author showcase.

ArchiDog1998 · Apr 8, 2023 · d780cac · d780cac
1 parent 94b4969
commit d780cac
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
@@ -73,9 +73,10 @@ public static string GetAuthor(this Assembly assembly)
     {
         try
         {
-            return FileVersionInfo.GetVersionInfo(assembly.Location)?.CompanyName
-                ?? assembly.GetName().Name
-                ?? "Unknown";
+            var name = assembly.GetName().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
@@ -1,6 +1,7 @@
 using Dalamud.Plugin;
 using FFXIVClientStructs.Interop;
 using Lumina.Excel;
+using System.Reflection;
 using System.Runtime.Loader;
 
 namespace RotationSolver;
@@ -9,6 +10,8 @@ public class RotationLoadContext : AssemblyLoadContext
 {
     DirectoryInfo _directory;
 
+    public static Dictionary<string, string> AssemblyPaths = new Dictionary<string, string>();
+
     static Dictionary<string, Assembly> _handledAssemblies;
     public RotationLoadContext(DirectoryInfo directoryInfo) : base(true)
     {
@@ -57,7 +60,9 @@ private Assembly LoadFromFile(string filePath)
         var pdbPath = Path.ChangeExtension(filePath, ".pdb");
         if (!File.Exists(pdbPath)) return LoadFromStream(file);
         using var pdbFile = File.Open(pdbPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-        return LoadFromStream(file, pdbFile);
+        var assembly = LoadFromStream(file, pdbFile);
+        AssemblyPaths[assembly.GetName().Name] = filePath;
+        return assembly;
     }
 
     public static Assembly LoadFrom(string filePath)

diff --git a/RotationSolver/UI/ImGuiHelper.cs b/RotationSolver/UI/ImGuiHelper.cs
@@ -492,8 +492,13 @@ public unsafe static void Display(this ICustomRotation rotation, ICustomRotation
 
                 if (IconButton(FontAwesomeIcon.Globe, "Code" + rotation.GetHashCode().ToString()))
                 {
-                    var url = link.Url;
-                    Util.OpenLink(url);
+                    try
+                    {
+                        Util.OpenLink(link.Url);
+                    }
+                    catch
+                    {
+                    }
                 }
             }
 
@@ -518,7 +523,13 @@ public unsafe static void Display(this ICustomRotation rotation, ICustomRotation
                     if (IconButton(hasTexture ? FontAwesomeIcon.Image : FontAwesomeIcon.QuestionCircle,
                         "Button" + rotation.GetHashCode().ToString() + texture.GetHashCode().ToString()))
                     {
-                        Util.OpenLink(texture.Path);
+                        try
+                        {
+                            Util.OpenLink(texture.Path);
+                        }
+                        catch
+                        {
+                        }
                     }
                     if (ImGui.IsItemHovered() && (hasTexture || !string.IsNullOrEmpty( texture.Description)))
                     {

diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
@@ -39,6 +39,13 @@ public static async void GetAllCustomRotations()
                     var valid = Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out var uriResult)
                          && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
                     if (!valid) continue;
+                }
+                catch
+                {
+                    continue;
+                }
+                try
+                {
 
                     var fileName = url.Split('/').LastOrDefault();
                     if (string.IsNullOrEmpty(fileName)) continue;