Fixed local plugins not being loaded.

BigETI · Dec 31, 2018 · 36697b1 · 36697b1
1 parent e7ffbc2
commit 36697b1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/.vs/SAMPLauncherNET/v15/.suo b/.vs/SAMPLauncherNET/v15/.suo
diff --git a/SAMPLauncherNET/Properties/AssemblyInfo.cs b/SAMPLauncherNET/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.7")]
-[assembly: AssemblyFileVersion("1.0.6.7")]
+[assembly: AssemblyVersion("1.0.6.8")]
+[assembly: AssemblyFileVersion("1.0.6.8")]
diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PluginDataContract.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PluginDataContract.cs
@@ -63,6 +63,11 @@ public class PluginDataContract : IComparable, IComparable<PluginDataContract>,
         /// </summary>
         private bool updateFrequencyItemParsed;
 
+        /// <summary>
+        /// Path
+        /// </summary>
+        private string path;
+
         /// <summary>
         /// Name
         /// </summary>
@@ -152,6 +157,33 @@ public string TranslatableText
             }
         }
 
+        /// <summary>
+        /// Path
+        /// </summary>
+        public string Path
+        {
+            get
+            {
+                if (path == null)
+                {
+                    try
+                    {
+                        Uri uri = new Uri(URI);
+                        path = (uri.IsFile ? uri.AbsolutePath : uri.AbsoluteUri);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.Error.WriteLine(e);
+                    }
+                    if (path == null)
+                    {
+                        path = "";
+                    }
+                }
+                return path;
+            }
+        }
+
         /// <summary>
         /// Constructor
         /// </summary>

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PluginProvider.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PluginProvider.cs
@@ -129,9 +129,9 @@ public static InstalledPlugin Update(PluginDataContract plugin)
                             case EPluginProvider.URI:
                                 if (uri.IsFile)
                                 {
-                                    if (!(File.Exists(plugin.URI)))
+                                    if (File.Exists(plugin.Path))
                                     {
-                                        ret = new InstalledPlugin(plugin.URI);
+                                        ret = new InstalledPlugin(plugin.Path);
                                     }
                                 }
                                 else
@@ -148,10 +148,6 @@ public static InstalledPlugin Update(PluginDataContract plugin)
                                             }
                                             else
                                             {
-                                                if (File.Exists(download_path))
-                                                {
-                                                    File.Delete(download_path);
-                                                }
                                                 download_url = plugin.URI;
                                             }
                                             break;