Fixed favourites being inconsistent displaying servers properly. Some…

… changes regarding how servers are displayed and fetched data from. Mirrored official list URI to internet list. Improved error handling and made error messages more verbose.
BigETI · Dec 13, 2018 · 33e8e8f · 33e8e8f
1 parent e2d82fd
commit 33e8e8f
Show file tree

Hide file tree

Showing 35 changed files with 3,737 additions and 3,533 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.2")]
-[assembly: AssemblyFileVersion("1.0.6.2")]
+[assembly: AssemblyVersion("1.0.6.3")]
+[assembly: AssemblyFileVersion("1.0.6.3")]
diff --git a/SAMPLauncherNET/SAMPLauncherNET.csproj b/SAMPLauncherNET/SAMPLauncherNET.csproj
@@ -166,6 +166,7 @@
     <Compile Include="Source\SAMPLauncherNET\Core\LauncherConfigDataContract.cs" />
     <Compile Include="Source\SAMPLauncherNET\Core\MediaState.cs" />
     <Compile Include="Source\SAMPLauncherNET\Core\OnFilterEventHandler.cs" />
+    <Compile Include="Source\SAMPLauncherNET\Core\PingString.cs" />
     <Compile Include="Source\SAMPLauncherNET\Core\Player.cs" />
     <Compile Include="Source\SAMPLauncherNET\Core\PlayerCountString.cs" />
     <Compile Include="Source\SAMPLauncherNET\Core\PluginDataContract.cs" />
@@ -412,7 +413,7 @@
       <MergeAsm Include="$(OutputPath)ICSharpCode.SharpZipLib.dll" />
       <MergeAsm Include="$(OutputPath)INIEngine.dll" />
       <MergeAsm Include="$(OutputPath)MaterialSkin.dll" />
-	  <MergeAsm Include="$(OutputPath)Ude.dll" />
+      <MergeAsm Include="$(OutputPath)Ude.dll" />
       <MergeAsm Include="$(OutputPath)UpdaterNET.dll" />
       <MergeAsm Include="$(OutputPath)WinFormsTranslator.dll" />
     </ItemGroup>

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/BackendRESTfulServer.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/BackendRESTfulServer.cs
@@ -12,16 +12,19 @@ public class BackendRESTfulServer : Server
         /// Constructor
         /// </summary>
         /// <param name="serverData">Server data</param>
-        public BackendRESTfulServer(BackendRESTfulServerDataContract serverData) : base(serverData.Host, true)
+        public BackendRESTfulServer(BackendRESTfulServerDataContract serverData) : base(serverData.Host, false)
         {
             requestsRequired.Lock(ERequestType.Information);
-            hostname = serverData.Hostname;
+            if (serverData.Hostname.Trim().Length > 0)
+            {
+                hostname = serverData.Hostname;
+            }
             gamemode = serverData.Gamemode;
             playerCount = serverData.PlayerCount;
             maxPlayers = serverData.MaxPlayers;
             hasPassword = serverData.HasPassword;
             language = serverData.Language;
-            FetchDataAsync(ERequestType.Ping);
+            //FetchDataAsync(ERequestType.Ping);
         }
     }
 }
diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/BackendRESTfulServerDataContract.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/BackendRESTfulServerDataContract.cs
@@ -53,13 +53,23 @@ public class BackendRESTfulServerDataContract
         [DataMember(Name = "pa")]
         private bool hasPassword = false;
 
+        /// <summary>
+        /// Version
+        /// </summary>
+        [DataMember(Name = "vn")]
+        private string version = "";
+
         /// <summary>
         /// Host
         /// </summary>
         public string Host
         {
             get
             {
+                if (host == null)
+                {
+                    host = "";
+                }
                 return host;
             }
         }
@@ -71,6 +81,10 @@ public string Hostname
         {
             get
             {
+                if (hostname == null)
+                {
+                    hostname = "";
+                }
                 return hostname;
             }
         }
@@ -104,6 +118,10 @@ public string Gamemode
         {
             get
             {
+                if (gamemode == null)
+                {
+                    gamemode = "";
+                }
                 return gamemode;
             }
         }
@@ -115,6 +133,10 @@ public string Language
         {
             get
             {
+                if (language == null)
+                {
+                    language = "";
+                }
                 return language;
             }
         }
