#40 task timeout criteria

Dockerfile

@@ -6,9 +6,9 @@ COPY . /src/
 RUN dotnet restore Tranga-API/Tranga-API.csproj
 RUN dotnet publish -c Release -o /publish
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
+#FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
+FROM glax/tranga-base:latest as runtime
 WORKDIR /publish
 COPY --from=build-env /publish .
 EXPOSE 80
-RUN apt-get update && apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3
 ENTRYPOINT ["dotnet", "/publish/Tranga-API.dll"]

Dockerfile-base

@@ -0,0 +1,4 @@
+# syntax=docker/dockerfile:1
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
+WORKDIR /publish
+RUN apt-get update && apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3

Tranga-API/Program.cs

@@ -71,10 +71,10 @@ app.MapGet("/Tranga/GetPublicationsFromConnector", (string connectorName, string
 app.MapGet("/Tasks/GetTaskTypes", () => Enum.GetNames(typeof(TrangaTask.Task)));
 
 
-app.MapPost("/Tasks/Create", (string taskType, string? connectorName, string? publicationId, string reoccurrenceTime, string? language) =>
+app.MapPost("/Tasks/Create", (string taskType, string? connectorName, string? internalId, string reoccurrenceTime, string? language) =>
 {
     TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
-    taskManager.AddTask(task, connectorName, publicationId, TimeSpan.Parse(reoccurrenceTime), language??"");
+    taskManager.AddTask(task, connectorName, internalId, TimeSpan.Parse(reoccurrenceTime), language);
 });
 
 app.MapDelete("/Tasks/Delete", (string taskType, string? connectorName, string? publicationId) =>

Tranga/TaskManager.cs

@@ -13,12 +13,14 @@ namespace Tranga;
 public class TaskManager
 {
     public Dictionary<Publication, List<Chapter>> chapterCollection = new();
-    private HashSet<TrangaTask> _allTasks = new HashSet<TrangaTask>();
+    private HashSet<TrangaTask> _allTasks = new();
     private bool _continueRunning = true;
     private readonly Connector[] _connectors;
     public TrangaSettings settings { get; }
     private Logger? logger { get; }
 
+    private readonly Dictionary<DownloadChapterTask, Task> _runningDownloadChapterTasks = new();
+
     /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
     /// <param name="workingDirectory">Path to the working directory</param>
     /// <param name="imageCachePath">Path to the cover-image cache</param>
@@ -117,6 +119,25 @@ public class TaskManager
                         break;
                 }
             }
+
+            HashSet<DownloadChapterTask> toRemove = new();
+            foreach (KeyValuePair<DownloadChapterTask,Task> removeTask in _runningDownloadChapterTasks)
+            {
+                if (removeTask.Key.GetType() == typeof(DownloadChapterTask) &&
+                    DateTime.Now.Subtract(removeTask.Key.lastChange) > TimeSpan.FromMinutes(3))//3 Minutes since last update to task -> remove
+                {
+                    logger?.WriteLine(this.GetType().ToString(), $"Removing failed task {removeTask}.");
+                    removeTask.Value.Dispose();
+                    DeleteTask(removeTask.Key);
+                    AddTask(new DownloadChapterTask(removeTask.Key.task, removeTask.Key.connectorName,
+                        removeTask.Key.publication, removeTask.Key.chapter, removeTask.Key.language,
+                        removeTask.Key.parentTask));
+                    toRemove.Add(removeTask.Key);
+                }
+            }
+            foreach (DownloadChapterTask taskToRemove in toRemove)
+                _runningDownloadChapterTasks.Remove(taskToRemove);
+            
             if(allTasksWaitingLength != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
                 ExportDataAndSettings();
             allTasksWaitingLength = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
@@ -135,6 +156,8 @@ public class TaskManager
         {
             task.Execute(this, this.logger);
         });
+        if(task.GetType() == typeof(DownloadChapterTask))
+            _runningDownloadChapterTasks.Add((DownloadChapterTask)task, t);
         t.Start();
     }
 
@@ -152,9 +175,9 @@ public class TaskManager
             case TrangaTask.Task.DownloadNewChapters:
                 IEnumerable<TrangaTask> matchingdnc =
                     _allTasks.Where(mTask => mTask.GetType() == typeof(DownloadNewChaptersTask));
-                if (matchingdnc.All(mTask =>
-                        ((DownloadNewChaptersTask)mTask).publication.internalId != ((DownloadNewChaptersTask)newTask).publication.publicationId &&
-                        ((DownloadNewChaptersTask)mTask).connectorName != ((DownloadNewChaptersTask)newTask).connectorName))
+                if (!matchingdnc.Any(mTask =>
+                        ((DownloadNewChaptersTask)mTask).publication.internalId == ((DownloadNewChaptersTask)newTask).publication.internalId &&
+                        ((DownloadNewChaptersTask)mTask).connectorName == ((DownloadNewChaptersTask)newTask).connectorName))
                     _allTasks.Add(newTask);
                 else
                     logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
@@ -180,7 +203,7 @@ public class TaskManager
         _allTasks.Remove(removeTask);
     }
 
-    public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? publicationId,
+    public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? internalId,
         TimeSpan reoccurrenceTime, string? language = "en")
     {
         TrangaTask? newTask = null;
@@ -190,10 +213,16 @@ public class TaskManager
                 newTask = new UpdateLibrariesTask(taskType, reoccurrenceTime);
                 break;
             case TrangaTask.Task.DownloadNewChapters:
-                if(connectorName is null || publicationId is null || language is null)
-                    logger?.WriteLine(this.GetType().ToString(), $"Values connectorName, publicationName and language can not be null.");
+                if (connectorName is null)
+                    logger?.WriteLine(this.GetType().ToString(), $"Value connectorName can not be null.");
+                if(internalId is null)
+                    logger?.WriteLine(this.GetType().ToString(), $"Value internalId can not be null.");
+                if(language is null)
+                    logger?.WriteLine(this.GetType().ToString(), $"Value language can not be null.");
+                if (connectorName is null || internalId is null || language is null)
+                    return null;
                 GetConnector(connectorName); //Check if connectorName is valid
-                Publication publication = GetAllPublications().First(pub => pub.internalId == publicationId);
+                Publication publication = GetAllPublications().First(pub => pub.internalId == internalId);
                 newTask = new DownloadNewChaptersTask(taskType, connectorName!, publication, reoccurrenceTime, language!);
                 break;
         }

