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; }
|
||||
|
||||
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);
|
||||
public Chapter(Manga parentManga, string chapterNumber,
|
||||
@@ -89,7 +92,6 @@ public class Chapter : Identifiable, IComparable<Chapter>
|
||||
if (chapter.ParentManga.Library is null)
|
||||
return false;
|
||||
|
||||
//TODO Log here
|
||||
this.Downloaded = File.Exists(chapter.FullArchiveFilePath);
|
||||
await context.Sync(token??CancellationToken.None, GetType(), $"CheckDownloaded {this} {this.Downloaded}");
|
||||
return this.Downloaded;
|
||||
@@ -163,6 +165,18 @@ public class Chapter : Identifiable, IComparable<Chapter>
|
||||
return stringBuilder.ToString();
|
||||
}
|
||||
|
||||
private string? GetFullFilepath()
|
||||
{
|
||||
try
|
||||
{
|
||||
return Path.Join(ParentManga.FullDirectoryPath, FileName);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public class ChapterComparer : IComparer<Chapter>
|
||||
{
|
||||
public int Compare(Chapter? x, Chapter? y)
|
||||
|
@@ -29,6 +29,8 @@ public class Manga : Identifiable
|
||||
public uint? Year { 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 ICollection<string> ChapterIds => Chapters.Select(c => c.Key).ToList();
|
||||
@@ -110,11 +112,13 @@ public class Manga : Identifiable
|
||||
|
||||
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,
|
||||
otherChapter.Title);
|
||||
this.Chapters.Add(newChapter);
|
||||
string newPath = newChapter.FullArchiveFilePath;
|
||||
if (newChapter.FullArchiveFilePath is not { } newPath)
|
||||
continue;
|
||||
newJobs.Add(new MoveFileOrFolderWorker(newPath, oldPath));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user