EftPatchHelper/EftPatchHelper/EftPatchHelper.csproj

@@ -5,8 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>1.5.8</AssemblyVersion>
+    <AssemblyVersion>1.5.6</AssemblyVersion>
-    <FileVersion>1.5.8</FileVersion>
+    <FileVersion>1.5.6</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,7 +19,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Spectre.Console" Version="0.44.0" />
-    <PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.1.23" />
   </ItemGroup>
 
   <ItemGroup>
@@ -37,9 +36,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Resources\7z.dll" />
-    <EmbeddedResource Include="Resources\7z.dll" />
-  </ItemGroup>
-
 </Project>

EftPatchHelper/EftPatchHelper/Helpers/FileHelper.cs

@@ -1,44 +0,0 @@
-using System.Reflection;
-using Spectre.Console;
-
-namespace EftPatchHelper.Helpers;
-
-public class FileHelper
-{
-    public bool StreamAssemblyResourceOut(string resourceName, string outputFilePath)
-    {
-        try
-        {
-            var assembly = Assembly.GetExecutingAssembly();
-
-            FileInfo outputFile = new FileInfo(outputFilePath);
-
-            if (outputFile.Exists)
-            {
-                outputFile.Delete();
-            }
-
-            if (!outputFile.Directory.Exists)
-            {
-                Directory.CreateDirectory(outputFile.Directory.FullName);
-            }
-
-            var resName = assembly.GetManifestResourceNames().First(x => x.EndsWith(resourceName));
-
-            using (FileStream fs = File.Create(outputFilePath))
-            using (Stream s = assembly.GetManifestResourceStream(resName))
-            {
-                s.CopyTo(fs);
-            }
-
-            outputFile.Refresh();
-            return outputFile.Exists;
-        }
-        catch (Exception ex)
-        {
-            AnsiConsole.WriteException(ex);
-            return false;
-        }
-    }
-
-}

EftPatchHelper/EftPatchHelper/Helpers/ZipHelper.cs

@@ -1,45 +0,0 @@
-using SevenZip;
-using Spectre.Console;
-
-namespace EftPatchHelper.Helpers;
-
-public class ZipHelper
-{
-    public string DllPath = Path.Join(Environment.CurrentDirectory, "7z.dll");
-    public bool Compress(DirectoryInfo folder, FileInfo outputArchive,
-        IProgress<double> progress)
-    {
-        try
-        {
-            using var outputStream = outputArchive.OpenWrite();
-            
-            SevenZipBase.SetLibraryPath(DllPath);
-
-            var compressor = new SevenZipCompressor()
-            {
-                CompressionLevel = CompressionLevel.Normal,
-                CompressionMethod = CompressionMethod.Lzma2,
-                ArchiveFormat = OutArchiveFormat.SevenZip
-            };
-
-            compressor.Compressing += (_, args) => { progress.Report(args.PercentDone); };
-            
-            compressor.CompressDirectory(folder.FullName, outputStream);
-
-            outputArchive.Refresh();
-
-            if (!outputArchive.Exists)
-            {
-                AnsiConsole.MarkupLine("output archive not found");
-                return false;
-            }
-
-            return true;
-        }
-        catch (Exception ex)
-        {
-            AnsiConsole.WriteException(ex);
-            return false;
-        }
-    }
-}

EftPatchHelper/EftPatchHelper/Interfaces/ICompressPatcherTasks.cs

@@ -1,5 +0,0 @@
-namespace EftPatchHelper.Interfaces;
-
-public interface ICompressPatcherTasks : ITaskable
-{
-}

EftPatchHelper/EftPatchHelper/Model/GoFileUpload.cs

@@ -30,7 +30,7 @@ namespace EftPatchHelper.Model
             _folderId = folderId;
             UploadFileInfo = file;
             ServiceName = "GoFile";
-            DisplayName = $"{ServiceName} Upload";
+            DisplayName = $"{ServiceName} Upload: {UploadFileInfo.Name}";
             HubEntryText = $"Download from {ServiceName}";
             AddHubEntry = true;
         }

EftPatchHelper/EftPatchHelper/Model/MegaUpload.cs

@@ -27,7 +27,7 @@ namespace EftPatchHelper.Model
             _email = email;
             _password = password;
             ServiceName = "Mega";
-            DisplayName = $"{ServiceName} Upload";
+            DisplayName = $"{ServiceName} Upload: {UploadFileInfo.Name}";
             HubEntryText = $"Download from {ServiceName}";
             AddHubEntry = true;
         }

EftPatchHelper/EftPatchHelper/Model/SftpUpload.cs

@@ -30,7 +30,7 @@ public class SftpUpload : IFileUpload
         };
         
         ServiceName = _sftpInfo.Hostname;
-        DisplayName = $"{ServiceName} Upload";
+        DisplayName = $"{ServiceName} Upload: {UploadFileInfo.Name}";
         HubEntryText = $"Download from {ServiceName}";
         AddHubEntry = false;
     }

EftPatchHelper/EftPatchHelper/Program.cs

@@ -20,7 +20,6 @@ namespace EftPatchHelper
         ITaskable _fileProcessingTasks;
         ITaskable _patchGenTasks;
         ITaskable _patchTestingTasks;
-        private ITaskable _compressPatcherTasks;
         ITaskable _createReleaseTasks;
         ITaskable _uploadTasks;
 
@@ -46,7 +45,6 @@ namespace EftPatchHelper
             IFileProcessingTasks fileProcessingTasks,
             IPatchGenTasks patchGenTasks,
             IPatchTestingTasks patchTestingTasks,
