Merge pull request #23 from ProfBits/Develop

Version 1.3.22

Author: ProfBits

LogUploader/Data/DataConfig.json

@@ -43,6 +43,12 @@
           "NameEN": "The Key of Ahdashim",
           "NameDE": "Der Schlüssel von Ahdashim",
           "AvatarURL": "https://wiki.guildwars2.com/images/2/2d/The_Key_of_Ahdashim_loading_screen.jpg"
+        },
+        {
+          "ID": 8,
+          "NameEN": "Mount Balrior",
+          "NameDE": "Berg Balrior",
+          "AvatarURL": "https://wiki.guildwars2.com/images/8/83/Mount_Balrior_loading_screen.png"
         }
       ],
       "StrikeMissions": [
@@ -562,6 +568,45 @@
         "AvatarURL": "https://wiki.guildwars2.com/images/8/8b/Mini_Qadim_the_Peerless.png",
         "RaidOrgaPlusID": 25
       },
+      {
+        "ID": 26725,
+        "NameEN": "Greer",
+        "NameDE": "Greer",
+        "FolderEN": "Greer, the Blightbringer",
+        "FolderDE": "Greer",
+        "EiName": "Greer, the Blightbringer",
+        "GameAreaName": "RaidWings",
+        "GameAreaID": 8,
+        "DiscordEmote": "<:greer:1312075892419330048>",
+        "AvatarURL": "https://i.imgur.com/19lr7VM.png",
+        "RaidOrgaPlusID": 52
+      },
+      {
+        "ID": 26774,
+        "NameEN": "Decima",
+        "NameDE": "Decima",
+        "FolderEN": "Decima, the Stormsinger",
+        "FolderDE": "Decima",
+        "EiName": "Decima, the Stormsinger",
+        "GameAreaName": "RaidWings",
+        "GameAreaID": 8,
+        "DiscordEmote": "<:decima:1312075891119099924>",
+        "AvatarURL": "https://i.imgur.com/EJJRx02.png",
+        "RaidOrgaPlusID": 53
+      },
+      {
+        "ID": 26712,
+        "NameEN": "Ura",
+        "NameDE": "Ura",
+        "FolderEN": "Ura",
+        "FolderDE": "Ura",
+        "EiName": "Ura, the Steamshrieker",
+        "GameAreaName": "RaidWings",
+        "GameAreaID": 8,
+        "DiscordEmote": "<:ura:1312075893878952069>",
+        "AvatarURL": "https://i.imgur.com/hUdfF7h.png",
+        "RaidOrgaPlusID": 54
+      },
       {
         "ID": 22154,
         "NameEN": "Icebrood Construct",

LogUploader/Helper/EliteInsights.cs

@@ -3,12 +3,9 @@
 using System.IO;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using LogUploader.Properties;
 using System.IO.Compression;
 using System.Reflection;
-using System.Net;
 using LogUploader.Data.Settings;
 using Extensiones.HTTPClient;
 using System.Threading;
@@ -27,12 +24,14 @@ internal static class EliteInsights
         private const string GitHubApiLink = @"https://api.github.com/repos/baaron4/GW2-Elite-Insights-Parser/releases/latest";
         private const string USER_AGENT = "LogUploader";
         private const string ZIP_NAME = "NewEI.zip";
+        private const string EI_EXECUTABLE = "GuildWars2EliteInsights-CLI.exe";
 
         public static string LogsPath { get => BASE_PATH + LOGS; }
         private static string TempPath { get => BASE_PATH + TEMP_FOLDER; }
         private static string TempOldPath { get => BASE_PATH + TEMP_OLD_FOLDER; }
         private static string BinPath { get => BASE_PATH + BIN; }
         private static string ZipFilePath { get => BASE_PATH + ZIP_NAME; }
+        private static string EiPath { get => BASE_PATH + BIN + EI_EXECUTABLE; }
 
         private static string DownloadURLCache { get; set; } = null;
 
@@ -49,9 +48,9 @@ public static void Init(IEliteInsightsSettings settings)
 
         public static Version UpdateLocalVersion()
         {
-            if (File.Exists(BASE_PATH + BIN + "GuildWars2EliteInsights.exe"))
+            if (File.Exists(EiPath))
             {
-                var fi = FileVersionInfo.GetVersionInfo(BASE_PATH + BIN + "GuildWars2EliteInsights.exe");
+                var fi = FileVersionInfo.GetVersionInfo(EiPath);
                 LocalVersion = new Version(fi.ProductMajorPart, fi.ProductMinorPart, fi.ProductBuildPart, fi.ProductPrivatePart);
             }
             else
@@ -104,7 +103,7 @@ public static bool UpdateAvailable()
 
         public static bool IsInstalled()
         {
-            return File.Exists(BASE_PATH + BIN + "GuildWars2EliteInsights.exe");
+            return File.Exists(EiPath);
         }
 
         /// <summary>
@@ -190,7 +189,7 @@ public static async Task<Version> Update(IProxySettings settings, IProgress<doub
             }
             catch (Exception e)
             {
-                Logger.Error("Unkown EI Update error");
+                Logger.Error("Unknown EI Update error");
                 Logger.LogException(e);
                 FolderCleanup();
                 return LocalVersion;
@@ -220,7 +219,7 @@ public static async Task<Version> Update(IProxySettings settings, IProgress<doub
         private static string GetDownloadURL(Newtonsoft.Json.Linq.JObject jsonData)
         {
             return jsonData["assets"]
-                .Where(json => (string)json["name"] == "GW2EI.zip")
+                .Where(json => (string)json["name"] == "GW2EICLI.zip")
                 .Select(json => (string)json["browser_download_url"])
                 .First();
         }
@@ -252,14 +251,13 @@ public static List<string> Parse(string log)
                 throw new NotSupportedException($"EliteInsights version too low.\nInstalled {LocalVersion}\nMin required {new Version(2, 24)}\nPlease update EI via the settings.");
             }
 
-            string destConf = PrepearConfig();
-            //-p requiered for silent execution!!
-            var args = $"-p -c \"{destConf}\" \"{log}\"";
+            string destConf = PrepareConfig();
+            var args = $"-c \"{destConf}\" \"{log}\"";
             var psi = new ProcessStartInfo
             {
-                FileName = BASE_PATH + BIN + "GuildWars2EliteInsights.exe",
+                FileName = EiPath,
                 WorkingDirectory = BinPath,
-                CreateNoWindow = false,
+                CreateNoWindow = true,
                 UseShellExecute = false,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
@@ -304,7 +302,7 @@ private static List<string> ReadLinesFromStream(StreamReader stream)
             return lines;
         }
 
-        private static string PrepearConfig()
+        private static string PrepareConfig()
         {
             var defaultConf = $"{Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + @"\Data\EIconf.conf"}";
             var destConf = BASE_PATH + "EIconf.conf";

LogUploader/Properties/AssemblyInfo.cs

@@ -33,6 +33,6 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.3.21.0")]
+[assembly: AssemblyFileVersion("1.3.22.0")]
 
 [assembly: InternalsVisibleTo("LogUploaderTests")]

LogUploaderSetup/LogUploaderSetup.vdproj

@@ -882,15 +882,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Log Uploader"
-        "ProductCode" = "8:{807045B6-B2AB-4514-B049-754EF5B084F5}"
-        "PackageCode" = "8:{D83EADB4-3FE4-4E9B-AD9F-9E0ED45934D9}"
+        "ProductCode" = "8:{D22837CD-3A56-4F0E-826D-C240F5A4CAD1}"
+        "PackageCode" = "8:{724D3492-AEED-49DD-90B2-A6E715889934}"
         "UpgradeCode" = "8:{3F3DD479-F9CF-48EE-8590-B34CEB67C1B3}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.3.21"
+        "ProductVersion" = "8:1.3.22"
         "Manufacturer" = "8:Bits Inc."
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/ProfBits/LogUploader2"

ReleaseNotes.md

@@ -1,4 +1,13 @@
+# v1.3.23
+
 # v1.3.22
+02.12.24
+
+## Features
+- Add support for Wing 8 - Mount Balrior
+
+## Bugfixes
+- Fix local log parsing for EI 3.0.0 and onward
 
 # v1.3.21
 26.10.24