Merge pull request #19 from NosCoreIO/UpgradeTo5

Upgrade to5

Author: erwan-joly

src/NosCore.ParserInputGenerator.Launcher/Worker.cs

@@ -87,6 +87,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 var entry = TarEntry.CreateEntryFromFile(fileToBeTarred.FullName);
                 tarArchive.WriteEntry(entry, true);
             }
+            tarArchive.Dispose();
             _logger.LogInformation(LogLanguage.Instance.GetMessageFromKey(LogLanguageKey.PARSER_INPUT_GENERATED));
         }
     }

src/NosCore.ParserInputGenerator/Downloader/ClientDownloader.cs

@@ -8,9 +8,10 @@
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using NosCore.ParserInputGenerator.I18N;
 using NosCore.Shared.Enumerations;
 
@@ -35,7 +36,10 @@ public async Task<ClientManifest> DownloadManifestAsync(RegionType region)
             using var result = await client
                 .GetAsync($"https://spark.gameforge.com/api/v1/patching/download/latest/nostale/default?locale=${region}&architecture=x64&branchToken")
                 .ConfigureAwait(false);
-            return JsonConvert.DeserializeObject<ClientManifest>(await result.Content.ReadAsStringAsync().ConfigureAwait(false));
+            return JsonSerializer.Deserialize<ClientManifest>(await result.Content.ReadAsStringAsync().ConfigureAwait(false), new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault
+            }) ?? throw new InvalidOperationException();
         }
 
         public async Task DownloadClientAsync() => await DownloadClientAsync(await DownloadManifest());
@@ -61,6 +65,9 @@ async Task Download(Entry entry)
                         return;
                     }
                 }
+
+                _logger.LogInformation(LogLanguage.Instance.GetMessageFromKey(LogLanguageKey.DOWNLOADING),
+                    entry.Path);
                 using var response = await client.GetAsync($"http://patches.gameforge.com/" + entry.Path)
                     .ConfigureAwait(false);
 

src/NosCore.ParserInputGenerator/Downloader/ClientManifest.cs

@@ -1,37 +1,38 @@
-using Newtonsoft.Json;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace NosCore.ParserInputGenerator.Downloader
 {
     public class ClientManifest
     {
-        [JsonProperty("entries")]
+        [JsonPropertyName("entries")]
         public Entry[] Entries { get; set; } = null!;
 
-        [JsonProperty("totalSize")]
+        [JsonPropertyName("totalSize")]
         public long TotalSize { get; set; }
 
-        [JsonProperty("build")]
+        [JsonPropertyName("build")]
         public long Build { get; set; }
     }
 
     public class Entry
     {
-        [JsonProperty("path", NullValueHandling = NullValueHandling.Ignore)]
-        public string Path { get; set; } = null!;
+        [JsonPropertyName("path")]
+        public string? Path { get; set; }
 
-        [JsonProperty("sha1", NullValueHandling = NullValueHandling.Ignore)]
-        public string Sha1 { get; set; } = null!;
+        [JsonPropertyName("sha1")]
+        public string? Sha1 { get; set; }
 
-        [JsonProperty("file")]
+        [JsonPropertyName("file")]
         public string File { get; set; } = null!;
 
-        [JsonProperty("flags")]
+        [JsonPropertyName("flags")]
         public long Flags { get; set; }
 
-        [JsonProperty("size")]
+        [JsonPropertyName("size")]
         public long Size { get; set; }
 
-        [JsonProperty("folder")]
+        [JsonPropertyName("folder")]
         public bool Folder { get; set; }
     }
 

src/NosCore.ParserInputGenerator/Extractor/Extractor.cs

@@ -30,7 +30,7 @@ async Task WriteFile(string fileName, MemoryStream decryptedContent)
                 if (rename && fileName.Contains("."))
                 {
                     var name = fileName.Substring(0, fileName.IndexOf('.'));
-                    var ext = fileName.Substring(fileName.IndexOf('.'));
+                    var ext = fileName[fileName.IndexOf('.')..];
                     await using var fileStream =
                         File.Create(
                             $"{directory}{name}{nosFile.Name.Substring(nosFile.Name.LastIndexOf('_'), 3)}{ext}");
@@ -107,7 +107,7 @@ async Task WriteFile(string fileName, MemoryStream decryptedContent)
             }
         }
 
-        private byte[] DecryptDat(byte[] array)
+        private static byte[] DecryptDat(byte[] array)
         {
             var cryptoarray = new[]
                 {0x00, 0x20, 0x2D, 0x2E, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x0A, 0x00};

src/NosCore.ParserInputGenerator/I18N/LogLanguageKey.cs

@@ -13,6 +13,7 @@ public enum LogLanguageKey
     {
         DOWNLOAD_SUCCESSFULL,
         PARSER_INPUT_GENERATED,
-        ERROR
+        ERROR,
+        DOWNLOADING
     }
 }

src/NosCore.ParserInputGenerator/NosCore.ParserInputGenerator.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net5.0</TargetFramework>
@@ -12,7 +12,7 @@
 		<RepositoryUrl>https://github.com/NosCoreIO/NosCore.ParserInputGenerator.git</RepositoryUrl>
 		<PackageIconUrl></PackageIconUrl>
 		<PackageTags>nostale, noscore, nostale private server source, nostale emulator</PackageTags>
-		<Version>1.3.0</Version>
+		<Version>1.4.0</Version>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<Description>NosCore's Parser InputGenerator</Description>
 		<PackageLicenseExpression></PackageLicenseExpression>