Merge pull request #2 from NosCoreIO/Fix

Fix

Author: erwan-joly

src/NosCore.ParserInputGenerator.Launcher/Worker.cs

@@ -2,6 +2,9 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using ICSharpCode.SharpZipLib.BZip2;
+using ICSharpCode.SharpZipLib.GZip;
+using ICSharpCode.SharpZipLib.Tar;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NosCore.ParserInputGenerator.Downloader;
@@ -60,16 +63,30 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 // ignored as header is not important
             }
             var manifest = await _client.DownloadManifest();
-            var fileslist = _parserInputFiles.Select(o => $"NostaleData\\{o}").ToList();
+            var fileslist = _parserInputFiles.Select(o => $"NostaleData{Path.DirectorySeparatorChar}{o}").ToList();
             manifest.Entries = manifest.Entries.Where(s => fileslist.Contains(s.File)).ToArray();
             await _client.DownloadClientAsync(manifest);
             foreach (var file in fileslist)
             {
                 var rename = file.Contains("NScliData");
-                var dest = file.Contains("NStcData") ? ".\\output\\parser\\maps\\" : ".\\output\\parser\\";
-                var fileInfo = new FileInfo($".\\output\\{file}");
+                var dest = file.Contains("NStcData") ? $".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}parser{Path.DirectorySeparatorChar}maps{Path.DirectorySeparatorChar}" : $".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}parser{Path.DirectorySeparatorChar}";
+                var fileInfo = new FileInfo($".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}{file}");
                 await _extractor.ExtractAsync(fileInfo, dest, rename);
             }
+            var directoryOfFilesToBeTarred = new DirectoryInfo(".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}parser");
+            var filesInDirectory = directoryOfFilesToBeTarred.GetFiles("*.*", SearchOption.AllDirectories);
+            var tarArchiveName = $".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}parser-input-files.tar.bz2";
+            if (File.Exists(tarArchiveName))
+            {
+                File.Delete(tarArchiveName);
+            }
+            await using Stream targetStream = new BZip2OutputStream(File.Create(tarArchiveName));
+            using var tarArchive = TarArchive.CreateOutputTarArchive(targetStream, TarBuffer.DefaultBlockFactor);
+            foreach (var fileToBeTarred in filesInDirectory)
+            {
+                var entry = TarEntry.CreateEntryFromFile(fileToBeTarred.FullName);
+                tarArchive.WriteEntry(entry, true);
+            }
             _logger.LogInformation(LogLanguage.Instance.GetMessageFromKey(LogLanguageKey.PARSER_INPUT_GENERATED));
         }
     }

src/NosCore.ParserInputGenerator/Downloader/ClientDownloader.cs

@@ -48,10 +48,10 @@ async Task Download(Entry entry)
 
                 if (entry.Folder)
                 {
-                    Directory.CreateDirectory($".\\output\\{entry.File}");
+                    Directory.CreateDirectory($".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}{entry.File}");
                     return;
                 }
-                var file = $".\\output\\{entry.File}";
+                var file = $".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}{entry.File}";
                 if (File.Exists(file))
                 {
                     var fop = File.OpenRead(file);

src/NosCore.ParserInputGenerator/Extractor/Extractor.cs

@@ -21,7 +21,7 @@ public Extractor(ILogger<Extractor> logger)
 
         public Task ExtractAsync(FileInfo file, string dest) => ExtractAsync(file, dest, false);
 
-        public Task ExtractAsync(FileInfo file) => ExtractAsync(file, ".\\output\\");
+        public Task ExtractAsync(FileInfo file) => ExtractAsync(file, $".{Path.DirectorySeparatorChar}output{Path.DirectorySeparatorChar}");
 
         public async Task ExtractAsync(FileInfo nosFile, string directory, bool rename)
         {

src/NosCore.ParserInputGenerator/NosCore.ParserInputGenerator.csproj

@@ -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.0.1</Version>
+    <Version>1.1.0</Version>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>NosCore's Parser InputGenerator</Description>
     <PackageLicenseExpression></PackageLicenseExpression>