@@ -129,5 +151,20 @@ public bool HasPassword
                 return hasPassword;
             }
         }
+
+        /// <summary>
+        /// Version
+        /// </summary>
+        public string Version
+        {
+            get
+            {
+                if (version == null)
+                {
+                    version = "";
+                }
+                return version;
+            }
+        }
     }
 }
diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/ChatlogFormatter.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/ChatlogFormatter.cs
@@ -84,7 +84,7 @@ public static string Format(string text, EChatlogFormatType formatType, bool sho
                                 }
                                 catch (Exception e)
                                 {
-                                    Console.Error.WriteLine(e.Message);
+                                    Console.Error.WriteLine(e);
                                 }
                             }
                             string upper_match = match.Value.ToUpper();
@@ -102,7 +102,7 @@ public static string Format(string text, EChatlogFormatType formatType, bool sho
                             }
                             catch (Exception e)
                             {
-                                Console.Error.WriteLine(e.Message);
+                                Console.Error.WriteLine(e);
                             }
                         }
                         ret.Append(@"}\highlight2");
@@ -177,14 +177,14 @@ public static string Format(string text, EChatlogFormatType formatType, bool sho
                                     }
                                     catch (Exception e)
                                     {
-                                        Console.Error.WriteLine(e.Message);
+                                        Console.Error.WriteLine(e);
                                     }
                                 }
                             }
                         }
                         catch (Exception e)
                         {
-                            Console.Error.WriteLine(e.Message);
+                            Console.Error.WriteLine(e);
                         }
                         if (formatType == EChatlogFormatType.HTML)
                         {
@@ -196,7 +196,7 @@ public static string Format(string text, EChatlogFormatType formatType, bool sho
             catch (Exception e)
             {
                 ret.Clear();
-                Console.Error.WriteLine(e.Message);
+                Console.Error.WriteLine(e);
             }
             return ret.ToString();
         }

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/FavouriteDataContract.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/FavouriteDataContract.cs
@@ -36,6 +36,10 @@ public string Host
         {
             get
             {
+                if (host == null)
+                {
+                    host = "";
+                }
                 return host;
             }
         }
@@ -47,6 +51,10 @@ public string Hostname
         {
             get
             {
+                if (hostname == null)
+                {
+                    hostname = "";
+                }
                 return hostname;
             }
         }
@@ -58,6 +66,10 @@ public string Mode
         {
             get
             {
+                if (mode == null)
+                {
+                    mode = "";
+                }
                 return mode;
             }
         }

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/FavouriteServer.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/FavouriteServer.cs
@@ -50,8 +50,14 @@ public string RCONPassword
         /// <param name="rconPassword">RCON password</param>
         public FavouriteServer(string ipAddressAndPortString, string cachedHostname, string cachedGamemode, string serverPassword, string rconPassword) : base(ipAddressAndPortString, false)
         {
-            requestsRequired[ERequestType.Information] = false;
-            hostname = cachedHostname;
+            //requestsRequired[ERequestType.Information] = false;
+            if (cachedHostname != null)
+            {
+                if (cachedHostname.Trim().Length > 0)
+                {
+                    hostname = cachedHostname;
+                }
+            }
             gamemode = cachedGamemode;
             this.serverPassword = serverPassword;
             this.rconPassword = rconPassword;
@@ -65,8 +71,11 @@ public FavouriteServer(string ipAddressAndPortString, string cachedHostname, str
         /// <param name="fdc">Favorite data contract</param>
         public FavouriteServer(FavouriteDataContract fdc) : base(fdc.Host, false)
         {
-            requestsRequired[ERequestType.Information] = false;
-            hostname = fdc.Hostname;
+            //requestsRequired[ERequestType.Information] = false;
+            if (fdc.Hostname.Trim().Length > 0)
+            {
+                hostname = fdc.Hostname;
+            }
             serverPassword = "";
             rconPassword = "";
             FetchDataAsync(ERequestType.Ping);

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/FileState.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/FileState.cs
@@ -59,7 +59,7 @@ public FileState(string path)
                 catch (Exception e)
                 {
                     lastWriteDateTime = DateTime.Now;
-                    Console.Error.WriteLine(e.Message);
+                    Console.Error.WriteLine(e);
                 }
             }
             else

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/GeoLocationProvider.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/GeoLocationProvider.cs
@@ -58,7 +58,7 @@ public GeoLocationData RequestData(string host)
             }
             catch (Exception e)
             {
-                Console.Error.WriteLine(e.Message);
+                Console.Error.WriteLine(e);
             }
             return ret;
         }

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/MediaState.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/MediaState.cs
@@ -70,7 +70,7 @@ private void AddFilesState(string path)
             }
             catch (Exception e)
             {
-                Console.Error.WriteLine(e.Message);
+                Console.Error.WriteLine(e);
             }
         }
 
