Tranga-CLI/Tranga_Cli.cs

@@ -135,12 +135,8 @@ public static class Tranga_Cli
                 switch (selection)
                 {
                     case ConsoleKey.L:
-                        while (!Console.KeyAvailable)
+                        PrintTasks(taskManager.GetAllTasks(), logger);
-                        {
+                        Console.WriteLine("Press any key.");
-                            PrintTasks(taskManager.GetAllTasks(), logger);
-                            Console.WriteLine("Press any key.");
-                            Thread.Sleep(500);
-                        }
                         Console.ReadKey();
                         break;
                     case ConsoleKey.C:
@@ -164,26 +160,17 @@ public static class Tranga_Cli
                         Console.ReadKey();
                         break;
                     case ConsoleKey.R:
-                        while (!Console.KeyAvailable)
+                        PrintTasks(
-                        {
+                            taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running)
-                            PrintTasks(
+                                .ToArray(), logger);
-                                taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running)
+                        Console.WriteLine("Press any key.");
-                                    .ToArray(), logger);
-                            Console.WriteLine("Press any key.");
-                            Thread.Sleep(500);
-                        }
                         Console.ReadKey();
                         break;
                     case ConsoleKey.K:
-                        while (!Console.KeyAvailable)
+                        PrintTasks(
-                        {
+                            taskManager.GetAllTasks().Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued)
-                            PrintTasks(
+                                .ToArray(), logger);
-                                taskManager.GetAllTasks()
+                        Console.WriteLine("Press any key.");
-                                    .Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued)
-                                    .ToArray(), logger);
-                            Console.WriteLine("Press any key.");
-                            Thread.Sleep(500);
-                        }
                         Console.ReadKey();
                         break;
                     case ConsoleKey.F:
@@ -253,13 +240,13 @@ public static class Tranga_Cli
         int tIndex = 0;
         Console.WriteLine($"Tasks (Running/Queue/Total): {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
         string header =
-            $"{"",-5}{"Task",-20} | {"Last Executed",-20} | {"Reoccurrence",-12} | {"State",-10} | {"Progress",-9} | {"Finished",-20} | {"Remaining",-12} | {"Connector",-15} | Publication/Manga ";
+            $"{"",-5}{"Task",-20} | {"Last Executed",-20} | {"Reoccurrence",-12} | {"State",-10} | {"Progress",-9} | {"Connector",-15} | Publication/Manga ";
         Console.WriteLine(header);
         Console.WriteLine(new string('-', header.Length));
         foreach (TrangaTask trangaTask in tasks)
         {
             string[] taskSplit = trangaTask.ToString().Split(", ");
-            Console.WriteLine($"{tIndex++:000}: {taskSplit[0],-20} | {taskSplit[1],-20} | {taskSplit[2],-12} | {taskSplit[3],-10} | {taskSplit[4],-9} | {taskSplit[5],-20} | {taskSplit[6][..12],-12} | {(taskSplit.Length > 7 ? taskSplit[7] : ""),-15} | {(taskSplit.Length > 8 ? taskSplit[8] : "")} {(taskSplit.Length > 9 ? taskSplit[9] : "")} {(taskSplit.Length > 10 ? taskSplit[10] : "")}");
+            Console.WriteLine($"{tIndex++:000}: {taskSplit[0],-20} | {taskSplit[1],-20} | {taskSplit[2],-12} | {taskSplit[3],-10} | {(taskSplit.Length > 4 ? taskSplit[4] : ""),-9} | {(taskSplit.Length > 5 ? taskSplit[5] : ""),-15} | {(taskSplit.Length > 6 ? taskSplit[6] : "")} {(taskSplit.Length > 7 ? taskSplit[7] : "")} {(taskSplit.Length > 8 ? taskSplit[8] : "")}");
         }
             
     }

Tranga/Connector.cs

@@ -183,7 +183,7 @@ public abstract class Connector
             string extension = split[^1];
             logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}");
             DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
-            parentTask.IncrementProgress(1f / imageUrls.Length);
+            parentTask.progress += 1f / imageUrls.Length;
         }
         
         if(comicInfoPath is not null)

Tranga/TrangaTask.cs

@@ -21,17 +21,8 @@ public abstract class TrangaTask
     public DateTime lastExecuted { get; set; }
     public Task task { get; }
     [Newtonsoft.Json.JsonIgnore]public ExecutionState state { get; set; }
