Revert "Changed the way conversion happens."

This reverts commit 7f6db24.
Kareadita · maxpiva · Aug 15, 2024 · Aug 15, 2024 · Aug 23, 2024 · Aug 23, 2024
commit 9d48664b08f01303f1527bc1c577e1d4376f89ff
diff --git a/API.Tests/Services/ArchiveServiceTests.cs b/API.Tests/Services/ArchiveServiceTests.cs
@@ -30,7 +30,7 @@ public ArchiveServiceTests(ITestOutputHelper testOutputHelper)
         _testOutputHelper = testOutputHelper;
         _archiveService = new ArchiveService(_logger, _directoryService,
             new ImageService(Substitute.For<ILogger<ImageService>>(), _directoryService, Substitute.For<IEasyCachingProviderFactory>(), Substitute.For<IImageConverterService>()),
-            Substitute.For<IMediaErrorService>());
+            Substitute.For<IMediaErrorService>(), Substitute.For<IImageConverterService>());
     }
 
     [Theory]
@@ -224,9 +224,9 @@ public void GetCoverImage_SharpCompress_Test(string inputFile, string expectedOu
     public void CanParseCoverImage(string inputFile)
     {
         var imageService = Substitute.For<IImageService>();
-        imageService.WriteCoverThumbnail(Arg.Any<string>(), Arg.Any<Stream>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<EncodeFormat>())
+        imageService.WriteCoverThumbnail(Arg.Any<Stream>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<EncodeFormat>())
             .Returns(x => "cover.jpg");
-        var archiveService = new ArchiveService(_logger, _directoryService, imageService, Substitute.For<IMediaErrorService>());
+        var archiveService = new ArchiveService(_logger, _directoryService, imageService, Substitute.For<IMediaErrorService>(),Substitute.For<IImageConverterService>());
         var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/");
         var inputPath = Path.GetFullPath(Path.Join(testDirectory, inputFile));
         var outputPath = Path.Join(testDirectory, Path.GetFileNameWithoutExtension(inputFile) + "_output");

diff --git a/API.Tests/Services/CacheServiceTests.cs b/API.Tests/Services/CacheServiceTests.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Data.Common;
 using System.IO;
 using System.IO.Abstractions.TestingHelpers;
@@ -158,7 +158,7 @@ public async Task Ensure_DirectoryAlreadyExists_DontExtractAnything()
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(),
                 Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(), Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         await ResetDB();
         var s = new SeriesBuilder("Test").Build();
@@ -234,7 +234,7 @@ public void CleanupChapters_AllFilesShouldBeDeleted()
         var cleanupService = new CacheService(_logger, _unitOfWork, ds,
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(), Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(), Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         cleanupService.CleanupChapters(new []{1, 3});
         Assert.Empty(ds.GetFiles(CacheDirectory, searchOption:SearchOption.AllDirectories));
@@ -256,7 +256,7 @@ public void GetCachedEpubFile_ShouldReturnFirstEpub()
         var cs = new CacheService(_logger, _unitOfWork, ds,
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(), Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(), Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         var c = new ChapterBuilder("1")
             .WithFile(new MangaFileBuilder($"{DataDirectory}1.epub", MangaFormat.Epub).Build())
@@ -297,7 +297,7 @@ public void GetCachedPagePath_ReturnNullIfNoFiles()
         var cs = new CacheService(_logger, _unitOfWork, ds,
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(), Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(),Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         // Flatten to prepare for how GetFullPath expects
         ds.Flatten($"{CacheDirectory}1/");
@@ -341,7 +341,7 @@ public void GetCachedPagePath_GetFileFromFirstFile()
         var cs = new CacheService(_logger, _unitOfWork, ds,
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(), Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(), Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         // Flatten to prepare for how GetFullPath expects
         ds.Flatten($"{CacheDirectory}1/");
@@ -382,7 +382,7 @@ public void GetCachedPagePath_GetLastPageFromSingleFile()
         var cs = new CacheService(_logger, _unitOfWork, ds,
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(), Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(), Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         // Flatten to prepare for how GetFullPath expects
         ds.Flatten($"{CacheDirectory}1/");
@@ -427,7 +427,7 @@ public void GetCachedPagePath_GetFileFromSecondFile()
         var cs = new CacheService(_logger, _unitOfWork, ds,
             new ReadingItemService(Substitute.For<IArchiveService>(),
                 Substitute.For<IBookService>(), Substitute.For<IImageService>(), ds, Substitute.For<ILogger<ReadingItemService>>()),
-            Substitute.For<IBookmarkService>(), Substitute.For<IImageConverterService>());
+            Substitute.For<IBookmarkService>());
 
         // Flatten to prepare for how GetFullPath expects
         ds.Flatten($"{CacheDirectory}1/");

diff --git a/API/API.csproj b/API/API.csproj
@@ -13,7 +13,8 @@
   </PropertyGroup>
 
   <Target Name="PostBuild" AfterTargets="Build" Condition=" '$(Configuration)' == 'Debug' ">
-
+      <Delete Files="../openapi.json" />
+      <Exec Command="swagger tofile --output ../openapi.json bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).dll v1" />
   </Target>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/API/Controllers/OPDSController.cs b/API/Controllers/OPDSController.cs
@@ -1228,7 +1228,7 @@ public async Task<ActionResult> GetPageStreamedImage(string apiKey, [FromQuery]
 
         try
         {
-            var path = _cacheService.GetCachedPagePath(chapter.Id, pageNumber, Request.SupportedImageTypesFromRequest());
+            var path = _cacheService.GetCachedPagePath(chapter.Id, pageNumber);
             if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path))
                 return BadRequest(await _localizationService.Translate(userId, "no-image-for-page", pageNumber));
 
@@ -1252,7 +1252,7 @@ await _readerService.SaveReadingProgress(new ProgressDto()
                 }, userId);
             }
 
-            return File(content, format.GetMimeType());
+            return File(content, MimeTypeMap.GetMimeType(format));
         }
         catch (Exception)
         {

diff --git a/API/Controllers/ReaderController.cs b/API/Controllers/ReaderController.cs
@@ -23,7 +23,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using MimeTypes;
-using Org.BouncyCastle.Ocsp;
 
 namespace API.Controllers;
 
@@ -119,12 +118,12 @@ public async Task<ActionResult> GetImage(int chapterId, int page, string apiKey,
             var chapter = await _cacheService.Ensure(chapterId, extractPdf);
             if (chapter == null) return NoContent();
             _logger.LogInformation("Fetching Page {PageNum} on Chapter {ChapterId}", page, chapterId);
-            var path = _cacheService.GetCachedPagePath(chapter.Id, page, Request.SupportedImageTypesFromRequest());
+            var path = _cacheService.GetCachedPagePath(chapter.Id, page);
             if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path))
                 return BadRequest(await _localizationService.Translate(userId, "no-image-for-page", page));
             var format = Path.GetExtension(path);
 
-            return PhysicalFile(path, format.GetMimeType(), Path.GetFileName(path), true);
+            return PhysicalFile(path, MimeTypeMap.GetMimeType(format), Path.GetFileName(path), true);
         }
         catch (Exception)
         {
@@ -133,8 +132,6 @@ public async Task<ActionResult> GetImage(int chapterId, int page, string apiKey,
         }
     }
 
-
-
     /// <summary>
     /// Returns a thumbnail for the given page number
     /// </summary>
@@ -183,11 +180,11 @@ public async Task<ActionResult> GetBookmarkImage(int seriesId, string apiKey, in
 
         try
         {
-            var path = _cacheService.GetCachedBookmarkPagePath(seriesId, page, Request.SupportedImageTypesFromRequest());
+            var path = _cacheService.GetCachedBookmarkPagePath(seriesId, page);
             if (string.IsNullOrEmpty(path) || !System.IO.File.Exists(path)) return BadRequest(await _localizationService.Translate(userId, "no-image-for-page", page));
             var format = Path.GetExtension(path);
 
-            return PhysicalFile(path, format.GetMimeType(), Path.GetFileName(path));
+            return PhysicalFile(path, MimeTypeMap.GetMimeType(format), Path.GetFileName(path));
         }
         catch (Exception)
         {
@@ -732,7 +729,7 @@ public async Task<ActionResult> BookmarkPage(BookmarkDto bookmarkDto)
         if (chapter == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "cache-file-find"));
 
         bookmarkDto.Page = _readerService.CapPageToChapter(chapter, bookmarkDto.Page);
-        var path = _cacheService.GetCachedPagePath(chapter.Id, bookmarkDto.Page, Request.SupportedImageTypesFromRequest());
+        var path = _cacheService.GetCachedPagePath(chapter.Id, bookmarkDto.Page);
 
         if (!await _bookmarkService.BookmarkPage(user, bookmarkDto, path))
             return BadRequest(await _localizationService.Translate(User.GetUserId(), "bookmark-save"));

diff --git a/API/Extensions/FileTypeGroupExtensions.cs b/API/Extensions/FileTypeGroupExtensions.cs
@@ -1,7 +1,6 @@
-using System;
+using System;
 using API.Entities.Enums;
 using API.Services.Tasks.Scanner.Parser;
-using MimeTypes;
 
 namespace API.Extensions;
 
@@ -23,13 +22,4 @@ public static string GetRegex(this FileTypeGroup fileTypeGroup)
                 throw new ArgumentOutOfRangeException(nameof(fileTypeGroup), fileTypeGroup, null);
         }
     }
-    public static string GetMimeType(this string format)
-    {
-        //Add jxl format
-        format = format.ToLowerInvariant();
-        if (format == ".jxl")
-            return "image/jxl";
-        return MimeTypeMap.GetMimeType(format);
-    }
-
 }
