AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Basic fallback parsing code is in place.

Browse source
This commit is contained in:
Joseph Milazzo 2024-02-10 16:39:37 -06:00
parent 5a522b6d5b
commit 95e7ad0f5b
6 changed files with 56 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
API/Services/SeriesService.cs
View file

@ -537,18 +537,18 @@ public class SeriesService : ISeriesService
retChapters = Array.Empty<ChapterDto>();
} else
{
retChapters = chapters
.Where(ShouldIncludeChapter);
retChapters = chapters.Where(ShouldIncludeChapter);
}
var storylineChapters = volumes
.Where(v => v.MinNumber == 0)
.SelectMany(v => v.Chapters.Where(c => !c.IsSpecial))
.OrderBy(c => c.Number.AsFloat(), ChapterSortComparer.Default)
.ToList();
var storylineChapters = libraryType == LibraryType.Magazine ? []
: volumes
.Where(v => v.MinNumber == 0)
.SelectMany(v => v.Chapters.Where(c => !c.IsSpecial))
.OrderBy(c => c.Number.AsFloat(), ChapterSortComparer.Default)
.ToList();
// When there's chapters without a volume number revert to chapter sorting only as opposed to volume then chapter
if (storylineChapters.Any()) {
if (storylineChapters.Count > 0) {
retChapters = retChapters.OrderBy(c => c.Number.AsFloat(), ChapterSortComparer.Default);
}
@ -615,8 +615,10 @@ public class SeriesService : ISeriesService
{
LibraryType.Book => await _localizationService.Translate(userId, "book-num", chapterTitle),
LibraryType.LightNovel => await _localizationService.Translate(userId, "book-num", chapterTitle),
LibraryType.Magazine => await _localizationService.Translate(userId, "issue-num", hashSpot, chapterTitle),
LibraryType.Comic => await _localizationService.Translate(userId, "issue-num", hashSpot, chapterTitle),
LibraryType.Manga => await _localizationService.Translate(userId, "chapter-num", chapterTitle),
LibraryType.Image => await _localizationService.Translate(userId, "chapter-num", chapterTitle),
_ => await _localizationService.Translate(userId, "chapter-num", ' ')
};
}

27
API/Services/Tasks/Scanner/Parser/DefaultParser.cs
View file

@ -125,13 +125,32 @@ public class DefaultParser : IDefaultParser
{
// Try to parse Series from the filename
var libraryPath = _directoryService.FileSystem.DirectoryInfo.New(rootPath).Parent?.FullName ?? rootPath;
ret.Series = Parser.ParseMagazineSeries(filePath);
if (string.IsNullOrEmpty(ret.Series))
var fileName = _directoryService.FileSystem.Path.GetFileNameWithoutExtension(filePath);
ret.Series = Parser.ParseMagazineSeries(fileName);
ret.Volumes = Parser.ParseMagazineVolume(fileName);
ret.Chapters = Parser.ParseMagazineChapter(fileName);
if (string.IsNullOrEmpty(ret.Series) || (string.IsNullOrEmpty(ret.Chapters) && string.IsNullOrEmpty(ret.Volumes)))
{
// Fallback to the parent folder. We can also likely grab Volume (year) from here
var folders = _directoryService.GetFoldersTillRoot(libraryPath, filePath);
foreach (var folder in folders)
var folders = _directoryService.GetFoldersTillRoot(libraryPath, filePath).ToList();
// Usually the LAST folder is the Series and everything up to can have Volume
if (string.IsNullOrEmpty(ret.Series))
{
ret.Series = Parser.CleanTitle(folders[^1]);
}
foreach (var folder in folders[..^1])
{
if (ret.Volumes == Parser.DefaultVolume)
{
var vol = Parser.ParseYear(folder);
if (vol != folder)
{
ret.Volumes = vol;
}
}
}
}

26
API/Services/Tasks/Scanner/Parser/Parser.cs
View file

@ -687,6 +687,11 @@ public static partial class Parser
MatchOptions, RegexTimeout),
};
private static readonly Regex YearRegex = new Regex(
@"(\b|\s|_)[1-9]{1}\d{3}(\b|\s|_)",
MatchOptions, RegexTimeout
);
#endregion
@ -858,25 +863,10 @@ public static partial class Parser
}
// Add mappings for other languages if needed
// Example: mappings["KoreanMonthName"] = correspondingNumericalValue;
return mappings;
}
static int ConvertMonthToNumber(string month, Dictionary<string, int> monthMappings)
{
// Check if the month exists in the mappings
if (monthMappings.TryGetValue(month, out int numericalValue))
{
return numericalValue;
}
// If the month is not found in mappings, you may handle other cases here,
// such as trying to parse non-English month names or returning a default value.
// For simplicity, we'll return 0 indicating failure.
return 0;
}
public static string ParseMagazineChapter(string filename)
{
foreach (var regex in MagazineChapterRegex)
@ -899,6 +889,12 @@ public static partial class Parser
return DefaultChapter;
}
public static string ParseYear(string value)
{
if (string.IsNullOrEmpty(value)) return value;
return YearRegex.Match(value).Value;
}
private static string FormatValue(string value, bool hasPart)
{
if (!value.Contains('-'))

1
UI/Web/src/app/_models/library/library.ts
View file

@ -5,7 +5,6 @@ export enum LibraryType {
Comic = 1,
Book = 2,
Images = 3,
Images = 3,
LightNovel = 4,
Magazine = 5
}

11
UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts
View file

@ -338,6 +338,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
}
get ShowStorylineTab() {
if (this.libraryType === LibraryType.Magazine) return false;
return (this.libraryType !== LibraryType.Book && this.libraryType !== LibraryType.LightNovel) && (this.volumes.length > 0 || this.chapters.length > 0);
}
@ -716,6 +717,16 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
*/
updateSelectedTab() {
// Book libraries only have Volumes or Specials enabled
if (this.libraryType === LibraryType.Magazine) {
if (this.volumes.length === 0) {
this.activeTabId = TabID.Chapters;
} else {
this.activeTabId = TabID.Volumes;
}
this.cdRef.markForCheck();
return;
}
if (this.libraryType === LibraryType.Book || this.libraryType === LibraryType.LightNovel) {
if (this.volumes.length === 0) {
this.activeTabId = TabID.Specials;

2
UI/Web/src/app/shared/_services/utility.service.ts
View file

@ -63,10 +63,10 @@ export class UtilityService {
*/
formatChapterName(libraryType: LibraryType, includeHash: boolean = false, includeSpace: boolean = false) {
switch(libraryType) {
case LibraryType.Magazine: // TODO: Figure out if we need something special
case LibraryType.Book:
case LibraryType.LightNovel:
return this.translocoService.translate('common.book-num') + (includeSpace ? ' ' : '');
case LibraryType.Magazine: // TODO: Figure out if we need something special
case LibraryType.Comic:
if (includeHash) {
return this.translocoService.translate('common.issue-hash-num');