glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-06-23 03:24:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

We dont need to actually load the MangaConnector to know if two names match.
Some checks failed
Docker Image CI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
glax
2025-06-18 00:23:33 +02:00
parent ff10432c79
commit f36f34f212
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
API/Tranga.cs
View File

@ -140,9 +140,9 @@ public static class Tranga
List<Job> jobsWithoutDownloading = jobsWithoutDependencies.FilterJobsWithoutDownloading(); List<Job> jobsWithoutDownloading = jobsWithoutDependencies.FilterJobsWithoutDownloading();
//Match running and waiting jobs per Connector //Match running and waiting jobs per Connector
Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> runningJobsPerConnector = Dictionary<string, Dictionary<JobType, List<Job>>> runningJobsPerConnector =
runningJobs.GetJobsPerJobTypeAndConnector(); runningJobs.GetJobsPerJobTypeAndConnector();
Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> waitingJobsPerConnector = Dictionary<string, Dictionary<JobType, List<Job>>> waitingJobsPerConnector =
jobsWithoutDependencies.GetJobsPerJobTypeAndConnector(); jobsWithoutDependencies.GetJobsPerJobTypeAndConnector();
List<Job> jobsNotHeldBackByConnector = List<Job> jobsNotHeldBackByConnector =
MatchJobsRunningAndWaiting(runningJobsPerConnector, waitingJobsPerConnector); MatchJobsRunningAndWaiting(runningJobsPerConnector, waitingJobsPerConnector);
@ -250,13 +250,13 @@ public static class Tranga
} }
private static Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> GetJobsPerJobTypeAndConnector(this List<Job> jobs) private static Dictionary<string, Dictionary<JobType, List<Job>>> GetJobsPerJobTypeAndConnector(this List<Job> jobs)
{ {
DateTime start = DateTime.UtcNow; DateTime start = DateTime.UtcNow;
Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> ret = new(); Dictionary<string, Dictionary<JobType, List<Job>>> ret = new();
foreach (Job job in jobs) foreach (Job job in jobs)
{ {
if(GetJobConnector(job) is not { } connector) if(GetJobConnectorName(job) is not { } connector)
continue; continue;
if (!ret.ContainsKey(connector)) if (!ret.ContainsKey(connector))
ret.Add(connector, new()); ret.Add(connector, new());
@ -269,12 +269,12 @@ public static class Tranga
return ret; return ret;
} }
private static List<Job> MatchJobsRunningAndWaiting(Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> running, private static List<Job> MatchJobsRunningAndWaiting(Dictionary<string, Dictionary<JobType, List<Job>>> running,
Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> waiting) Dictionary<string, Dictionary<JobType, List<Job>>> waiting)
{ {
DateTime start = DateTime.UtcNow; DateTime start = DateTime.UtcNow;
List<Job> ret = new(); List<Job> ret = new();
foreach ((MangaConnector connector, Dictionary<JobType, List<Job>> jobTypeJobsWaiting) in waiting) foreach ((string connector, Dictionary<JobType, List<Job>> jobTypeJobsWaiting) in waiting)
{ {
if (running.TryGetValue(connector, out Dictionary<JobType, List<Job>>? jobTypeJobsRunning)) if (running.TryGetValue(connector, out Dictionary<JobType, List<Job>>? jobTypeJobsRunning))
{ //MangaConnector has running Jobs { //MangaConnector has running Jobs
@ -309,17 +309,18 @@ public static class Tranga
Log.Debug($"Getting eligible jobs (not held back by Connector) took {end.Subtract(start).TotalMilliseconds}ms"); Log.Debug($"Getting eligible jobs (not held back by Connector) took {end.Subtract(start).TotalMilliseconds}ms");
return ret; return ret;
} }
private static MangaConnector? GetJobConnector(Job job)
private static string? GetJobConnectorName(Job job)
{ {
if (job is DownloadAvailableChaptersJob dacj) if (job is DownloadAvailableChaptersJob dacj)
return dacj.Manga.MangaConnector; return dacj.Manga.MangaConnectorName;
if (job is DownloadMangaCoverJob dmcj) if (job is DownloadMangaCoverJob dmcj)
return dmcj.Manga.MangaConnector; return dmcj.Manga.MangaConnectorName;
if (job is DownloadSingleChapterJob dscj) if (job is DownloadSingleChapterJob dscj)
return dscj.Chapter.ParentManga.MangaConnector; return dscj.Chapter.ParentManga.MangaConnectorName;
if (job is RetrieveChaptersJob rcj) if (job is RetrieveChaptersJob rcj)
return rcj.Manga.MangaConnector; return rcj.Manga.MangaConnectorName;
return null; return null;
} }
} }