mirror of
https://github.com/C9Glax/tranga.git
synced 2025-10-11 05:09:49 +02:00
Test fix for Chapter FullArchiveFilePath throwing exception
This commit is contained in:
@@ -25,7 +25,10 @@ public class Chapter : Identifiable, IComparable<Chapter>
|
|||||||
[StringLength(256)] public string FileName { get; private set; }
|
[StringLength(256)] public string FileName { get; private set; }
|
||||||
|
|
||||||
public bool Downloaded { get; internal set; }
|
public bool Downloaded { get; internal set; }
|
||||||
[NotMapped] public string FullArchiveFilePath => Path.Join(ParentManga.FullDirectoryPath, FileName);
|
|
||||||
|
/// <exception cref="DirectoryNotFoundException">Library for Manga not loaded</exception>
|
||||||
|
[NotMapped]
|
||||||
|
public string? FullArchiveFilePath => GetFullFilepath();
|
||||||
|
|
||||||
private static readonly Regex ChapterNumberRegex = new(@"(?:\d+\.)*\d+", RegexOptions.Compiled);
|
private static readonly Regex ChapterNumberRegex = new(@"(?:\d+\.)*\d+", RegexOptions.Compiled);
|
||||||
public Chapter(Manga parentManga, string chapterNumber,
|
public Chapter(Manga parentManga, string chapterNumber,
|
||||||
@@ -89,7 +92,6 @@ public class Chapter : Identifiable, IComparable<Chapter>
|
|||||||
if (chapter.ParentManga.Library is null)
|
if (chapter.ParentManga.Library is null)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
//TODO Log here
|
|
||||||
this.Downloaded = File.Exists(chapter.FullArchiveFilePath);
|
this.Downloaded = File.Exists(chapter.FullArchiveFilePath);
|
||||||
await context.Sync(token??CancellationToken.None, GetType(), $"CheckDownloaded {this} {this.Downloaded}");
|
await context.Sync(token??CancellationToken.None, GetType(), $"CheckDownloaded {this} {this.Downloaded}");
|
||||||
return this.Downloaded;
|
return this.Downloaded;
|
||||||
@@ -163,6 +165,18 @@ public class Chapter : Identifiable, IComparable<Chapter>
|
|||||||
return stringBuilder.ToString();
|
return stringBuilder.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string? GetFullFilepath()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return Path.Join(ParentManga.FullDirectoryPath, FileName);
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class ChapterComparer : IComparer<Chapter>
|
public class ChapterComparer : IComparer<Chapter>
|
||||||
{
|
{
|
||||||
public int Compare(Chapter? x, Chapter? y)
|
public int Compare(Chapter? x, Chapter? y)
|
||||||
|
@@ -29,6 +29,8 @@ public class Manga : Identifiable
|
|||||||
public uint? Year { get; internal init; }
|
public uint? Year { get; internal init; }
|
||||||
[StringLength(8)] public string? OriginalLanguage { get; internal init; }
|
[StringLength(8)] public string? OriginalLanguage { get; internal init; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <exception cref="DirectoryNotFoundException">Library not loaded</exception>
|
||||||
[NotMapped] public string FullDirectoryPath => EnsureDirectoryExists();
|
[NotMapped] public string FullDirectoryPath => EnsureDirectoryExists();
|
||||||
|
|
||||||
[NotMapped] public ICollection<string> ChapterIds => Chapters.Select(c => c.Key).ToList();
|
[NotMapped] public ICollection<string> ChapterIds => Chapters.Select(c => c.Key).ToList();
|
||||||
@@ -110,11 +112,13 @@ public class Manga : Identifiable
|
|||||||
|
|
||||||
foreach (Chapter otherChapter in other.Chapters)
|
foreach (Chapter otherChapter in other.Chapters)
|
||||||
{
|
{
|
||||||
string oldPath = otherChapter.FullArchiveFilePath;
|
if (otherChapter.FullArchiveFilePath is not { } oldPath)
|
||||||
|
continue;
|
||||||
Chapter newChapter = new(this, otherChapter.ChapterNumber, otherChapter.VolumeNumber,
|
Chapter newChapter = new(this, otherChapter.ChapterNumber, otherChapter.VolumeNumber,
|
||||||
otherChapter.Title);
|
otherChapter.Title);
|
||||||
this.Chapters.Add(newChapter);
|
this.Chapters.Add(newChapter);
|
||||||
string newPath = newChapter.FullArchiveFilePath;
|
if (newChapter.FullArchiveFilePath is not { } newPath)
|
||||||
|
continue;
|
||||||
newJobs.Add(new MoveFileOrFolderWorker(newPath, oldPath));
|
newJobs.Add(new MoveFileOrFolderWorker(newPath, oldPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -70,7 +70,12 @@ public class DownloadChapterFromMangaconnectorWorker(MangaConnectorId<Chapter> c
|
|||||||
Log.Error(result.exceptionMessage);
|
Log.Error(result.exceptionMessage);
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
string saveArchiveFilePath = chapter.FullArchiveFilePath;
|
|
||||||
|
if (chapter.FullArchiveFilePath is not { } saveArchiveFilePath)
|
||||||
|
{
|
||||||
|
Log.Error("Failed getting saveArchiveFilePath");
|
||||||
|
return [];
|
||||||
|
}
|
||||||
Log.Debug($"Chapter path: {saveArchiveFilePath}");
|
Log.Debug($"Chapter path: {saveArchiveFilePath}");
|
||||||
|
|
||||||
//Check if Publication Directory already exists
|
//Check if Publication Directory already exists
|
||||||
|
@@ -14,24 +14,33 @@ public class MoveMangaLibraryWorker(Manga manga, FileLibrary toLibrary, IEnumera
|
|||||||
protected override async Task<BaseWorker[]> DoWorkInternal()
|
protected override async Task<BaseWorker[]> DoWorkInternal()
|
||||||
{
|
{
|
||||||
Log.Debug("Moving Manga...");
|
Log.Debug("Moving Manga...");
|
||||||
// Get Manga (with Chapters and Library)
|
// Get Manga (with and Library)
|
||||||
if (await DbContext.Mangas
|
if (await DbContext.Mangas
|
||||||
.Include(m => m.Chapters)
|
|
||||||
.Include(m => m.Library)
|
.Include(m => m.Library)
|
||||||
.FirstOrDefaultAsync(m => m.Key == MangaId, CancellationToken) is not { } manga)
|
.FirstOrDefaultAsync(m => m.Key == MangaId, CancellationToken) is not { } manga)
|
||||||
{
|
{
|
||||||
Log.Error("Could not find Manga.");
|
Log.Error("Could not find Manga.");
|
||||||
return []; //TODO Exception?
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (await DbContext.Chapters
|
||||||
|
.Include(ch => ch.ParentManga).ThenInclude(m => m.Library)
|
||||||
|
.Where(ch => ch.ParentMangaId == MangaId)
|
||||||
|
.ToListAsync(CancellationToken) is not { } chapters)
|
||||||
|
{
|
||||||
|
Log.Error("Could not find chapters.");
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
// Get new Library
|
// Get new Library
|
||||||
if (await DbContext.FileLibraries.FirstOrDefaultAsync(l => l.Key == LibraryId, CancellationToken) is not { } toLibrary)
|
if (await DbContext.FileLibraries.FirstOrDefaultAsync(l => l.Key == LibraryId, CancellationToken) is not { } toLibrary)
|
||||||
{
|
{
|
||||||
Log.Error("Could not find Library.");
|
Log.Error("Could not find Library.");
|
||||||
return []; //TODO Exception?
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save old Path (to later move chapters)
|
// Save old Path (to later move chapters)
|
||||||
Dictionary<Chapter, string> oldPath = manga.Chapters.ToDictionary(c => c, c => c.FullArchiveFilePath);
|
Dictionary<string, string> oldPath = manga.Chapters.ToDictionary(c => c.Key, c => c.FullArchiveFilePath).Where(kv => kv.Value is not null).ToDictionary(x => x.Key, x => x.Value)!;
|
||||||
// Set new Path
|
// Set new Path
|
||||||
manga.Library = toLibrary;
|
manga.Library = toLibrary;
|
||||||
|
|
||||||
@@ -39,7 +48,7 @@ public class MoveMangaLibraryWorker(Manga manga, FileLibrary toLibrary, IEnumera
|
|||||||
return [];
|
return [];
|
||||||
|
|
||||||
// Create Jobs to move chapters from old to new Path
|
// Create Jobs to move chapters from old to new Path
|
||||||
return manga.Chapters.Select(c => new MoveFileOrFolderWorker(c.FullArchiveFilePath, oldPath[c])).ToArray<BaseWorker>();
|
return manga.Chapters.Select(c => new MoveFileOrFolderWorker(c.FullArchiveFilePath, oldPath[c.Key])).ToArray<BaseWorker>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString() => $"{base.ToString()} {MangaId} {LibraryId}";
|
public override string ToString() => $"{base.ToString()} {MangaId} {LibraryId}";
|
||||||
|
Reference in New Issue
Block a user