Tranga/TrangaTask.cs

@@ -23,7 +23,7 @@ public abstract class TrangaTask
     [Newtonsoft.Json.JsonIgnore]public ExecutionState state { get; set; }
     [Newtonsoft.Json.JsonIgnore]public float progress { get; protected set; }
     [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
-    [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; protected set; }
+    [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; private set; }
 
     [Newtonsoft.Json.JsonIgnore]
     public DateTime executionApproximatelyFinished => this.progress != 0
@@ -32,6 +32,8 @@ public abstract class TrangaTask
     
     [Newtonsoft.Json.JsonIgnore]
     public TimeSpan executionApproximatelyRemaining => this.executionApproximatelyFinished.Subtract(DateTime.Now);
+    
+    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; protected set; }
 
     public enum ExecutionState
     {
@@ -47,11 +49,13 @@ public abstract class TrangaTask
         this.task = task;
         this.progress = 0f;
         this.executionStarted = DateTime.Now;
+        this.lastChange = DateTime.Now;
     }
 
     public float IncrementProgress(float amount)
     {
         this.progress += amount;
+        this.lastChange = DateTime.Now;
         return this.progress;
     }
     

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -9,7 +9,7 @@ public class DownloadChapterTask : TrangaTask
     public Publication publication { get; }
     public string language { get; }
     public Chapter chapter { get; }
-    [JsonIgnore]private DownloadNewChaptersTask? parentTask { get; init; }
+    [JsonIgnore]public DownloadNewChaptersTask? parentTask { get; init; }
     
     public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en", DownloadNewChaptersTask? parentTask = null) : base(task, TimeSpan.Zero)
     {
@@ -22,15 +22,15 @@ public class DownloadChapterTask : TrangaTask
 
     protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
     {
-        Publication pub = (Publication)this.publication!;
         Connector connector = taskManager.GetConnector(this.connectorName);
-        connector.DownloadChapter(pub, this.chapter, this);
+        connector.DownloadChapter(this.publication, this.chapter, this);
         taskManager.DeleteTask(this);
     }
     
     public new float IncrementProgress(float amount)
     {
         this.progress += amount;
+        this.lastChange = DateTime.Now;
         parentTask?.IncrementProgress(amount);
         return this.progress;
     }

Tranga/TrangaTasks/DownloadNewChaptersTask.cs

@@ -21,6 +21,7 @@ public class DownloadNewChaptersTask : TrangaTask
     public new float IncrementProgress(float amount)
     {
         this.progress += amount / this.childTaskAmount;
+        this.lastChange = DateTime.Now;
         return this.progress;
     }
 

Website/apiConnector.js

@@ -89,8 +89,8 @@ async function GetKomgaTask(){
     return json;
 }
 
-function CreateTask(taskType, reoccurrence, connectorName, publicationId, language){
-    var uri = apiUri + `/Tasks/Create?taskType=${taskType}&connectorName=${connectorName}&publicationId=${publicationId}&reoccurrenceTime=${reoccurrence}&language=${language}`;
+function CreateTask(taskType, reoccurrence, connectorName, internalId, language){
+    var uri = apiUri + `/Tasks/Create?taskType=${taskType}&connectorName=${connectorName}&internalId=${internalId}&reoccurrenceTime=${reoccurrence}&language=${language}`;
     PostData(uri);
 }