@@ -105,7 +105,7 @@ private IEnumerable<string> GetFiles(string path)
             }
             catch (Exception e)
             {
-                Console.Error.WriteLine(e.Message);
+                Console.Error.WriteLine(e);
             }
             return ret;
         }
@@ -137,7 +137,7 @@ public string[] GetModifiedAdded()
                     }
                     catch (Exception e)
                     {
-                        Console.Error.WriteLine(e.Message);
+                        Console.Error.WriteLine(e);
                     }
                 }
                 else

diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PingString.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PingString.cs
@@ -0,0 +1,66 @@
+using System;
+
+/// <summary>
+/// SA:MP launcher .NET namespace
+/// </summary>
+namespace SAMPLauncherNET
+{
+    /// <summary>
+    /// Ping string class
+    /// </summary>
+    public class PingString : IComparable, IComparable<PingString>
+    {
+        /// <summary>
+        /// Ping
+        /// </summary>
+        private readonly uint ping;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="ping">Ping</param>
+        public PingString(uint ping)
+        {
+            this.ping = ping;
+        }
+
+        /// <summary>
+        /// Compare to
+        /// </summary>
+        /// <param name="obj">Object</param>
+        /// <returns>Result</returns>
+        public int CompareTo(object obj)
+        {
+            int ret = 1;
+            if (obj != null)
+            {
+                ret = CompareTo(obj as PingString);
+            }
+            return ret;
+        }
+
+        /// <summary>
+        /// CompareTo
+        /// </summary>
+        /// <param name="other">Other</param>
+        /// <returns>Result</returns>
+        public int CompareTo(PingString other)
+        {
+            int ret = 1;
+            if (other != null)
+            {
+                ret = ping.CompareTo(other.ping);
+            }
+            return ret;
+        }
+
+        /// <summary>
+        /// To string
+        /// </summary>
+        /// <returns>String representation</returns>
+        public override string ToString()
+        {
+            return ((ping == uint.MaxValue) ? "-" : ping.ToString());
+        }
+    }
+}
diff --git a/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PluginProvider.cs b/SAMPLauncherNET/Source/SAMPLauncherNET/Core/PluginProvider.cs
@@ -51,6 +51,7 @@ private static string GetDownloadURL(string infoPath, string githubAPIURL, ref G
                     }
                     catch (Exception e)
                     {
+                        Console.Error.WriteLine(e);
                         MessageBox.Show(e.Message, Translator.GetTranslation("PLUGIN_ERROR_TITLE"), MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
@@ -70,6 +71,7 @@ private static string GetDownloadURL(string infoPath, string githubAPIURL, ref G
                     }
                     catch (Exception e)
                     {
+                        Console.Error.WriteLine(e);
                         MessageBox.Show(e.Message, Translator.GetTranslation("PLUGIN_ERROR_TITLE"), MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
@@ -211,6 +213,7 @@ public static InstalledPlugin Update(PluginDataContract plugin)
                     }
                     catch (Exception e)
                     {
+                        Console.Error.WriteLine(e);
                         MessageBox.Show(e.Message, Translator.GetTranslation("PLUGIN_ERROR_TITLE"), MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
@@ -244,6 +247,7 @@ public static InstalledPlugin Update(PluginDataContract plugin)
                             }
                             catch (Exception e)
                             {
+                                Console.Error.WriteLine(e);
                                 MessageBox.Show(e.Message, Translator.GetTranslation("PLUGIN_ERROR_TITLE"), MessageBoxButtons.OK, MessageBoxIcon.Error);
                             }
                         }