Compare commits
12 Commits
4cb3694cd5
...
be8c6b50ba
Author | SHA1 | Date | |
---|---|---|---|
be8c6b50ba | |||
a38fcf50ca | |||
82f6c7b3fe | |||
5586d2c104 | |||
62dc9fee2a | |||
ac96fca6dc | |||
25a6ceff10 | |||
b3e1d39d0f | |||
2833b7f22a | |||
cbdd305b69 | |||
b88890817e | |||
f66ab7d40b |
@ -182,7 +182,7 @@ public class RequestHandler
|
|||||||
if (publication2 is null)
|
if (publication2 is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
IEnumerable<Chapter> toDownload = connector2.SearchChapters((Publication)publication2, chapters, language2 ?? "en");
|
IEnumerable<Chapter> toDownload = connector2.SelectChapters((Publication)publication2, chapters, language2 ?? "en");
|
||||||
foreach(Chapter chapter in toDownload)
|
foreach(Chapter chapter in toDownload)
|
||||||
_taskManager.AddTask(new DownloadChapterTask(connectorName2, (Publication)publication2, chapter, "en"));
|
_taskManager.AddTask(new DownloadChapterTask(connectorName2, (Publication)publication2, chapter, "en"));
|
||||||
break;
|
break;
|
||||||
@ -323,7 +323,7 @@ public class RequestHandler
|
|||||||
variables.TryGetValue("taskType", out string? taskType2);
|
variables.TryGetValue("taskType", out string? taskType2);
|
||||||
variables.TryGetValue("connectorName", out string? connectorName4);
|
variables.TryGetValue("connectorName", out string? connectorName4);
|
||||||
variables.TryGetValue("publicationId", out string? publicationId);
|
variables.TryGetValue("publicationId", out string? publicationId);
|
||||||
variables.TryGetValue("chapterSortNumber", out string? chapterSortNumber);
|
variables.TryGetValue("chapterNumber", out string? chapterNumber);
|
||||||
if (taskType2 is null || connectorName4 is null || publicationId is null)
|
if (taskType2 is null || connectorName4 is null || publicationId is null)
|
||||||
return null;
|
return null;
|
||||||
Connector? connector =
|
Connector? connector =
|
||||||
@ -337,10 +337,10 @@ public class RequestHandler
|
|||||||
if (pTask is TrangaTask.Task.MonitorPublication)
|
if (pTask is TrangaTask.Task.MonitorPublication)
|
||||||
{
|
{
|
||||||
task = _taskManager.GetTasksMatching(pTask, connectorName: connectorName4, internalId: publicationId).FirstOrDefault();
|
task = _taskManager.GetTasksMatching(pTask, connectorName: connectorName4, internalId: publicationId).FirstOrDefault();
|
||||||
}else if (pTask is TrangaTask.Task.DownloadChapter && chapterSortNumber is not null)
|
}else if (pTask is TrangaTask.Task.DownloadChapter && chapterNumber is not null)
|
||||||
{
|
{
|
||||||
task = _taskManager.GetTasksMatching(pTask, connectorName: connectorName4, internalId: publicationId,
|
task = _taskManager.GetTasksMatching(pTask, connectorName: connectorName4, internalId: publicationId,
|
||||||
chapterSortNumber: chapterSortNumber).FirstOrDefault();
|
chapterNumber: chapterNumber).FirstOrDefault();
|
||||||
}
|
}
|
||||||
if (task is null)
|
if (task is null)
|
||||||
return null;
|
return null;
|
||||||
|
@ -514,7 +514,7 @@ public static class Tranga_Cli
|
|||||||
while(selectedChapters is null || selectedChapters.Length < 1)
|
while(selectedChapters is null || selectedChapters.Length < 1)
|
||||||
selectedChapters = Console.ReadLine();
|
selectedChapters = Console.ReadLine();
|
||||||
|
|
||||||
return connector.SearchChapters(publication, selectedChapters);
|
return connector.SelectChapters(publication, selectedChapters);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Connector? SelectConnector(Connector[] connectors, Logger logger)
|
private static Connector? SelectConnector(Connector[] connectors, Logger logger)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using System.Globalization;
|
using System.Text.RegularExpressions;
|
||||||
using System.Text.RegularExpressions;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace Tranga;
|
namespace Tranga;
|
||||||
|
|
||||||
@ -9,32 +9,81 @@ namespace Tranga;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public struct Chapter
|
public struct Chapter
|
||||||
{
|
{
|
||||||
|
public Publication parentPublication { get; }
|
||||||
public string? name { get; }
|
public string? name { get; }
|
||||||
public string? volumeNumber { get; }
|
public string? volumeNumber { get; }
|
||||||
public string? chapterNumber { get; }
|
public string chapterNumber { get; }
|
||||||
public string url { get; }
|
public string url { get; }
|
||||||
public string fileName { get; }
|
public string fileName { get; }
|
||||||
public string sortNumber { get; }
|
|
||||||
|
|
||||||
private static readonly Regex LegalCharacters = new Regex(@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
|
private static readonly Regex LegalCharacters = new (@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
|
||||||
public Chapter(string? name, string? volumeNumber, string? chapterNumber, string url)
|
private static readonly Regex IllegalStrings = new(@"Vol(ume)?.?", RegexOptions.IgnoreCase);
|
||||||
|
public Chapter(Publication parentPublication, string? name, string? volumeNumber, string chapterNumber, string url)
|
||||||
{
|
{
|
||||||
|
this.parentPublication = parentPublication;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.volumeNumber = volumeNumber;
|
this.volumeNumber = volumeNumber;
|
||||||
this.chapterNumber = chapterNumber;
|
this.chapterNumber = chapterNumber;
|
||||||
this.url = url;
|
this.url = url;
|
||||||
NumberFormatInfo nfi = new NumberFormatInfo()
|
|
||||||
{
|
|
||||||
NumberDecimalSeparator = "."
|
|
||||||
};
|
|
||||||
sortNumber = decimal.Round(Convert.ToDecimal(this.volumeNumber ?? "1") * Convert.ToDecimal(this.chapterNumber, nfi), 1)
|
|
||||||
.ToString(nfi);
|
|
||||||
|
|
||||||
string chapterName = string.Concat(LegalCharacters.Matches(name ?? ""));
|
string chapterName = string.Concat(LegalCharacters.Matches(name ?? ""));
|
||||||
string volStr = this.volumeNumber is not null ? $"Vol.{this.volumeNumber} " : "";
|
string volStr = this.volumeNumber is not null ? $"Vol.{this.volumeNumber} " : "";
|
||||||
string chNumberStr = this.chapterNumber is not null ? $"Ch.{chapterNumber} " : "";
|
string chNumberStr = $"Ch.{chapterNumber} ";
|
||||||
string chNameStr = chapterName.Length > 0 ? $"- {chapterName}" : "";
|
string chNameStr = chapterName.Length > 0 ? $"- {chapterName}" : "";
|
||||||
chNameStr = chNameStr.Replace("Volume", "").Replace("volume", "");
|
chNameStr = IllegalStrings.Replace(chNameStr, "");
|
||||||
this.fileName = $"{volStr}{chNumberStr}{chNameStr}";
|
this.fileName = $"{volStr}{chNumberStr}{chNameStr}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Checks if a chapter-archive is already present
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>true if chapter is present</returns>
|
||||||
|
internal bool CheckChapterIsDownloaded(string downloadLocation)
|
||||||
|
{
|
||||||
|
string newFilePath = GetArchiveFilePath(downloadLocation);
|
||||||
|
if (!Directory.Exists(Path.Join(downloadLocation, parentPublication.folderName)))
|
||||||
|
return false;
|
||||||
|
FileInfo[] archives = new DirectoryInfo(Path.Join(downloadLocation, parentPublication.folderName)).GetFiles();
|
||||||
|
Regex infoRex = new(@"(Vol.[0-9]*)?Ch.[0-9]+");
|
||||||
|
Regex chapterInfoRex = new(@"Ch.[0-9]+");
|
||||||
|
Regex chapterRex = new(@"[0-9]+");
|
||||||
|
|
||||||
|
if (File.Exists(newFilePath))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
string cn = this.chapterNumber;
|
||||||
|
if (archives.FirstOrDefault(archive => chapterRex.Match(chapterInfoRex.Match(infoRex.Match(archive.Name).Value).Value).Value == cn) is { } path)
|
||||||
|
{
|
||||||
|
File.Move(path.FullName, newFilePath);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Creates full file path of chapter-archive
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Filepath</returns>
|
||||||
|
internal string GetArchiveFilePath(string downloadLocation)
|
||||||
|
{
|
||||||
|
return Path.Join(downloadLocation, parentPublication.folderName, $"{parentPublication.folderName} - {this.fileName}.cbz");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a string containing XML of publication and chapter.
|
||||||
|
/// See ComicInfo.xml
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>XML-string</returns>
|
||||||
|
internal string GetComicInfoXmlString()
|
||||||
|
{
|
||||||
|
XElement comicInfo = new XElement("ComicInfo",
|
||||||
|
new XElement("Tags", string.Join(',', parentPublication.tags)),
|
||||||
|
new XElement("LanguageISO", parentPublication.originalLanguage),
|
||||||
|
new XElement("Title", this.name),
|
||||||
|
new XElement("Writer", string.Join(',', parentPublication.authors)),
|
||||||
|
new XElement("Volume", this.volumeNumber),
|
||||||
|
new XElement("Number", this.chapterNumber)
|
||||||
|
);
|
||||||
|
return comicInfo.ToString();
|
||||||
|
}
|
||||||
}
|
}
|
@ -15,24 +15,18 @@ namespace Tranga;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class Connector
|
public abstract class Connector
|
||||||
{
|
{
|
||||||
internal string downloadLocation { get; } //Location of local files
|
protected TrangaSettings settings { get; }
|
||||||
protected DownloadClient downloadClient { get; init; }
|
protected DownloadClient downloadClient { get; init; } = null!;
|
||||||
|
|
||||||
protected readonly Logger? logger;
|
protected readonly Logger? logger;
|
||||||
|
|
||||||
private readonly string _imageCachePath;
|
|
||||||
|
|
||||||
protected Connector(string downloadLocation, string imageCachePath, Logger? logger)
|
protected Connector(TrangaSettings settings, Logger? logger = null)
|
||||||
{
|
{
|
||||||
this.downloadLocation = downloadLocation;
|
this.settings = settings;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
if (!Directory.Exists(settings.coverImageCache))
|
||||||
{
|
Directory.CreateDirectory(settings.coverImageCache);
|
||||||
//RequestTypes for RateLimits
|
|
||||||
}, logger);
|
|
||||||
this._imageCachePath = imageCachePath;
|
|
||||||
if (!Directory.Exists(imageCachePath))
|
|
||||||
Directory.CreateDirectory(this._imageCachePath);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract string name { get; } //Name of the Connector (e.g. Website)
|
public abstract string name { get; } //Name of the Connector (e.g. Website)
|
||||||
@ -54,18 +48,19 @@ public abstract class Connector
|
|||||||
/// <returns>Array of Chapters matching Publication and Language</returns>
|
/// <returns>Array of Chapters matching Publication and Language</returns>
|
||||||
public abstract Chapter[] GetChapters(Publication publication, string language = "");
|
public abstract Chapter[] GetChapters(Publication publication, string language = "");
|
||||||
|
|
||||||
public Chapter[] SearchChapters(Publication publication, string searchTerm, string? language = null)
|
public Chapter[] SelectChapters(Publication publication, string searchTerm, string? language = null)
|
||||||
{
|
{
|
||||||
Chapter[] availableChapters = this.GetChapters(publication, language??"en");
|
Chapter[] availableChapters = this.GetChapters(publication, language??"en");
|
||||||
Regex volumeRegex = new ("((v(ol)*(olume)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
|
Regex volumeRegex = new ("((v(ol)*(olume)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
|
||||||
Regex chapterRegex = new ("((c(h)*(hapter)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
|
Regex chapterRegex = new ("((c(h)*(hapter)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
|
||||||
Regex singleResultRegex = new("([0-9]+)", RegexOptions.IgnoreCase);
|
Regex singleResultRegex = new("([0-9]+)", RegexOptions.IgnoreCase);
|
||||||
Regex rangeResultRegex = new("([0-9]+(-[0-9]+))", RegexOptions.IgnoreCase);
|
Regex rangeResultRegex = new("([0-9]+(-[0-9]+))", RegexOptions.IgnoreCase);
|
||||||
|
Regex allRegex = new("a(ll)?", RegexOptions.IgnoreCase);
|
||||||
if (volumeRegex.IsMatch(searchTerm) && chapterRegex.IsMatch(searchTerm))
|
if (volumeRegex.IsMatch(searchTerm) && chapterRegex.IsMatch(searchTerm))
|
||||||
{
|
{
|
||||||
string volume = singleResultRegex.Match(volumeRegex.Match(searchTerm).Value).Value;
|
string volume = singleResultRegex.Match(volumeRegex.Match(searchTerm).Value).Value;
|
||||||
string chapter = singleResultRegex.Match(chapterRegex.Match(searchTerm).Value).Value;
|
string chapter = singleResultRegex.Match(chapterRegex.Match(searchTerm).Value).Value;
|
||||||
return availableChapters.Where(aCh => aCh.volumeNumber is not null && aCh.chapterNumber is not null &&
|
return availableChapters.Where(aCh => aCh.volumeNumber is not null &&
|
||||||
aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase) &&
|
aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase) &&
|
||||||
aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase))
|
aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase))
|
||||||
.ToArray();
|
.ToArray();
|
||||||
@ -99,15 +94,13 @@ public abstract class Connector
|
|||||||
string range = rangeResultRegex.Match(chapter).Value;
|
string range = rangeResultRegex.Match(chapter).Value;
|
||||||
int start = Convert.ToInt32(range.Split('-')[0]);
|
int start = Convert.ToInt32(range.Split('-')[0]);
|
||||||
int end = Convert.ToInt32(range.Split('-')[1]);
|
int end = Convert.ToInt32(range.Split('-')[1]);
|
||||||
return availableChapters.Where(aCh => aCh.chapterNumber is not null &&
|
return availableChapters.Where(aCh => Convert.ToInt32(aCh.chapterNumber) >= start &&
|
||||||
Convert.ToInt32(aCh.chapterNumber) >= start &&
|
|
||||||
Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
|
Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
|
||||||
}
|
}
|
||||||
else if (singleResultRegex.IsMatch(chapter))
|
else if (singleResultRegex.IsMatch(chapter))
|
||||||
{
|
{
|
||||||
string chapterNumber = singleResultRegex.Match(chapter).Value;
|
string chapterNumber = singleResultRegex.Match(chapter).Value;
|
||||||
return availableChapters.Where(aCh =>
|
return availableChapters.Where(aCh =>
|
||||||
aCh.chapterNumber is not null &&
|
|
||||||
aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -121,6 +114,8 @@ public abstract class Connector
|
|||||||
}
|
}
|
||||||
else if(singleResultRegex.IsMatch(searchTerm))
|
else if(singleResultRegex.IsMatch(searchTerm))
|
||||||
return new [] { availableChapters[Convert.ToInt32(searchTerm)] };
|
return new [] { availableChapters[Convert.ToInt32(searchTerm)] };
|
||||||
|
else if (allRegex.IsMatch(searchTerm))
|
||||||
|
return availableChapters;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Array.Empty<Chapter>();
|
return Array.Empty<Chapter>();
|
||||||
@ -145,7 +140,7 @@ public abstract class Connector
|
|||||||
{
|
{
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}");
|
logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}");
|
||||||
//Check if Publication already has a Folder and cover
|
//Check if Publication already has a Folder and cover
|
||||||
string publicationFolder = publication.CreatePublicationFolder(downloadLocation);
|
string publicationFolder = publication.CreatePublicationFolder(settings.downloadLocation);
|
||||||
DirectoryInfo dirInfo = new (publicationFolder);
|
DirectoryInfo dirInfo = new (publicationFolder);
|
||||||
if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
|
if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
|
||||||
{
|
{
|
||||||
@ -161,59 +156,6 @@ public abstract class Connector
|
|||||||
File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
|
File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates a string containing XML of publication and chapter.
|
|
||||||
/// See ComicInfo.xml
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>XML-string</returns>
|
|
||||||
protected static string GetComicInfoXmlString(Publication publication, Chapter chapter, Logger? logger)
|
|
||||||
{
|
|
||||||
logger?.WriteLine("Connector", $"Creating ComicInfo.Xml for {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
|
|
||||||
XElement comicInfo = new XElement("ComicInfo",
|
|
||||||
new XElement("Tags", string.Join(',',publication.tags)),
|
|
||||||
new XElement("LanguageISO", publication.originalLanguage),
|
|
||||||
new XElement("Title", chapter.name),
|
|
||||||
new XElement("Writer", string.Join(',', publication.authors)),
|
|
||||||
new XElement("Volume", chapter.volumeNumber),
|
|
||||||
new XElement("Number", chapter.chapterNumber)
|
|
||||||
);
|
|
||||||
return comicInfo.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks if a chapter-archive is already present
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>true if chapter is present</returns>
|
|
||||||
public bool CheckChapterIsDownloaded(Publication publication, Chapter chapter)
|
|
||||||
{
|
|
||||||
string newFilePath = GetArchiveFilePath(publication, chapter);
|
|
||||||
if (!Directory.Exists(Path.Join(downloadLocation, publication.folderName)))
|
|
||||||
return false;
|
|
||||||
FileInfo[] archives = new DirectoryInfo(Path.Join(downloadLocation, publication.folderName)).GetFiles();
|
|
||||||
Regex chapterRex = new(@"(Vol.[0-9]*)*Ch.[0-9]+");
|
|
||||||
|
|
||||||
if (File.Exists(newFilePath))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (archives.FirstOrDefault(archive =>
|
|
||||||
chapterRex.Match(archive.Name).Value.Split("Ch.")[^1] == chapter.chapterNumber) is { } path)
|
|
||||||
{
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), "Move existing Chapter to new name.");
|
|
||||||
File.Move(path.FullName, newFilePath);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates full file path of chapter-archive
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Filepath</returns>
|
|
||||||
protected string GetArchiveFilePath(Publication publication, Chapter chapter)
|
|
||||||
{
|
|
||||||
return Path.Join(downloadLocation, publication.folderName, $"{publication.folderName} - {chapter.fileName}.cbz");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Downloads Image from URL and saves it to the given path(incl. fileName)
|
/// Downloads Image from URL and saves it to the given path(incl. fileName)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -289,7 +231,7 @@ public abstract class Connector
|
|||||||
{
|
{
|
||||||
string[] split = url.Split('/');
|
string[] split = url.Split('/');
|
||||||
string filename = split[^1];
|
string filename = split[^1];
|
||||||
string saveImagePath = Path.Join(_imageCachePath, filename);
|
string saveImagePath = Path.Join(settings.coverImageCache, filename);
|
||||||
|
|
||||||
if (File.Exists(saveImagePath))
|
if (File.Exists(saveImagePath))
|
||||||
return filename;
|
return filename;
|
||||||
|
@ -19,7 +19,7 @@ public class MangaDex : Connector
|
|||||||
Author,
|
Author,
|
||||||
}
|
}
|
||||||
|
|
||||||
public MangaDex(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation, imageCachePath, logger)
|
public MangaDex(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
|
||||||
{
|
{
|
||||||
name = "MangaDex";
|
name = "MangaDex";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
@ -194,7 +194,7 @@ public class MangaDex : Connector
|
|||||||
? attributes["chapter"]!.GetValue<string>()
|
? attributes["chapter"]!.GetValue<string>()
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
chapters.Add(new Chapter(title, volume, chapterNum, chapterId));
|
chapters.Add(new Chapter(publication, title, volume, chapterNum, chapterId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -230,10 +230,10 @@ public class MangaDex : Connector
|
|||||||
imageUrls.Add($"{baseUrl}/data/{hash}/{image!.GetValue<string>()}");
|
imageUrls.Add($"{baseUrl}/data/{hash}/{image!.GetValue<string>()}");
|
||||||
|
|
||||||
string comicInfoPath = Path.GetTempFileName();
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
//Download Chapter-Images
|
//Download Chapter-Images
|
||||||
return DownloadChapterImages(imageUrls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath, cancellationToken:cancellationToken);
|
return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath, cancellationToken:cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string? GetCoverUrl(string publicationId, string? posterId)
|
private string? GetCoverUrl(string publicationId, string? posterId)
|
||||||
|
@ -11,7 +11,7 @@ public class MangaKatana : Connector
|
|||||||
{
|
{
|
||||||
public override string name { get; }
|
public override string name { get; }
|
||||||
|
|
||||||
public MangaKatana(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation, imageCachePath, logger)
|
public MangaKatana(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
|
||||||
{
|
{
|
||||||
this.name = "MangaKatana";
|
this.name = "MangaKatana";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
@ -136,12 +136,12 @@ public class MangaKatana : Connector
|
|||||||
{
|
{
|
||||||
NumberDecimalSeparator = "."
|
NumberDecimalSeparator = "."
|
||||||
};
|
};
|
||||||
List<Chapter> chapters = ParseChaptersFromHtml(requestUrl);
|
List<Chapter> chapters = ParseChaptersFromHtml(publication, requestUrl);
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
||||||
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Chapter> ParseChaptersFromHtml(string mangaUrl)
|
private List<Chapter> ParseChaptersFromHtml(Publication publication, string mangaUrl)
|
||||||
{
|
{
|
||||||
// Using HtmlWeb will include the chapters since they are loaded with js
|
// Using HtmlWeb will include the chapters since they are loaded with js
|
||||||
HtmlWeb web = new();
|
HtmlWeb web = new();
|
||||||
@ -160,7 +160,7 @@ public class MangaKatana : Connector
|
|||||||
string chapterName = string.Concat(fullString.Split(':')[1..]);
|
string chapterName = string.Concat(fullString.Split(':')[1..]);
|
||||||
string url = chapterInfo.Descendants("a").First()
|
string url = chapterInfo.Descendants("a").First()
|
||||||
.GetAttributeValue("href", "");
|
.GetAttributeValue("href", "");
|
||||||
ret.Add(new Chapter(chapterName, volumeNumber, chapterNumber, url));
|
ret.Add(new Chapter(publication, chapterName, volumeNumber, chapterNumber, url));
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
@ -181,9 +181,9 @@ public class MangaKatana : Connector
|
|||||||
string[] imageUrls = ParseImageUrlsFromHtml(requestUrl);
|
string[] imageUrls = ParseImageUrlsFromHtml(requestUrl);
|
||||||
|
|
||||||
string comicInfoPath = Path.GetTempFileName();
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
return DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://mangakatana.com/", cancellationToken);
|
return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), (byte)1, parentTask, comicInfoPath, "https://mangakatana.com/", cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string[] ParseImageUrlsFromHtml(string mangaUrl)
|
private string[] ParseImageUrlsFromHtml(string mangaUrl)
|
||||||
|
@ -11,7 +11,7 @@ public class Manganato : Connector
|
|||||||
{
|
{
|
||||||
public override string name { get; }
|
public override string name { get; }
|
||||||
|
|
||||||
public Manganato(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation, imageCachePath, logger)
|
public Manganato(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
|
||||||
{
|
{
|
||||||
this.name = "Manganato";
|
this.name = "Manganato";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
@ -139,12 +139,12 @@ public class Manganato : Connector
|
|||||||
{
|
{
|
||||||
NumberDecimalSeparator = "."
|
NumberDecimalSeparator = "."
|
||||||
};
|
};
|
||||||
List<Chapter> chapters = ParseChaptersFromHtml(requestResult.result);
|
List<Chapter> chapters = ParseChaptersFromHtml(publication, requestResult.result);
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
|
||||||
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Chapter> ParseChaptersFromHtml(Stream html)
|
private List<Chapter> ParseChaptersFromHtml(Publication publication, Stream html)
|
||||||
{
|
{
|
||||||
StreamReader reader = new (html);
|
StreamReader reader = new (html);
|
||||||
string htmlString = reader.ReadToEnd();
|
string htmlString = reader.ReadToEnd();
|
||||||
@ -163,7 +163,7 @@ public class Manganato : Connector
|
|||||||
string chapterName = string.Concat(fullString.Split(':')[1..]);
|
string chapterName = string.Concat(fullString.Split(':')[1..]);
|
||||||
string url = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name"))
|
string url = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name"))
|
||||||
.GetAttributeValue("href", "");
|
.GetAttributeValue("href", "");
|
||||||
ret.Add(new Chapter(chapterName, volumeNumber, chapterNumber, url));
|
ret.Add(new Chapter(publication, chapterName, volumeNumber, chapterNumber, url));
|
||||||
}
|
}
|
||||||
ret.Reverse();
|
ret.Reverse();
|
||||||
return ret;
|
return ret;
|
||||||
@ -183,9 +183,9 @@ public class Manganato : Connector
|
|||||||
string[] imageUrls = ParseImageUrlsFromHtml(requestResult.result);
|
string[] imageUrls = ParseImageUrlsFromHtml(requestResult.result);
|
||||||
|
|
||||||
string comicInfoPath = Path.GetTempFileName();
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
return DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
|
return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string[] ParseImageUrlsFromHtml(Stream html)
|
private string[] ParseImageUrlsFromHtml(Stream html)
|
||||||
|
@ -16,8 +16,7 @@ public class Mangasee : Connector
|
|||||||
private IBrowser? _browser = null;
|
private IBrowser? _browser = null;
|
||||||
private const string ChromiumVersion = "1154303";
|
private const string ChromiumVersion = "1154303";
|
||||||
|
|
||||||
public Mangasee(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation,
|
public Mangasee(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
|
||||||
imageCachePath, logger)
|
|
||||||
{
|
{
|
||||||
this.name = "Mangasee";
|
this.name = "Mangasee";
|
||||||
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
|
||||||
@ -197,7 +196,7 @@ public class Mangasee : Connector
|
|||||||
|
|
||||||
string url = chapter.Descendants("link").First().Value;
|
string url = chapter.Descendants("link").First().Value;
|
||||||
url = url.Replace(Regex.Matches(url,"(-page-[0-9])")[0].ToString(),"");
|
url = url.Replace(Regex.Matches(url,"(-page-[0-9])")[0].ToString(),"");
|
||||||
ret.Add(new Chapter("", volumeNumber, chapterNumber, url));
|
ret.Add(new Chapter(publication, "", volumeNumber, chapterNumber, url));
|
||||||
}
|
}
|
||||||
|
|
||||||
//Return Chapters ordered by Chapter-Number
|
//Return Chapters ordered by Chapter-Number
|
||||||
@ -236,9 +235,9 @@ public class Mangasee : Connector
|
|||||||
urls.Add(galleryImage.GetAttributeValue("src", ""));
|
urls.Add(galleryImage.GetAttributeValue("src", ""));
|
||||||
|
|
||||||
string comicInfoPath = Path.GetTempFileName();
|
string comicInfoPath = Path.GetTempFileName();
|
||||||
File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
|
File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
|
||||||
|
|
||||||
return DownloadChapterImages(urls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, cancellationToken:cancellationToken);
|
return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), (byte)1, parentTask, comicInfoPath, cancellationToken:cancellationToken);
|
||||||
}
|
}
|
||||||
return response.Status;
|
return response.Status;
|
||||||
}
|
}
|
||||||
|
@ -13,22 +13,21 @@ public class TaskManager
|
|||||||
{
|
{
|
||||||
public Dictionary<Publication, List<Chapter>> chapterCollection = new();
|
public Dictionary<Publication, List<Chapter>> chapterCollection = new();
|
||||||
private HashSet<TrangaTask> _allTasks = new();
|
private HashSet<TrangaTask> _allTasks = new();
|
||||||
|
private readonly Dictionary<TrangaTask, CancellationTokenSource> _runningTasks = new ();
|
||||||
private bool _continueRunning = true;
|
private bool _continueRunning = true;
|
||||||
private readonly Connector[] _connectors;
|
private readonly Connector[] _connectors;
|
||||||
public TrangaSettings settings { get; }
|
public TrangaSettings settings { get; }
|
||||||
private Logger? logger { get; }
|
private Logger? logger { get; }
|
||||||
|
|
||||||
private readonly Dictionary<DownloadChapterTask, CancellationTokenSource> _runningDownloadChapterTasks = new();
|
|
||||||
|
|
||||||
public TaskManager(TrangaSettings settings, Logger? logger = null)
|
public TaskManager(TrangaSettings settings, Logger? logger = null)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this._connectors = new Connector[]
|
this._connectors = new Connector[]
|
||||||
{
|
{
|
||||||
new MangaDex(settings.downloadLocation, settings.coverImageCache, logger),
|
new MangaDex(settings, logger),
|
||||||
new Manganato(settings.downloadLocation, settings.coverImageCache, logger),
|
new Manganato(settings, logger),
|
||||||
new Mangasee(settings.downloadLocation, settings.coverImageCache, logger),
|
new Mangasee(settings, logger),
|
||||||
new MangaKatana(settings.downloadLocation, settings.coverImageCache, logger)
|
new MangaKatana(settings, logger)
|
||||||
};
|
};
|
||||||
|
|
||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
@ -86,17 +85,16 @@ public class TaskManager
|
|||||||
foreach (TrangaTask timedOutTask in _allTasks
|
foreach (TrangaTask timedOutTask in _allTasks
|
||||||
.Where(taskQuery => taskQuery.lastChange < DateTime.Now.Subtract(TimeSpan.FromMinutes(3))))
|
.Where(taskQuery => taskQuery.lastChange < DateTime.Now.Subtract(TimeSpan.FromMinutes(3))))
|
||||||
{
|
{
|
||||||
if(timedOutTask is DownloadChapterTask dct)
|
_runningTasks[timedOutTask].Cancel();
|
||||||
_runningDownloadChapterTasks[dct].Cancel();
|
|
||||||
timedOutTask.state = TrangaTask.ExecutionState.Failed;
|
timedOutTask.state = TrangaTask.ExecutionState.Failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (TrangaTask failedDownloadChapterTask in _allTasks.Where(taskQuery =>
|
foreach (TrangaTask failedTask in _allTasks.Where(taskQuery =>
|
||||||
taskQuery.state is TrangaTask.ExecutionState.Failed && taskQuery is DownloadChapterTask).ToArray())
|
taskQuery.state is TrangaTask.ExecutionState.Failed).ToArray())
|
||||||
{
|
{
|
||||||
DeleteTask(failedDownloadChapterTask);
|
DeleteTask(failedTask);
|
||||||
TrangaTask newTask = failedDownloadChapterTask.Clone();
|
TrangaTask newTask = failedTask.Clone();
|
||||||
failedDownloadChapterTask.parentTask?.AddChildTask(newTask);
|
failedTask.parentTask?.AddChildTask(newTask);
|
||||||
AddTask(newTask);
|
AddTask(newTask);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -119,56 +117,69 @@ public class TaskManager
|
|||||||
{
|
{
|
||||||
task.Execute(this, this.logger, cToken.Token);
|
task.Execute(this, this.logger, cToken.Token);
|
||||||
}, cToken.Token);
|
}, cToken.Token);
|
||||||
if(task is DownloadChapterTask chapterTask)
|
_runningTasks.Add(task, cToken);
|
||||||
_runningDownloadChapterTasks.Add(chapterTask, cToken);
|
|
||||||
t.Start();
|
t.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddTask(TrangaTask newTask)
|
public void AddTask(TrangaTask newTask)
|
||||||
{
|
{
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
|
|
||||||
|
|
||||||
switch (newTask.task)
|
switch (newTask.task)
|
||||||
{
|
{
|
||||||
case TrangaTask.Task.UpdateLibraries:
|
case TrangaTask.Task.UpdateLibraries:
|
||||||
//Only one UpdateKomgaLibrary Task
|
//Only one UpdateKomgaLibrary Task
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
|
logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
|
||||||
_allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
|
if (GetTasksMatching(newTask).FirstOrDefault() is { } exists)
|
||||||
|
_allTasks.Remove(exists);
|
||||||
_allTasks.Add(newTask);
|
_allTasks.Add(newTask);
|
||||||
|
ExportDataAndSettings();
|
||||||
break;
|
break;
|
||||||
case TrangaTask.Task.MonitorPublication:
|
default:
|
||||||
MonitorPublicationTask mpt = (MonitorPublicationTask)newTask;
|
if (!GetTasksMatching(newTask).Any())
|
||||||
if(!GetTasksMatching(mpt.task, mpt.connectorName, internalId:mpt.publication.internalId).Any())
|
{
|
||||||
_allTasks.Add(newTask);
|
logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
|
||||||
else
|
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
|
|
||||||
break;
|
|
||||||
case TrangaTask.Task.DownloadChapter:
|
|
||||||
DownloadChapterTask dct = (DownloadChapterTask)newTask;
|
|
||||||
if(!GetTasksMatching(dct.task, dct.connectorName, internalId:dct.publication.internalId, chapterSortNumber:dct.chapter.sortNumber).Any())
|
|
||||||
_allTasks.Add(newTask);
|
_allTasks.Add(newTask);
|
||||||
|
ExportDataAndSettings();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
|
logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ExportDataAndSettings();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DeleteTask(TrangaTask removeTask)
|
public void DeleteTask(TrangaTask removeTask)
|
||||||
{
|
{
|
||||||
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
|
||||||
|
if(_allTasks.Contains(removeTask))
|
||||||
_allTasks.Remove(removeTask);
|
_allTasks.Remove(removeTask);
|
||||||
removeTask.parentTask?.RemoveChildTask(removeTask);
|
removeTask.parentTask?.RemoveChildTask(removeTask);
|
||||||
if (removeTask is DownloadChapterTask cRemoveTask && _runningDownloadChapterTasks.ContainsKey(cRemoveTask))
|
if (_runningTasks.ContainsKey(removeTask))
|
||||||
{
|
{
|
||||||
_runningDownloadChapterTasks[cRemoveTask].Cancel();
|
_runningTasks[removeTask].Cancel();
|
||||||
_runningDownloadChapterTasks.Remove(cRemoveTask);
|
_runningTasks.Remove(removeTask);
|
||||||
}
|
}
|
||||||
foreach(TrangaTask childTask in removeTask.childTasks)
|
foreach(TrangaTask childTask in removeTask.childTasks)
|
||||||
DeleteTask(childTask);
|
DeleteTask(childTask);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null)
|
public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask mTask)
|
||||||
|
{
|
||||||
|
switch (mTask.task)
|
||||||
|
{
|
||||||
|
case TrangaTask.Task.UpdateLibraries:
|
||||||
|
return GetTasksMatching(TrangaTask.Task.UpdateLibraries);
|
||||||
|
case TrangaTask.Task.DownloadChapter:
|
||||||
|
DownloadChapterTask dct = (DownloadChapterTask)mTask;
|
||||||
|
return GetTasksMatching(TrangaTask.Task.DownloadChapter, connectorName: dct.connectorName,
|
||||||
|
internalId: dct.publication.internalId);
|
||||||
|
case TrangaTask.Task.MonitorPublication:
|
||||||
|
MonitorPublicationTask mpt = (MonitorPublicationTask)mTask;
|
||||||
|
return GetTasksMatching(TrangaTask.Task.MonitorPublication, connectorName: mpt.connectorName,
|
||||||
|
internalId: mpt.publication.internalId);
|
||||||
|
}
|
||||||
|
return Array.Empty<TrangaTask>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterNumber = null)
|
||||||
{
|
{
|
||||||
switch (taskType)
|
switch (taskType)
|
||||||
{
|
{
|
||||||
@ -204,12 +215,12 @@ public class TaskManager
|
|||||||
mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
|
mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
|
||||||
dct.ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
|
dct.ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
|
||||||
}
|
}
|
||||||
else if (internalId is not null && chapterSortNumber is not null)
|
else if (internalId is not null && chapterNumber is not null)
|
||||||
{
|
{
|
||||||
return _allTasks.Where(mTask =>
|
return _allTasks.Where(mTask =>
|
||||||
mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
|
mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
|
||||||
dct.publication.internalId == internalId &&
|
dct.publication.internalId == internalId &&
|
||||||
dct.chapter.sortNumber == chapterSortNumber);
|
dct.chapter.chapterNumber == chapterNumber);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return _allTasks.Where(mTask =>
|
return _allTasks.Where(mTask =>
|
||||||
@ -285,7 +296,7 @@ public class TaskManager
|
|||||||
chapterCollection.TryAdd(publication, newChaptersList); //To ensure publication is actually in collection
|
chapterCollection.TryAdd(publication, newChaptersList); //To ensure publication is actually in collection
|
||||||
|
|
||||||
Chapter[] newChapters = connector.GetChapters(publication, language);
|
Chapter[] newChapters = connector.GetChapters(publication, language);
|
||||||
newChaptersList = newChapters.Where(nChapter => !connector.CheckChapterIsDownloaded(publication, nChapter)).ToList();
|
newChaptersList = newChapters.Where(nChapter => !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
|
||||||
|
|
||||||
return newChaptersList;
|
return newChaptersList;
|
||||||
}
|
}
|
||||||
@ -293,7 +304,7 @@ public class TaskManager
|
|||||||
public List<Chapter> GetExistingChaptersList(Connector connector, Publication publication, string language)
|
public List<Chapter> GetExistingChaptersList(Connector connector, Publication publication, string language)
|
||||||
{
|
{
|
||||||
Chapter[] newChapters = connector.GetChapters(publication, language);
|
Chapter[] newChapters = connector.GetChapters(publication, language);
|
||||||
return newChapters.Where(nChapter => connector.CheckChapterIsDownloaded(publication, nChapter)).ToList();
|
return newChapters.Where(nChapter => nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -79,6 +79,22 @@ public abstract class TrangaTask
|
|||||||
|
|
||||||
while(childTasks.Any(ct => ct.state is ExecutionState.Enqueued or ExecutionState.Running))
|
while(childTasks.Any(ct => ct.state is ExecutionState.Enqueued or ExecutionState.Running))
|
||||||
Thread.Sleep(1000);
|
Thread.Sleep(1000);
|
||||||
|
|
||||||
|
if((int)statusCode >= 200 && (int)statusCode < 300 && parentTask is null)
|
||||||
|
foreach(NotificationManager nm in taskManager.settings.notificationManagers)
|
||||||
|
switch (this.task)
|
||||||
|
{
|
||||||
|
case Task.MonitorPublication:
|
||||||
|
MonitorPublicationTask mpt = (MonitorPublicationTask)this;
|
||||||
|
nm.SendNotification("Downloaded new chapters",
|
||||||
|
$"{mpt.publication.sortName}: {this.childTasks.Count(ct => ct.state is ExecutionState.Success)} new chapters.");
|
||||||
|
break;
|
||||||
|
case Task.DownloadChapter:
|
||||||
|
DownloadChapterTask dct = (DownloadChapterTask)this;
|
||||||
|
nm.SendNotification("Chapter downloaded", $"{dct.publication.sortName} {dct.chapter.chapterNumber} {dct.chapter.name}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
foreach(TrangaTask childTask in this.childTasks.ToArray())
|
foreach(TrangaTask childTask in this.childTasks.ToArray())
|
||||||
taskManager.DeleteTask(childTask);
|
taskManager.DeleteTask(childTask);
|
||||||
|
|
||||||
@ -124,7 +140,6 @@ public abstract class TrangaTask
|
|||||||
MonitorPublication = 2,
|
MonitorPublication = 2,
|
||||||
UpdateLibraries = 3,
|
UpdateLibraries = 3,
|
||||||
DownloadChapter = 4,
|
DownloadChapter = 4,
|
||||||
DownloadNewChapters = 2 //legacy
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
|
@ -27,9 +27,6 @@ public class DownloadChapterTask : TrangaTask
|
|||||||
Connector connector = taskManager.GetConnector(this.connectorName);
|
Connector connector = taskManager.GetConnector(this.connectorName);
|
||||||
connector.CopyCoverFromCacheToDownloadLocation(this.publication, taskManager.settings);
|
connector.CopyCoverFromCacheToDownloadLocation(this.publication, taskManager.settings);
|
||||||
HttpStatusCode downloadSuccess = connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
|
HttpStatusCode downloadSuccess = connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
|
||||||
if((int)downloadSuccess >= 200 && (int)downloadSuccess < 300 && parentTask is not null)
|
|
||||||
foreach(NotificationManager nm in taskManager.settings.notificationManagers)
|
|
||||||
nm.SendNotification("New Chapter downloaded", $"{this.publication.sortName} {this.chapter.chapterNumber} {this.chapter.name}");
|
|
||||||
return downloadSuccess;
|
return downloadSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ public class MonitorPublicationTask : TrangaTask
|
|||||||
|
|
||||||
connector.CopyCoverFromCacheToDownloadLocation(publication, taskManager.settings);
|
connector.CopyCoverFromCacheToDownloadLocation(publication, taskManager.settings);
|
||||||
|
|
||||||
publication.SaveSeriesInfoJson(connector.downloadLocation);
|
publication.SaveSeriesInfoJson(taskManager.settings.downloadLocation);
|
||||||
|
|
||||||
foreach (Chapter newChapter in newChapters)
|
foreach (Chapter newChapter in newChapters)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user