Added: Ability to export original extension.

SinjuSigne · Sep 29, 2022 · f1a9938 · f1a9938
1 parent ee1c632
commit f1a9938
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/source/Reloaded.Mod.Launcher.Lib/Utility/JxlImageConverter.cs b/source/Reloaded.Mod.Launcher.Lib/Utility/JxlImageConverter.cs
@@ -16,7 +16,7 @@ static JxlImageConverter()
     }
 
     /// <inheritdoc />
-    public MemoryStream Convert(Span<byte> source, out string extension)
+    public MemoryStream Convert(Span<byte> source, string extension, out string newExtension)
     {        
         var settings = new ProcessImageSettings();
         settings.TrySetEncoderFormat(ImageMimeTypes.Jxl);
@@ -26,7 +26,7 @@ public MemoryStream Convert(Span<byte> source, out string extension)
         MagicImageProcessor.ProcessImage(source, output, settings);
 
         output.Position = 0;
-        extension = ".jxl";
+        newExtension = extension;
         return output;
     }
 }
diff --git a/source/Reloaded.Mod.Loader.Tests/Update/Pack/Mocks/DummyImageConverter.cs b/source/Reloaded.Mod.Loader.Tests/Update/Pack/Mocks/DummyImageConverter.cs
@@ -2,9 +2,9 @@
 
 public class DummyImageConverter : IImageConverter
 {
-    public MemoryStream Convert(Span<byte> source, out string extension)
+    public MemoryStream Convert(Span<byte> source, string extension, out string newExtension)
     {
-        extension = ".org";
+        newExtension = extension;
         return new MemoryStream(source.ToArray());
     }
 }
diff --git a/source/Reloaded.Mod.Loader.Update/Interfaces/IImageConverter.cs b/source/Reloaded.Mod.Loader.Update/Interfaces/IImageConverter.cs
@@ -9,7 +9,8 @@ public interface IImageConverter
      /// Converts the image to new format.
      /// </summary>
      /// <param name="source">Span containing the source image to be converted.</param>
-     /// <param name="extension">The extension for the image.</param>
+     /// <param name="originalExtension">Original extension for this format.</param>
+     /// <param name="newExtension">The extension for the image.</param>
      /// <returns>The converted image in a stream. Stream should have position 0 and end at end of file.</returns>
-     public MemoryStream Convert(Span<byte> source, out string extension);
+     public MemoryStream Convert(Span<byte> source, string originalExtension, out string newExtension);
 }
diff --git a/source/Reloaded.Mod.Loader.Update/Packs/AutoPackCreator.cs b/source/Reloaded.Mod.Loader.Update/Packs/AutoPackCreator.cs
@@ -52,7 +52,7 @@ public static async Task<ReloadedPackBuilder> CreateAsync(IEnumerable<ModConfig>
                 foreach (var image in bestPkg.images)
                 {
                     var file = await imageDownloader.GetOrDownloadFileFromUrl(image.Uri, imageDownloader.ModPreviewExpiration, false, token);
-                    var converted = imageConverter.Convert(file, out string ext);
+                    var converted = imageConverter.Convert(file, Path.GetExtension(image.Uri.ToString()), out string ext);
                     itemBuilder.AddImage(converted, ext, image.Caption);
                 }
             }