mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 15:30:34 -04:00
ebf7d46af3
* Started with some basic plumbing with comic info parsing updating Series/Volume. * We can now get chapter title from comicInfo.xml * Hooked in the ability to store people into the chapter metadata. * Removed no longer used imports, fixed up some foreign key constraints on deleting series with person linked. * Refactored Summary out of the UI for Series into SeriesMetadata. Updated application to .net 6. There is a bug in metadata code for updating. * Removed the parallel.ForEach with a normal foreach which lets us use async. For I/O heavy code, shouldn't change much. * Refactored scan code to only check extensions with comic info, fixed a bug on scan events not using correct method name, removed summary field (still buggy) * Fixed a bug where on cancelling a metadata request in modal, underlying button would get stuck in a disabled state. * Changed how metadata selects the first volume to read summary info from. It will now select the first non-special volume rather than Volume 1. * More debugging and found more bugs to fix * Redid all the migrations as one single one. Fixed a bug with GetChapterInfo returning null when ChapterMetadata didn't exist for that Chapter. Fixed an issue with mapper failing on GetChapterMetadata. Started work on adding people and a design for people. * Fixed a bug where checking if file modified now takes into account if file has been processed at least once. Introduced a bug in saving people to series. * Just made code compilable again * Fixed up code. Now people for series and chapters add correctly without any db issues. * Things are working, but I'm not happy with how the management of Person is. I need to take into account that 1 person needs to map to an image and role is arbitrary. * Started adding UI code to showcase chapter metadata * Updated workflow to be .NET 6 * WIP of updating card detail to show the information more clearly and without so many if statements * Removed ChatperMetadata and store on the Chapter itself. Much easier to use and less joins. * Implemented Genre on SeriesMetadata level * Genres and People are now removed from Series level if they are no longer on comicInfo * PeopleHelper is done with unit tests. Everything is working. * Unit tests in place for Genre Helper * Starting on CacheHelper * Finished tests for ShouldUpdateCoverImage. Fixed and added tests in ArchiveService/ScannerService. * CacheHelper is fully tested * Some DI cleanup * Scanner Service now calls GetComicInfo for books. Added ability to update Series Sort name from metadata files (mainly epub as comicinfo doesn't have a field) * Forgot to move a line of code * SortName now populates from metadata (epub only, ComicInfo has no tags) * Cards now show the chapter title name if it's set on hover, else will default back to title. * Fixed a major issue with how MangaFiles were being updated with LastModified, which messed up our logic for avoiding refreshes. * Woohoo, more tests and some refactors to be able to test more services wtih mock filesystem. Fixed an issue where SortName was getting set as first chapter, but the Series was in a group. * Refactored the MangaFile creation code into the DbFactory where we also setup the first LastModified update. * Has file changed bug is now finally fixed * Remove dead genres, refactor genre to use title instead of name. * Refactored out a directory from ShouldUpdateCoverImage() to keep the code clean * Unit tests for ComicInfo on BookService. * Refactored series detail into it's own component * Series-detail now received refresh metadata events to refresh what's on screen * Removed references to Artist on PersonRole as it has no metadata mapping * Security audit * Fixed a benchmark * Updated JWT Token generator to use new methods in .NET 6 * Updated all the docker and build commands to use net6.0 * Commented out sonar scan since it's not setup for net6.0 yet. * Removed some directives * Removed my test db
230 lines
13 KiB
C#
230 lines
13 KiB
C#
using System.Collections.Generic;
|
||
using API.Entities.Enums;
|
||
using API.Parser;
|
||
using Xunit;
|
||
using Xunit.Abstractions;
|
||
|
||
namespace API.Tests.Parser
|
||
{
|
||
public class ComicParserTests
|
||
{
|
||
private readonly ITestOutputHelper _testOutputHelper;
|
||
|
||
public ComicParserTests(ITestOutputHelper testOutputHelper)
|
||
{
|
||
_testOutputHelper = testOutputHelper;
|
||
}
|
||
|
||
[Theory]
|
||
[InlineData("04 - Asterix the Gladiator (1964) (Digital-Empire) (WebP by Doc MaKS)", "Asterix the Gladiator")]
|
||
[InlineData("The First Asterix Frieze (WebP by Doc MaKS)", "The First Asterix Frieze")]
|
||
[InlineData("Batman & Catwoman - Trail of the Gun 01", "Batman & Catwoman - Trail of the Gun")]
|
||
[InlineData("Batman & Daredevil - King of New York", "Batman & Daredevil - King of New York")]
|
||
[InlineData("Batman & Grendel (1996) 01 - Devil's Bones", "Batman & Grendel")]
|
||
[InlineData("Batman & Robin the Teen Wonder #0", "Batman & Robin the Teen Wonder")]
|
||
[InlineData("Batman & Wildcat (1 of 3)", "Batman & Wildcat")]
|
||
[InlineData("Batman And Superman World's Finest #01", "Batman And Superman World's Finest")]
|
||
[InlineData("Babe 01", "Babe")]
|
||
[InlineData("Scott Pilgrim 01 - Scott Pilgrim's Precious Little Life (2004)", "Scott Pilgrim")]
|
||
[InlineData("Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus)", "Teen Titans")]
|
||
[InlineData("Scott Pilgrim 02 - Scott Pilgrim vs. The World (2005)", "Scott Pilgrim")]
|
||
[InlineData("Wolverine - Origins 003 (2006) (digital) (Minutemen-PhD)", "Wolverine - Origins")]
|
||
[InlineData("Invincible Vol 01 Family matters (2005) (Digital).cbr", "Invincible")]
|
||
[InlineData("Amazing Man Comics chapter 25", "Amazing Man Comics")]
|
||
[InlineData("Amazing Man Comics issue #25", "Amazing Man Comics")]
|
||
[InlineData("Teen Titans v1 038 (1972) (c2c).cbr", "Teen Titans")]
|
||
[InlineData("Batman Beyond 02 (of 6) (1999)", "Batman Beyond")]
|
||
[InlineData("Batman Beyond - Return of the Joker (2001)", "Batman Beyond - Return of the Joker")]
|
||
[InlineData("Invincible 033.5 - Marvel Team-Up 14 (2006) (digital) (Minutemen-Slayer)", "Invincible")]
|
||
[InlineData("Batman Wayne Family Adventures - Ep. 001 - Moving In", "Batman Wayne Family Adventures")]
|
||
[InlineData("Saga 001 (2012) (Digital) (Empire-Zone).cbr", "Saga")]
|
||
[InlineData("spawn-123", "spawn")]
|
||
[InlineData("spawn-chapter-123", "spawn")]
|
||
[InlineData("Spawn 062 (1997) (digital) (TLK-EMPIRE-HD).cbr", "Spawn")]
|
||
[InlineData("Batman Beyond 04 (of 6) (1999)", "Batman Beyond")]
|
||
[InlineData("Batman Beyond 001 (2012)", "Batman Beyond")]
|
||
[InlineData("Batman Beyond 2.0 001 (2013)", "Batman Beyond 2.0")]
|
||
[InlineData("Batman - Catwoman 001 (2021) (Webrip) (The Last Kryptonian-DCP)", "Batman - Catwoman")]
|
||
[InlineData("Chew v1 - Taster´s Choise (2012) (Digital) (1920) (Kingpin-Empire)", "Chew")]
|
||
[InlineData("Chew Script Book (2011) (digital-Empire) SP04", "Chew Script Book")]
|
||
[InlineData("Batman - Detective Comics - Rebirth Deluxe Edition Book 02 (2018) (digital) (Son of Ultron-Empire)", "Batman - Detective Comics - Rebirth Deluxe Edition Book")]
|
||
[InlineData("Cyberpunk 2077 - Your Voice #01", "Cyberpunk 2077 - Your Voice")]
|
||
[InlineData("Cyberpunk 2077 #01", "Cyberpunk 2077")]
|
||
[InlineData("Cyberpunk 2077 - Trauma Team #04.cbz", "Cyberpunk 2077 - Trauma Team")]
|
||
[InlineData("Batgirl Vol.2000 #57 (December, 2004)", "Batgirl")]
|
||
[InlineData("Batgirl V2000 #57", "Batgirl")]
|
||
[InlineData("Fables 021 (2004) (Digital) (Nahga-Empire)", "Fables")]
|
||
[InlineData("2000 AD 0366 [1984-04-28] (flopbie)", "2000 AD")]
|
||
[InlineData("Daredevil - v6 - 10 - (2019)", "Daredevil")]
|
||
[InlineData("Batman - The Man Who Laughs #1 (2005)", "Batman - The Man Who Laughs")]
|
||
[InlineData("Demon 012 (Sep 1973) c2c", "Demon")]
|
||
[InlineData("Dragon Age - Until We Sleep 01 (of 03)", "Dragon Age - Until We Sleep")]
|
||
[InlineData("Green Lantern v2 017 - The Spy-Eye that doomed Green Lantern v2", "Green Lantern")]
|
||
[InlineData("Green Lantern - Circle of Fire Special - Adam Strange (2000)", "Green Lantern - Circle of Fire - Adam Strange")]
|
||
[InlineData("Identity Crisis Extra - Rags Morales Sketches (2005)", "Identity Crisis - Rags Morales Sketches")]
|
||
public void ParseComicSeriesTest(string filename, string expected)
|
||
{
|
||
Assert.Equal(expected, API.Parser.Parser.ParseComicSeries(filename));
|
||
}
|
||
|
||
[Theory]
|
||
[InlineData("01 Spider-Man & Wolverine 01.cbr", "0")]
|
||
[InlineData("04 - Asterix the Gladiator (1964) (Digital-Empire) (WebP by Doc MaKS)", "0")]
|
||
[InlineData("The First Asterix Frieze (WebP by Doc MaKS)", "0")]
|
||
[InlineData("Batman & Catwoman - Trail of the Gun 01", "0")]
|
||
[InlineData("Batman & Daredevil - King of New York", "0")]
|
||
[InlineData("Batman & Grendel (1996) 01 - Devil's Bones", "0")]
|
||
[InlineData("Batman & Robin the Teen Wonder #0", "0")]
|
||
[InlineData("Batman & Wildcat (1 of 3)", "0")]
|
||
[InlineData("Batman And Superman World's Finest #01", "0")]
|
||
[InlineData("Babe 01", "0")]
|
||
[InlineData("Scott Pilgrim 01 - Scott Pilgrim's Precious Little Life (2004)", "0")]
|
||
[InlineData("Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus)", "1")]
|
||
[InlineData("Scott Pilgrim 02 - Scott Pilgrim vs. The World (2005)", "0")]
|
||
[InlineData("Superman v1 024 (09-10 1943)", "1")]
|
||
[InlineData("Amazing Man Comics chapter 25", "0")]
|
||
[InlineData("Invincible 033.5 - Marvel Team-Up 14 (2006) (digital) (Minutemen-Slayer)", "0")]
|
||
[InlineData("Cyberpunk 2077 - Trauma Team 04.cbz", "0")]
|
||
[InlineData("spawn-123", "0")]
|
||
[InlineData("spawn-chapter-123", "0")]
|
||
[InlineData("Spawn 062 (1997) (digital) (TLK-EMPIRE-HD).cbr", "0")]
|
||
[InlineData("Batman Beyond 04 (of 6) (1999)", "0")]
|
||
[InlineData("Batman Beyond 001 (2012)", "0")]
|
||
[InlineData("Batman Beyond 2.0 001 (2013)", "0")]
|
||
[InlineData("Batman - Catwoman 001 (2021) (Webrip) (The Last Kryptonian-DCP)", "0")]
|
||
[InlineData("Chew v1 - Taster´s Choise (2012) (Digital) (1920) (Kingpin-Empire)", "1")]
|
||
[InlineData("Chew Script Book (2011) (digital-Empire) SP04", "0")]
|
||
[InlineData("Batgirl Vol.2000 #57 (December, 2004)", "2000")]
|
||
[InlineData("Batgirl V2000 #57", "2000")]
|
||
[InlineData("Fables 021 (2004) (Digital) (Nahga-Empire).cbr", "0")]
|
||
[InlineData("Cyberpunk 2077 - Trauma Team 04.cbz", "0")]
|
||
[InlineData("2000 AD 0366 [1984-04-28] (flopbie)", "0")]
|
||
[InlineData("Daredevil - v6 - 10 - (2019)", "6")]
|
||
public void ParseComicVolumeTest(string filename, string expected)
|
||
{
|
||
Assert.Equal(expected, API.Parser.Parser.ParseComicVolume(filename));
|
||
}
|
||
|
||
[Theory]
|
||
[InlineData("01 Spider-Man & Wolverine 01.cbr", "1")]
|
||
[InlineData("04 - Asterix the Gladiator (1964) (Digital-Empire) (WebP by Doc MaKS)", "0")]
|
||
[InlineData("The First Asterix Frieze (WebP by Doc MaKS)", "0")]
|
||
[InlineData("Batman & Catwoman - Trail of the Gun 01", "1")]
|
||
[InlineData("Batman & Daredevil - King of New York", "0")]
|
||
[InlineData("Batman & Grendel (1996) 01 - Devil's Bones", "1")]
|
||
[InlineData("Batman & Robin the Teen Wonder #0", "0")]
|
||
[InlineData("Batman & Wildcat (1 of 3)", "1")]
|
||
[InlineData("Batman & Wildcat (2 of 3)", "2")]
|
||
[InlineData("Batman And Superman World's Finest #01", "1")]
|
||
[InlineData("Babe 01", "1")]
|
||
[InlineData("Scott Pilgrim 01 - Scott Pilgrim's Precious Little Life (2004)", "1")]
|
||
[InlineData("Teen Titans v1 001 (1966-02) (digital) (OkC.O.M.P.U.T.O.-Novus)", "1")]
|
||
[InlineData("Superman v1 024 (09-10 1943)", "24")]
|
||
[InlineData("Invincible 070.5 - Invincible Returns 1 (2010) (digital) (Minutemen-InnerDemons).cbr", "70.5")]
|
||
[InlineData("Amazing Man Comics chapter 25", "25")]
|
||
[InlineData("Invincible 033.5 - Marvel Team-Up 14 (2006) (digital) (Minutemen-Slayer)", "33.5")]
|
||
[InlineData("Batman Wayne Family Adventures - Ep. 014 - Moving In", "14")]
|
||
[InlineData("Saga 001 (2012) (Digital) (Empire-Zone)", "1")]
|
||
[InlineData("spawn-123", "123")]
|
||
[InlineData("spawn-chapter-123", "123")]
|
||
[InlineData("Spawn 062 (1997) (digital) (TLK-EMPIRE-HD).cbr", "62")]
|
||
[InlineData("Batman Beyond 04 (of 6) (1999)", "4")]
|
||
[InlineData("Invincible 052 (c2c) (2008) (Minutemen-TheCouple)", "52")]
|
||
[InlineData("Y - The Last Man #001", "1")]
|
||
[InlineData("Batman Beyond 001 (2012)", "1")]
|
||
[InlineData("Batman Beyond 2.0 001 (2013)", "1")]
|
||
[InlineData("Batman - Catwoman 001 (2021) (Webrip) (The Last Kryptonian-DCP)", "1")]
|
||
[InlineData("Chew v1 - Taster´s Choise (2012) (Digital) (1920) (Kingpin-Empire)", "0")]
|
||
[InlineData("Chew Script Book (2011) (digital-Empire) SP04", "0")]
|
||
[InlineData("Batgirl Vol.2000 #57 (December, 2004)", "57")]
|
||
[InlineData("Batgirl V2000 #57", "57")]
|
||
[InlineData("Fables 021 (2004) (Digital) (Nahga-Empire).cbr", "21")]
|
||
[InlineData("Cyberpunk 2077 - Trauma Team #04.cbz", "4")]
|
||
[InlineData("2000 AD 0366 [1984-04-28] (flopbie)", "366")]
|
||
[InlineData("Daredevil - v6 - 10 - (2019)", "10")]
|
||
[InlineData("Batman Beyond 2016 - Chapter 001.cbz", "1")]
|
||
public void ParseComicChapterTest(string filename, string expected)
|
||
{
|
||
Assert.Equal(expected, API.Parser.Parser.ParseComicChapter(filename));
|
||
}
|
||
|
||
|
||
[Theory]
|
||
[InlineData("Batman - Detective Comics - Rebirth Deluxe Edition Book 02 (2018) (digital) (Son of Ultron-Empire)", true)]
|
||
[InlineData("Zombie Tramp vs. Vampblade TPB (2016) (Digital) (TheArchivist-Empire)", true)]
|
||
[InlineData("Baldwin the Brave & Other Tales Special SP1.cbr", true)]
|
||
[InlineData("Mouse Guard Specials - Spring 1153 - Fraggle Rock FCBD 2010", true)]
|
||
public void ParseComicSpecialTest(string input, bool expected)
|
||
{
|
||
Assert.Equal(expected, !string.IsNullOrEmpty(API.Parser.Parser.ParseComicSpecial(input)));
|
||
}
|
||
|
||
[Fact]
|
||
public void ParseInfoTest()
|
||
{
|
||
const string rootPath = @"E:/Comics/";
|
||
var expected = new Dictionary<string, ParserInfo>();
|
||
var filepath = @"E:/Comics/Teen Titans/Teen Titans v1 Annual 01 (1967) SP01.cbr";
|
||
expected.Add(filepath, new ParserInfo
|
||
{
|
||
Series = "Teen Titans", Volumes = "0",
|
||
Chapters = "0", Filename = "Teen Titans v1 Annual 01 (1967) SP01.cbr", Format = MangaFormat.Archive,
|
||
FullFilePath = filepath
|
||
});
|
||
|
||
// Fallback test with bad naming
|
||
filepath = @"E:\Comics\Comics\Babe\Babe Vol.1 #1-4\Babe 01.cbr";
|
||
expected.Add(filepath, new ParserInfo
|
||
{
|
||
Series = "Babe", Volumes = "0", Edition = "",
|
||
Chapters = "1", Filename = "Babe 01.cbr", Format = MangaFormat.Archive,
|
||
FullFilePath = filepath, IsSpecial = false
|
||
});
|
||
|
||
filepath = @"E:\Comics\Comics\Publisher\Batman the Detective (2021)\Batman the Detective - v6 - 11 - (2021).cbr";
|
||
expected.Add(filepath, new ParserInfo
|
||
{
|
||
Series = "Batman the Detective", Volumes = "6", Edition = "",
|
||
Chapters = "11", Filename = "Batman the Detective - v6 - 11 - (2021).cbr", Format = MangaFormat.Archive,
|
||
FullFilePath = filepath, IsSpecial = false
|
||
});
|
||
|
||
filepath = @"E:\Comics\Comics\Batman - The Man Who Laughs #1 (2005)\Batman - The Man Who Laughs #1 (2005).cbr";
|
||
expected.Add(filepath, new ParserInfo
|
||
{
|
||
Series = "Batman - The Man Who Laughs", Volumes = "0", Edition = "",
|
||
Chapters = "1", Filename = "Batman - The Man Who Laughs #1 (2005).cbr", Format = MangaFormat.Archive,
|
||
FullFilePath = filepath, IsSpecial = false
|
||
});
|
||
|
||
foreach (var file in expected.Keys)
|
||
{
|
||
var expectedInfo = expected[file];
|
||
var actual = API.Parser.Parser.Parse(file, rootPath, LibraryType.Comic);
|
||
if (expectedInfo == null)
|
||
{
|
||
Assert.Null(actual);
|
||
return;
|
||
}
|
||
Assert.NotNull(actual);
|
||
_testOutputHelper.WriteLine($"Validating {file}");
|
||
Assert.Equal(expectedInfo.Format, actual.Format);
|
||
_testOutputHelper.WriteLine("Format ✓");
|
||
Assert.Equal(expectedInfo.Series, actual.Series);
|
||
_testOutputHelper.WriteLine("Series ✓");
|
||
Assert.Equal(expectedInfo.Chapters, actual.Chapters);
|
||
_testOutputHelper.WriteLine("Chapters ✓");
|
||
Assert.Equal(expectedInfo.Volumes, actual.Volumes);
|
||
_testOutputHelper.WriteLine("Volumes ✓");
|
||
Assert.Equal(expectedInfo.Edition, actual.Edition);
|
||
_testOutputHelper.WriteLine("Edition ✓");
|
||
Assert.Equal(expectedInfo.Filename, actual.Filename);
|
||
_testOutputHelper.WriteLine("Filename ✓");
|
||
Assert.Equal(expectedInfo.FullFilePath, actual.FullFilePath);
|
||
_testOutputHelper.WriteLine("FullFilePath ✓");
|
||
}
|
||
}
|
||
|
||
}
|
||
}
|