diff --git a/API/Extensions/HttpExtensions.cs b/API/Extensions/HttpExtensions.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
@@ -56,31 +53,4 @@ public static void AddCacheHeader(this HttpResponse response, string filename, i
             response.Headers.CacheControl =  $"max-age={maxAge}";
         }
     }
-
-    public static List<string> SupportedImageTypesFromRequest(this HttpRequest request)
-    {
-        var acceptHeader = request.Headers["Accept"];
-        string[] spl1 = acceptHeader.ToString().Split(';');
-        acceptHeader = spl1[0];
-        string[] split = acceptHeader.ToString().Split(',');
-        List<string> defaultExtensions = new List<string>();
-        defaultExtensions.Add("jpeg");
-        defaultExtensions.Add("jpg");
-        defaultExtensions.Add("png");
-        defaultExtensions.Add("gif");
-
-        foreach (string v in split)
-        {
-            if (v.StartsWith("image/", StringComparison.InvariantCultureIgnoreCase))
-            {
-                string n = v.Substring(6);
-                if (n == "svg+xml")
-                    n = "svg";
-                if (n.StartsWith("*"))
-                    continue;
-                defaultExtensions.Add(n.ToLowerInvariant());
-            }
-        }
-        return defaultExtensions;
-    }
 }
diff --git a/API/Services/ArchiveService.cs b/API/Services/ArchiveService.cs
@@ -58,16 +58,17 @@ public class ArchiveService : IArchiveService
     private readonly IDirectoryService _directoryService;
     private readonly IImageService _imageService;
     private readonly IMediaErrorService _mediaErrorService;