-            ICompressPatcherTasks compressPatcherTasks,
             IUploadTasks uploadTasks,
             IReleaseCreator createReleaseTasks
             )
@@ -57,7 +55,6 @@ namespace EftPatchHelper
             _fileProcessingTasks = fileProcessingTasks;
             _patchGenTasks = patchGenTasks;
             _patchTestingTasks = patchTestingTasks;
-            _compressPatcherTasks = compressPatcherTasks;
             _createReleaseTasks = createReleaseTasks;
             _uploadTasks = uploadTasks;
         }
@@ -70,7 +67,6 @@ namespace EftPatchHelper
             _fileProcessingTasks.Run();
             _patchGenTasks.Run();
             _patchTestingTasks.Run();
-            _compressPatcherTasks.Run();
             _uploadTasks.Run();
             _createReleaseTasks.Run();
         }
@@ -88,9 +84,6 @@ namespace EftPatchHelper
                     return settings;
                 });
 
-                services.AddSingleton<FileHelper>();
-                services.AddSingleton<ZipHelper>();
-
                 services.AddScoped<EftClientSelector>();
 
                 services.AddTransient<ISettingsTask, StartupSettingsTask>();
@@ -99,7 +92,6 @@ namespace EftPatchHelper
                 services.AddTransient<IFileProcessingTasks, FileProcessingTasks>();
                 services.AddTransient<IPatchGenTasks, PatchGenTasks>();
                 services.AddTransient<IPatchTestingTasks, PatchTestingTasks>();
-                services.AddTransient<ICompressPatcherTasks, CompressPatcherTasks>();
                 services.AddTransient<IReleaseCreator, CreateReleaseTasks>();
                 services.AddTransient<IUploadTasks, UploadTasks>();
                 services.AddTransient<Program>();

EftPatchHelper/EftPatchHelper/Tasks/CompressPatcherTasks.cs

@@ -1,63 +0,0 @@
-using EftPatchHelper.Extensions;
-using EftPatchHelper.Helpers;
-using EftPatchHelper.Interfaces;
-using EftPatchHelper.Model;
-using Spectre.Console;
-
-namespace EftPatchHelper.Tasks;
-
-public class CompressPatcherTasks : ICompressPatcherTasks
-{
-    private Options _options;
-    private FileHelper _fileHelper;
-    private ZipHelper _zipHelper;
-    
-    public CompressPatcherTasks(Options options, FileHelper fileHelper, ZipHelper zipHelper)
-    {
-        _options = options;
-        _fileHelper = fileHelper;
-        _zipHelper = zipHelper;
-    }
-
-    public bool CompressPatcher()
-    {
-        return AnsiConsole.Progress()
-            .Columns(new ProgressColumn[]
-            {
-                new TaskDescriptionColumn(),
-                new ProgressBarColumn(),
-                new PercentageColumn(),
-                new ElapsedTimeColumn(),
-                new SpinnerColumn(Spinner.Known.Dots2)
-            })
-            .Start(ctx =>
-            {
-
-                var compressionTask = ctx.AddTask("Compressing Patcher");
-                compressionTask.MaxValue = 100;
-                
-                if (!_fileHelper.StreamAssemblyResourceOut("7z.dll", _zipHelper.DllPath))
-                {
-                    return false;
-                }
-
-                var patchFolder = new DirectoryInfo(_options.OutputPatchPath);
-                
-                var patchArchiveFile = new FileInfo(_options.OutputPatchPath + ".7z");
-
-                if (!patchFolder.Exists)
-                {
-                    return false;
-                }
-
-                var progress = new Progress<double>(p => { compressionTask.Increment(p - compressionTask.Percentage);});
-
-                return _zipHelper.Compress(patchFolder, patchArchiveFile, progress);
-            });
-    }
-
-    public void Run()
-    {
-        CompressPatcher().ValidateOrExit();
-    }
-}

EftPatchHelper/EftPatchHelper/Tasks/PatchGenTasks.cs

@@ -48,7 +48,7 @@ namespace EftPatchHelper.Tasks
                         $"OutputFolderName::{patcherOutputName}",
                         $"SourceFolderPath::{_options.SourceClient.PrepPath}",
                         $"TargetFolderPath::{_options.TargetClient.PrepPath}",
-                        $"AutoZip::false",
+                        $"AutoZip::{_settings.AutoZip}",
                         $"AutoClose::{_settings.AutoClose}"
                     }
                 });

EftPatchHelper/EftPatchHelper/Tasks/UploadTasks.cs

@@ -45,7 +45,7 @@ namespace EftPatchHelper.Tasks
             {
                 var gofile = new GoFileUpload(patcherFile, _settings.GoFileApiKey, _settings.GoFileFolderId);
                 _fileUploads.Add(gofile);
-                AnsiConsole.WriteLine("Added GoFile");
+                AnsiConsole.WriteLine("Added MEGA");
             }
 
             if (_settings.SftpUploads.Count > 0 && _options.UploadToSftpSites)
@@ -134,8 +134,6 @@ namespace EftPatchHelper.Tasks
             {
                 return false;
             }
-            
-            AnsiConsole.MarkupLine($"[blue]Starting {_fileUploads[0].UploadFileInfo.Name} uploads ...[/]");
 
             var succeeded = await AnsiConsole.Progress().Columns(
                 new TaskDescriptionColumn() { Alignment = Justify.Left},