mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 12:14:44 -04:00
0e19ba4a10
* Fixed a unit test in ArchiveService * Image scaling fixes * removing test * Added new layout mode (enum only) and cleaned up manga reader and wrote extra documentation * Aligned code with cleanup * Adding reverse classes for manga reading * Disable options for layout modes that doesn't make sense. * Cleaned up manga reader menu items to link to preferences options directly * Work in progress, but rendering the correct page numbers for double. Need to rework caching logic so we can use existing image objects * Pagination logic is now properly increasing page number an extra when double layout mode * I can't figure out cachedImages to work properly with double pages, but doing it in a way where it handles downloading the image (and etag cache) + rendering the url, seems to work really well * Double original fix, also flex squish fix * Implemented last page on double which will load next chapter. Fixed a bug where if GetImage from ReaderController threw an error, the chapter directory would be emptied, but the folder itself wasn't deleted. * Fixed a bad if for double manga * double class fix * Cleanup up some console.logs * Adjusted the caching for images in a reading session so they cache for 2 mins * fixing webtoon image issue * Tweaked the caching of images to 10 mins for reading. Fixed a bug where after webtoon, single image layout would be selected. Tweaked logic for handling prev/next pages on chapter boundaries. * Fixed an issue where 2nd page would be skipped * Fixed an issue where 2nd page would be skipped * Fixed a skip page issue * Misc css fixes Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
330 lines
17 KiB
C#
330 lines
17 KiB
C#
using System.Diagnostics;
|
|
using System.IO;
|
|
using System.IO.Abstractions;
|
|
using System.IO.Abstractions.TestingHelpers;
|
|
using System.IO.Compression;
|
|
using System.Linq;
|
|
using API.Archive;
|
|
using API.Data.Metadata;
|
|
using API.Services;
|
|
using Microsoft.Extensions.Logging;
|
|
using NetVips;
|
|
using NSubstitute;
|
|
using NSubstitute.Extensions;
|
|
using Xunit;
|
|
using Xunit.Abstractions;
|
|
|
|
namespace API.Tests.Services
|
|
{
|
|
public class ArchiveServiceTests
|
|
{
|
|
private readonly ITestOutputHelper _testOutputHelper;
|
|
private readonly ArchiveService _archiveService;
|
|
private readonly ILogger<ArchiveService> _logger = Substitute.For<ILogger<ArchiveService>>();
|
|
private readonly ILogger<DirectoryService> _directoryServiceLogger = Substitute.For<ILogger<DirectoryService>>();
|
|
private readonly IDirectoryService _directoryService = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), new FileSystem());
|
|
|
|
public ArchiveServiceTests(ITestOutputHelper testOutputHelper)
|
|
{
|
|
_testOutputHelper = testOutputHelper;
|
|
_archiveService = new ArchiveService(_logger, _directoryService, new ImageService(Substitute.For<ILogger<ImageService>>(), _directoryService));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("flat file.zip", false)]
|
|
[InlineData("file in folder in folder.zip", true)]
|
|
[InlineData("file in folder.zip", true)]
|
|
[InlineData("file in folder_alt.zip", true)]
|
|
public void ArchiveNeedsFlatteningTest(string archivePath, bool expected)
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/Archives");
|
|
var file = Path.Join(testDirectory, archivePath);
|
|
using ZipArchive archive = ZipFile.OpenRead(file);
|
|
Assert.Equal(expected, _archiveService.ArchiveNeedsFlattening(archive));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("non existent file.zip", false)]
|
|
[InlineData("winrar.rar", true)]
|
|
[InlineData("empty.zip", true)]
|
|
[InlineData("flat file.zip", true)]
|
|
[InlineData("file in folder in folder.zip", true)]
|
|
[InlineData("file in folder.zip", true)]
|
|
[InlineData("file in folder_alt.zip", true)]
|
|
public void IsValidArchiveTest(string archivePath, bool expected)
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/Archives");
|
|
Assert.Equal(expected, _archiveService.IsValidArchive(Path.Join(testDirectory, archivePath)));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("non existent file.zip", 0)]
|
|
[InlineData("winrar.rar", 0)]
|
|
[InlineData("empty.zip", 0)]
|
|
[InlineData("flat file.zip", 1)]
|
|
[InlineData("file in folder in folder.zip", 1)]
|
|
[InlineData("file in folder.zip", 1)]
|
|
[InlineData("file in folder_alt.zip", 1)]
|
|
[InlineData("macos_none.zip", 0)]
|
|
[InlineData("macos_one.zip", 1)]
|
|
[InlineData("macos_native.zip", 21)]
|
|
public void GetNumberOfPagesFromArchiveTest(string archivePath, int expected)
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/Archives");
|
|
var sw = Stopwatch.StartNew();
|
|
Assert.Equal(expected, _archiveService.GetNumberOfPagesFromArchive(Path.Join(testDirectory, archivePath)));
|
|
_testOutputHelper.WriteLine($"Processed Original in {sw.ElapsedMilliseconds} ms");
|
|
}
|
|
|
|
|
|
|
|
[Theory]
|
|
[InlineData("non existent file.zip", ArchiveLibrary.NotSupported)]
|
|
[InlineData("winrar.rar", ArchiveLibrary.SharpCompress)]
|
|
[InlineData("empty.zip", ArchiveLibrary.Default)]
|
|
[InlineData("flat file.zip", ArchiveLibrary.Default)]
|
|
[InlineData("file in folder in folder.zip", ArchiveLibrary.Default)]
|
|
[InlineData("file in folder.zip", ArchiveLibrary.Default)]
|
|
[InlineData("file in folder_alt.zip", ArchiveLibrary.Default)]
|
|
public void CanOpenArchive(string archivePath, ArchiveLibrary expected)
|
|
{
|
|
var sw = Stopwatch.StartNew();
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/Archives");
|
|
|
|
Assert.Equal(expected, _archiveService.CanOpen(Path.Join(testDirectory, archivePath)));
|
|
_testOutputHelper.WriteLine($"Processed Original in {sw.ElapsedMilliseconds} ms");
|
|
}
|
|
|
|
|
|
[Theory]
|
|
[InlineData("non existent file.zip", 0)]
|
|
[InlineData("winrar.rar", 0)]
|
|
[InlineData("empty.zip", 0)]
|
|
[InlineData("flat file.zip", 1)]
|
|
[InlineData("file in folder in folder.zip", 1)]
|
|
[InlineData("file in folder.zip", 1)]
|
|
[InlineData("file in folder_alt.zip", 1)]
|
|
public void CanExtractArchive(string archivePath, int expectedFileCount)
|
|
{
|
|
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/Archives");
|
|
var extractDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/Archives/Extraction");
|
|
|
|
_directoryService.ClearAndDeleteDirectory(extractDirectory);
|
|
|
|
var sw = Stopwatch.StartNew();
|
|
_archiveService.ExtractArchive(Path.Join(testDirectory, archivePath), extractDirectory);
|
|
var di1 = new DirectoryInfo(extractDirectory);
|
|
Assert.Equal(expectedFileCount, di1.Exists ? _directoryService.GetFiles(extractDirectory, searchOption:SearchOption.AllDirectories).Count() : 0);
|
|
_testOutputHelper.WriteLine($"Processed in {sw.ElapsedMilliseconds} ms");
|
|
|
|
_directoryService.ClearAndDeleteDirectory(extractDirectory);
|
|
}
|
|
|
|
|
|
[Theory]
|
|
[InlineData(new [] {"folder.jpg"}, "folder.jpg")]
|
|
[InlineData(new [] {"vol1/"}, "")]
|
|
[InlineData(new [] {"folder.jpg", "vol1/folder.jpg"}, "folder.jpg")]
|
|
[InlineData(new [] {"cover.jpg", "vol1/folder.jpg"}, "cover.jpg")]
|
|
[InlineData(new [] {"__MACOSX/cover.jpg", "vol1/page 01.jpg"}, "")]
|
|
[InlineData(new [] {"Akame ga KILL! ZERO - c055 (v10) - p000 [Digital] [LuCaZ].jpg", "Akame ga KILL! ZERO - c055 (v10) - p000 [Digital] [LuCaZ].jpg", "Akame ga KILL! ZERO - c060 (v10) - p200 [Digital] [LuCaZ].jpg", "folder.jpg"}, "folder.jpg")]
|
|
public void FindFolderEntry(string[] files, string expected)
|
|
{
|
|
var foundFile = ArchiveService.FindFolderEntry(files);
|
|
Assert.Equal(expected, string.IsNullOrEmpty(foundFile) ? "" : foundFile);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(new [] {"folder.jpg"}, "folder.jpg")]
|
|
[InlineData(new [] {"vol1/"}, "")]
|
|
[InlineData(new [] {"folder.jpg", "vol1/folder.jpg"}, "folder.jpg")]
|
|
[InlineData(new [] {"cover.jpg", "vol1/folder.jpg"}, "cover.jpg")]
|
|
[InlineData(new [] {"page 2.jpg", "page 10.jpg"}, "page 2.jpg")]
|
|
[InlineData(new [] {"__MACOSX/cover.jpg", "vol1/page 01.jpg"}, "vol1/page 01.jpg")]
|
|
[InlineData(new [] {"Akame ga KILL! ZERO - c055 (v10) - p000 [Digital] [LuCaZ].jpg", "Akame ga KILL! ZERO - c055 (v10) - p000 [Digital] [LuCaZ].jpg", "Akame ga KILL! ZERO - c060 (v10) - p200 [Digital] [LuCaZ].jpg", "folder.jpg"}, "Akame ga KILL! ZERO - c055 (v10) - p000 [Digital] [LuCaZ].jpg")]
|
|
[InlineData(new [] {"001.jpg", "001 - chapter 1/001.jpg"}, "001.jpg")]
|
|
[InlineData(new [] {"chapter 1/001.jpg", "chapter 2/002.jpg", "somefile.jpg"}, "somefile.jpg")]
|
|
public void FindFirstEntry(string[] files, string expected)
|
|
{
|
|
var foundFile = ArchiveService.FirstFileEntry(files, string.Empty);
|
|
Assert.Equal(expected, string.IsNullOrEmpty(foundFile) ? "" : foundFile);
|
|
}
|
|
|
|
|
|
[Theory]
|
|
[InlineData("v10.cbz", "v10.expected.png")]
|
|
[InlineData("v10 - with folder.cbz", "v10 - with folder.expected.png")]
|
|
[InlineData("v10 - nested folder.cbz", "v10 - nested folder.expected.png")]
|
|
[InlineData("macos_native.zip", "macos_native.png")]
|
|
[InlineData("v10 - duplicate covers.cbz", "v10 - duplicate covers.expected.png")]
|
|
[InlineData("sorting.zip", "sorting.expected.png")]
|
|
[InlineData("test.zip", "test.expected.jpg")]
|
|
public void GetCoverImage_Default_Test(string inputFile, string expectedOutputFile)
|
|
{
|
|
var ds = Substitute.For<DirectoryService>(_directoryServiceLogger, new FileSystem());
|
|
var imageService = new ImageService(Substitute.For<ILogger<ImageService>>(), ds);
|
|
var archiveService = Substitute.For<ArchiveService>(_logger, ds, imageService);
|
|
|
|
var testDirectory = Path.GetFullPath(Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/CoverImages"));
|
|
var expectedBytes = Image.Thumbnail(Path.Join(testDirectory, expectedOutputFile), 320).WriteToBuffer(".png");
|
|
|
|
archiveService.Configure().CanOpen(Path.Join(testDirectory, inputFile)).Returns(ArchiveLibrary.Default);
|
|
|
|
var outputDir = Path.Join(testDirectory, "output");
|
|
_directoryService.ClearDirectory(outputDir);
|
|
_directoryService.ExistOrCreate(outputDir);
|
|
|
|
var coverImagePath = archiveService.GetCoverImage(Path.Join(testDirectory, inputFile),
|
|
Path.GetFileNameWithoutExtension(inputFile) + "_output", outputDir);
|
|
var actual = File.ReadAllBytes(Path.Join(outputDir, coverImagePath));
|
|
|
|
|
|
Assert.Equal(expectedBytes, actual);
|
|
_directoryService.ClearAndDeleteDirectory(outputDir);
|
|
}
|
|
|
|
|
|
[Theory]
|
|
[InlineData("v10.cbz", "v10.expected.png")]
|
|
[InlineData("v10 - with folder.cbz", "v10 - with folder.expected.png")]
|
|
[InlineData("v10 - nested folder.cbz", "v10 - nested folder.expected.png")]
|
|
[InlineData("macos_native.zip", "macos_native.png")]
|
|
[InlineData("v10 - duplicate covers.cbz", "v10 - duplicate covers.expected.png")]
|
|
[InlineData("sorting.zip", "sorting.expected.png")]
|
|
public void GetCoverImage_SharpCompress_Test(string inputFile, string expectedOutputFile)
|
|
{
|
|
var imageService = new ImageService(Substitute.For<ILogger<ImageService>>(), _directoryService);
|
|
var archiveService = Substitute.For<ArchiveService>(_logger,
|
|
new DirectoryService(_directoryServiceLogger, new FileSystem()), imageService);
|
|
var testDirectory = API.Parser.Parser.NormalizePath(Path.GetFullPath(Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/CoverImages")));
|
|
|
|
var outputDir = Path.Join(testDirectory, "output");
|
|
_directoryService.ClearDirectory(outputDir);
|
|
_directoryService.ExistOrCreate(outputDir);
|
|
|
|
archiveService.Configure().CanOpen(Path.Join(testDirectory, inputFile)).Returns(ArchiveLibrary.SharpCompress);
|
|
var coverOutputFile = archiveService.GetCoverImage(Path.Join(testDirectory, inputFile),
|
|
Path.GetFileNameWithoutExtension(inputFile), outputDir);
|
|
var actualBytes = File.ReadAllBytes(Path.Join(outputDir, coverOutputFile));
|
|
var expectedBytes = File.ReadAllBytes(Path.Join(testDirectory, expectedOutputFile));
|
|
Assert.Equal(expectedBytes, actualBytes);
|
|
|
|
_directoryService.ClearAndDeleteDirectory(outputDir);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("Archives/macos_native.zip")]
|
|
[InlineData("Formats/One File with DB_Supported.zip")]
|
|
public void CanParseCoverImage(string inputFile)
|
|
{
|
|
var imageService = Substitute.For<IImageService>();
|
|
imageService.WriteCoverThumbnail(Arg.Any<Stream>(), Arg.Any<string>(), Arg.Any<string>()).Returns(x => "cover.jpg");
|
|
var archiveService = new ArchiveService(_logger, _directoryService, imageService);
|
|
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");
|
|
new DirectoryInfo(outputPath).Create();
|
|
var expectedImage = archiveService.GetCoverImage(inputPath, inputFile, outputPath);
|
|
Assert.Equal("cover.jpg", expectedImage);
|
|
new DirectoryInfo(outputPath).Delete();
|
|
}
|
|
|
|
#region ShouldHaveComicInfo
|
|
|
|
[Fact]
|
|
public void ShouldHaveComicInfo()
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
|
|
var archive = Path.Join(testDirectory, "ComicInfo.zip");
|
|
const string summaryInfo = "By all counts, Ryouta Sakamoto is a loser when he's not holed up in his room, bombing things into oblivion in his favorite online action RPG. But his very own uneventful life is blown to pieces when he's abducted and taken to an uninhabited island, where he soon learns the hard way that he's being pitted against others just like him in a explosives-riddled death match! How could this be happening? Who's putting them up to this? And why!? The name, not to mention the objective, of this very real survival game is eerily familiar to Ryouta, who has mastered its virtual counterpart-BTOOOM! Can Ryouta still come out on top when he's playing for his life!?";
|
|
|
|
var comicInfo = _archiveService.GetComicInfo(archive);
|
|
Assert.NotNull(comicInfo);
|
|
Assert.Equal(summaryInfo, comicInfo.Summary);
|
|
}
|
|
|
|
[Fact]
|
|
public void ShouldHaveComicInfo_WithAuthors()
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
|
|
var archive = Path.Join(testDirectory, "ComicInfo_authors.zip");
|
|
|
|
var comicInfo = _archiveService.GetComicInfo(archive);
|
|
Assert.NotNull(comicInfo);
|
|
Assert.Equal("Junya Inoue", comicInfo.Writer);
|
|
}
|
|
|
|
[Fact]
|
|
public void ShouldHaveComicInfo_TopLevelFileOnly()
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
|
|
var archive = Path.Join(testDirectory, "ComicInfo_duplicateInfos.zip");
|
|
|
|
var comicInfo = _archiveService.GetComicInfo(archive);
|
|
Assert.NotNull(comicInfo);
|
|
Assert.Equal("BTOOOM!", comicInfo.Series);
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region CanParseComicInfo
|
|
|
|
[Fact]
|
|
public void CanParseComicInfo()
|
|
{
|
|
var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ArchiveService/ComicInfos");
|
|
var archive = Path.Join(testDirectory, "ComicInfo.zip");
|
|
var actual = _archiveService.GetComicInfo(archive);
|
|
var expected = new ComicInfo()
|
|
{
|
|
Publisher = "Yen Press",
|
|
Genre = "Manga, Movies & TV",
|
|
Summary =
|
|
"By all counts, Ryouta Sakamoto is a loser when he's not holed up in his room, bombing things into oblivion in his favorite online action RPG. But his very own uneventful life is blown to pieces when he's abducted and taken to an uninhabited island, where he soon learns the hard way that he's being pitted against others just like him in a explosives-riddled death match! How could this be happening? Who's putting them up to this? And why!? The name, not to mention the objective, of this very real survival game is eerily familiar to Ryouta, who has mastered its virtual counterpart-BTOOOM! Can Ryouta still come out on top when he's playing for his life!?",
|
|
PageCount = 194,
|
|
LanguageISO = "en",
|
|
Notes = "Scraped metadata from Comixology [CMXDB450184]",
|
|
Series = "BTOOOM!",
|
|
Title = "v01",
|
|
Web = "https://www.comixology.com/BTOOOM/digital-comic/450184"
|
|
};
|
|
|
|
Assert.NotStrictEqual(expected, actual);
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region FindCoverImageFilename
|
|
|
|
[Theory]
|
|
[InlineData(new string[] {}, "", null)]
|
|
[InlineData(new [] {"001.jpg", "002.jpg"}, "Test.zip", "001.jpg")]
|
|
[InlineData(new [] {"001.jpg", "!002.jpg"}, "Test.zip", "!002.jpg")]
|
|
[InlineData(new [] {"001.jpg", "!001.jpg"}, "Test.zip", "!001.jpg")]
|
|
[InlineData(new [] {"001.jpg", "cover.jpg"}, "Test.zip", "cover.jpg")]
|
|
[InlineData(new [] {"001.jpg", "Chapter 20/cover.jpg", "Chapter 21/0001.jpg"}, "Test.zip", "Chapter 20/cover.jpg")]
|
|
[InlineData(new [] {"._/001.jpg", "._/cover.jpg", "010.jpg"}, "Test.zip", "010.jpg")]
|
|
[InlineData(new [] {"001.txt", "002.txt", "a.jpg"}, "Test.zip", "a.jpg")]
|
|
public void FindCoverImageFilename(string[] filenames, string archiveName, string expected)
|
|
{
|
|
Assert.Equal(expected, ArchiveService.FindCoverImageFilename(archiveName, filenames));
|
|
}
|
|
|
|
|
|
#endregion
|
|
|
|
#region CreateZipForDownload
|
|
|
|
//[Fact]
|
|
public void CreateZipForDownloadTest()
|
|
{
|
|
var fileSystem = new MockFileSystem();
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), fileSystem);
|
|
//_archiveService.CreateZipForDownload(new []{}, outputDirectory)
|
|
}
|
|
|
|
#endregion
|
|
}
|
|
}
|