-
+    private readonly IImageConverterService _converterService;
     private const string ComicInfoFilename = "ComicInfo.xml";
 
     public ArchiveService(ILogger<ArchiveService> logger, IDirectoryService directoryService,
-        IImageService imageService, IMediaErrorService mediaErrorService)
+        IImageService imageService, IMediaErrorService mediaErrorService, IImageConverterService converterService)
     {
         _logger = logger;
         _directoryService = directoryService;
         _imageService = imageService;
         _mediaErrorService = mediaErrorService;
+        _converterService = converterService;
     }
 
     /// <summary>
@@ -232,8 +233,8 @@ public string GetCoverImage(string archivePath, string fileName, string outputDi
                     var entryName = FindCoverImageFilename(archivePath, archive.Entries.Select(e => e.FullName));
                     var entry = archive.Entries.Single(e => e.FullName == entryName);
 
-                    using var stream = entry.Open();
-                    return _imageService.WriteCoverThumbnail(entryName, stream, fileName, outputDirectory, format, size);
+                    using var stream = _converterService.ConvertStream(entryName, entry.Open());
+                    return _imageService.WriteCoverThumbnail(stream, fileName, outputDirectory, format, size);
                 }
                 case ArchiveLibrary.SharpCompress:
                 {
@@ -243,8 +244,8 @@ public string GetCoverImage(string archivePath, string fileName, string outputDi
                     var entryName = FindCoverImageFilename(archivePath, entryNames);
                     var entry = archive.Entries.Single(e => e.Key == entryName);
 
-                    using var stream = entry.OpenEntryStream();
-                    return _imageService.WriteCoverThumbnail(entryName, stream, fileName, outputDirectory, format, size);
+                    using var stream = _converterService.ConvertStream(entryName, entry.OpenEntryStream());
+                    return _imageService.WriteCoverThumbnail(stream, fileName, outputDirectory, format, size);
                 }
                 case ArchiveLibrary.NotSupported:
                     _logger.LogWarning("[GetCoverImage] This archive cannot be read: {ArchivePath}. Defaulting to no cover image", archivePath);
@@ -561,6 +562,7 @@ public void ExtractArchive(string archivePath, string extractPath)
                 {
                     using var archive = ZipFile.OpenRead(archivePath);
                     ExtractArchiveEntries(archive, extractPath);
+                    _converterService.ConvertDirectory(extractPath);
                     break;
                 }
                 case ArchiveLibrary.SharpCompress:
@@ -569,6 +571,7 @@ public void ExtractArchive(string archivePath, string extractPath)
                     ExtractArchiveEntities(archive.Entries.Where(entry => !entry.IsDirectory
                                                                           && !Tasks.Scanner.Parser.Parser.HasBlacklistedFolderInPath(Path.GetDirectoryName(entry.Key) ?? string.Empty)
                                                                           && Tasks.Scanner.Parser.Parser.IsImage(entry.Key)), extractPath);
+                    _converterService.ConvertDirectory(extractPath);
                     break;
                 }
                 case ArchiveLibrary.NotSupported:

diff --git a/API/Services/BookService.cs b/API/Services/BookService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -1229,7 +1229,7 @@ public string GetCoverImage(string fileFilePath, string fileName, string outputD
             if (coverImageContent == null) return string.Empty;
             using var stream = coverImageContent.GetContentStream();
 
-            return _imageService.WriteCoverThumbnail(fileFilePath, stream, fileName, outputDirectory, encodeFormat, size);
+            return _imageService.WriteCoverThumbnail(stream, fileName, outputDirectory, encodeFormat, size);
         }
         catch (Exception ex)
         {
@@ -1252,7 +1252,7 @@ private string GetPdfCoverImage(string fileFilePath, string fileName, string out
             using var stream = StreamManager.GetStream("BookService.GetPdfPage");
             GetPdfPage(docReader, 0, stream);
 
-            return _imageService.WriteCoverThumbnail(fileFilePath, stream, fileName, outputDirectory, encodeFormat, size);
+            return _imageService.WriteCoverThumbnail(stream, fileName, outputDirectory, encodeFormat, size);
 
         }
         catch (Exception ex)