-    [Newtonsoft.Json.JsonIgnore]public float progress { get; protected set; }
+    [Newtonsoft.Json.JsonIgnore]public float progress { get; set; }
     [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
-    [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; protected set; }
-
-    [Newtonsoft.Json.JsonIgnore]
-    public DateTime executionApproximatelyFinished => this.progress != 0
-        ? this.executionStarted.Add(DateTime.Now.Subtract(this.executionStarted) / this.progress)
-        : DateTime.MaxValue;
-    
-    [Newtonsoft.Json.JsonIgnore]
-    public TimeSpan executionApproximatelyRemaining => this.executionApproximatelyFinished.Subtract(DateTime.Now);
 
     public enum ExecutionState
     {
@@ -46,13 +37,6 @@ public abstract class TrangaTask
         this.lastExecuted = DateTime.Now.Subtract(reoccurrence);
         this.task = task;
         this.progress = 0f;
-        this.executionStarted = DateTime.Now;
-    }
-
-    public float IncrementProgress(float amount)
-    {
-        this.progress += amount;
-        return this.progress;
     }
     
     /// <summary>
@@ -71,7 +55,6 @@ public abstract class TrangaTask
     {
         logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}");
         this.state = ExecutionState.Running;
-        this.executionStarted = DateTime.Now;
         ExecuteTask(taskManager, logger);
         this.lastExecuted = DateTime.Now;
         this.state = ExecutionState.Waiting;
@@ -93,7 +76,7 @@ public abstract class TrangaTask
 
     public override string ToString()
     {
-        return $"{task}, {lastExecuted}, {reoccurrence}, {state}, {progress:P2}, {executionApproximatelyFinished}, {executionApproximatelyRemaining}";
+        return $"{task}, {lastExecuted}, {reoccurrence}, {state}, {progress:P2}";
     }
     
     public class TrangaTaskJsonConverter : JsonConverter

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -1,5 +1,4 @@
 using Logging;
-using Newtonsoft.Json;
 
 namespace Tranga.TrangaTasks;
 
@@ -9,15 +8,12 @@ public class DownloadChapterTask : TrangaTask
     public Publication publication { get; }
     public string language { get; }
     public Chapter chapter { get; }
-    [JsonIgnore]private DownloadNewChaptersTask? parentTask { get; init; }
+    public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en") : base(task, TimeSpan.Zero)
-    
-    public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en", DownloadNewChaptersTask? parentTask = null) : base(task, TimeSpan.Zero)
     {
         this.chapter = chapter;
         this.connectorName = connectorName;
         this.publication = publication;
         this.language = language;
-        this.parentTask = parentTask;
     }
 
     protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
@@ -28,13 +24,6 @@ public class DownloadChapterTask : TrangaTask
         taskManager.DeleteTask(this);
     }
     
-    public new float IncrementProgress(float amount)
-    {
-        this.progress += amount;
-        parentTask?.IncrementProgress(amount);
-        return this.progress;
-    }
-
     public override string ToString()
     {
         return $"{base.ToString()}, {connectorName}, {publication.sortName} {publication.internalId}, Vol.{chapter.volumeNumber} Ch.{chapter.chapterNumber}";

Tranga/TrangaTasks/DownloadNewChaptersTask.cs

@@ -1,5 +1,4 @@
 using Logging;
-using Newtonsoft.Json;
 
 namespace Tranga.TrangaTasks;
 
@@ -8,38 +7,34 @@ public class DownloadNewChaptersTask : TrangaTask
     public string connectorName { get; }
     public Publication publication { get; }
     public string language { get; }
-    [JsonIgnore]private int childTaskAmount { get; set; }
-    
     public DownloadNewChaptersTask(Task task, string connectorName, Publication publication, TimeSpan reoccurrence, string language = "en") : base(task, reoccurrence)
     {
         this.connectorName = connectorName;
         this.publication = publication;
         this.language = language;
-        childTaskAmount = 0;
-    }
-    
-    public new float IncrementProgress(float amount)
-    {
-        this.progress += amount / this.childTaskAmount;
-        return this.progress;
     }
 
     protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
     {
         Publication pub = publication!;
         Connector connector = taskManager.GetConnector(this.connectorName);
+        this.progress = 0.1f;
         
         //Check if Publication already has a Folder
         pub.CreatePublicationFolder(taskManager.settings.downloadLocation);
+        this.progress = 0.2f;
         List<Chapter> newChapters = GetNewChaptersList(connector, pub, language!, ref taskManager.chapterCollection);
-        this.childTaskAmount = newChapters.Count;
+        this.progress = 0.6f;
 
         connector.CopyCoverFromCacheToDownloadLocation(pub, taskManager.settings);
+        this.progress = 0.7f;
         
         pub.SaveSeriesInfoJson(connector.downloadLocation);
+        this.progress = 0.8f;
 
         foreach (Chapter newChapter in newChapters)
-            taskManager.AddTask(new DownloadChapterTask(Task.DownloadChapter, this.connectorName!, pub, newChapter, this.language, this));
+            taskManager.AddTask(new DownloadChapterTask(Task.DownloadChapter, this.connectorName!, pub, newChapter, this.language));
+        this.progress = 1f;
     }
     
     /// <summary>