From c0e6da144e27d71cd3247dedec770bb5655807f7 Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Sat, 2 Sep 2023 16:14:21 +0200
Subject: [PATCH] Changed Job.ExecuteNow to ExecutionEnqueue Instead of
 replacing progressToken, change Increments based in completed increments

---
 Tranga/Jobs/Job.cs     | 9 +++++----
 Tranga/Jobs/JobBoss.cs | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Tranga/Jobs/Job.cs b/Tranga/Jobs/Job.cs
index deb598e..86d5b19 100644
--- a/Tranga/Jobs/Job.cs
+++ b/Tranga/Jobs/Job.cs
@@ -59,14 +59,15 @@ public abstract class Job : GlobalBase
 
     public void ResetProgress()
     {
-        this.progressToken = new ProgressToken(this.progressToken.increments);
+        this.progressToken.increments = this.progressToken.increments - this.progressToken.incrementsCompleted;
         this.lastExecution = DateTime.Now;
     }
 
-    public void ExecuteNow()
+    public void ExecutionEnqueue()
     {
-        ResetProgress();
-        this.lastExecution = DateTime.UnixEpoch;
+        this.progressToken.increments = this.progressToken.increments - this.progressToken.incrementsCompleted;
+        this.lastExecution = recurrenceTime is not null ? DateTime.Now.Subtract((TimeSpan)recurrenceTime) : DateTime.UnixEpoch;
+        this.progressToken.Standby();
     }
 
     public void Cancel()
diff --git a/Tranga/Jobs/JobBoss.cs b/Tranga/Jobs/JobBoss.cs
index d81d2df..b12ebd3 100644
--- a/Tranga/Jobs/JobBoss.cs
+++ b/Tranga/Jobs/JobBoss.cs
@@ -130,7 +130,7 @@ public class JobBoss : GlobalBase
         Queue<Job> connectorJobQueue = mangaConnectorJobQueue[job.mangaConnector];
         if(!connectorJobQueue.Contains(job))
             connectorJobQueue.Enqueue(job);
-        job.ExecuteNow();
+        job.ExecutionEnqueue();
     }
 
     public void AddJobsToQueue(IEnumerable<Job> jobs)