glax/Tranga
2
0
Fork 0
Code

Add parameter JobBoss to Job.ExecuteTask (and Internal)

Browse Source
This commit is contained in:
glax 2023-11-02 15:19:36 +01:00
parent 391efcb9bc
commit 49ab8928b1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tranga/Jobs/DownloadChapter.cs
View File

@ -27,7 +27,7 @@ public class DownloadChapter : Job
return $"{id} Chapter: {chapter}"; return $"{id} Chapter: {chapter}";
} }
protected override IEnumerable<Job> ExecuteReturnSubTasksInternal() protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
{ {
Task downloadTask = new(delegate Task downloadTask = new(delegate
{ {

2
Tranga/Jobs/DownloadNewChapters.cs
View File

@ -31,7 +31,7 @@ public class DownloadNewChapters : Job
return $"{id} Manga: {manga}"; return $"{id} Manga: {manga}";
} }
protected override IEnumerable<Job> ExecuteReturnSubTasksInternal() protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
{ {
manga.SaveSeriesInfoJson(settings.downloadLocation); manga.SaveSeriesInfoJson(settings.downloadLocation);
Chapter[] chapters = mangaConnector.GetNewChapters(manga, this.translatedLanguage); Chapter[] chapters = mangaConnector.GetNewChapters(manga, this.translatedLanguage);

6
Tranga/Jobs/Job.cs
View File

@ -86,13 +86,13 @@ public abstract class Job : GlobalBase
subJob.Cancel(); subJob.Cancel();
} }
public IEnumerable<Job> ExecuteReturnSubTasks() public IEnumerable<Job> ExecuteReturnSubTasks(JobBoss jobBoss)
{ {
progressToken.Start(); progressToken.Start();
subJobs = ExecuteReturnSubTasksInternal(); subJobs = ExecuteReturnSubTasksInternal(jobBoss);
lastExecution = DateTime.Now; lastExecution = DateTime.Now;
return subJobs; return subJobs;
} }
protected abstract IEnumerable<Job> ExecuteReturnSubTasksInternal(); protected abstract IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss);
} }

2
Tranga/Jobs/JobBoss.cs
View File

@ -253,7 +253,7 @@ public class JobBoss : GlobalBase
Log($"Next job in {jobs.MinBy(job => job.nextExecution)?.nextExecution.Subtract(DateTime.Now)} {jobs.MinBy(job => job.nextExecution)?.id}"); Log($"Next job in {jobs.MinBy(job => job.nextExecution)?.nextExecution.Subtract(DateTime.Now)} {jobs.MinBy(job => job.nextExecution)?.id}");
}else if (queueHead.progressToken.state is ProgressToken.State.Standby) }else if (queueHead.progressToken.state is ProgressToken.State.Standby)
{ {
Job[] subJobs = jobQueue.Peek().ExecuteReturnSubTasks().ToArray(); Job[] subJobs = jobQueue.Peek().ExecuteReturnSubTasks(this).ToArray();
AddJobs(subJobs); AddJobs(subJobs);
AddJobsToQueue(subJobs); AddJobsToQueue(subJobs);
}else if (queueHead.progressToken.state is ProgressToken.State.Running && DateTime.Now.Subtract(queueHead.progressToken.lastUpdate) > TimeSpan.FromMinutes(5)) }else if (queueHead.progressToken.state is ProgressToken.State.Running && DateTime.Now.Subtract(queueHead.progressToken.lastUpdate) > TimeSpan.FromMinutes(5))