Fixed progress tracking this time for realsies. resolves #5

API/Dockerfile

@@ -6,7 +6,7 @@ COPY . /src/
 RUN dotnet restore API/API.csproj
 RUN dotnet publish -c Release -o /publish
 
-FROM glax/tranga-base:dev as runtime
+FROM glax/tranga-base:latest as runtime
 WORKDIR /publish
 COPY --from=build-env /publish .
 EXPOSE 6531

API/Server.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using Logging;
@@ -18,7 +19,10 @@ public class Server
     public Server(int port, TaskManager taskManager, Logger? logger = null)
     {
         this.logger = logger;
-        this._listener.Prefixes.Add($"http://*:{port}/");
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            this._listener.Prefixes.Add($"http://*:{port}/");
+        else
+            this._listener.Prefixes.Add($"http://localhost:{port}/");
         this._requestHandler = new RequestHandler(taskManager, this);
         Listen();
     }
@@ -50,12 +54,21 @@ public class Server
             SendResponse(HttpStatusCode.BadRequest, response);
             return;
         }
-        
+
-        _requestHandler.HandleRequest(request, response);
+        if (request.HttpMethod == "OPTIONS")
+        {
+            SendResponse(HttpStatusCode.OK, response);
+        }
+        else
+        {
+            _requestHandler.HandleRequest(request, response);
+        }
     }
 
     internal void SendResponse(HttpStatusCode statusCode, HttpListenerResponse response, object? content = null)
     {
+        if (!response.OutputStream.CanWrite)
+            return;
         //logger?.WriteLine(this.GetType().ToString(), $"Sending response: {statusCode}");
         response.StatusCode = (int)statusCode;
         response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With");

Dockerfile

@@ -1,14 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
-WORKDIR /src
-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 glax/tranga-base:latest as runtime
-WORKDIR /publish
-COPY --from=build-env /publish .
-EXPOSE 80
-ENTRYPOINT ["dotnet", "/publish/Tranga-API.dll"]

README.md

@@ -52,14 +52,14 @@
 <!-- ABOUT THE PROJECT -->
 ## About The Project
 
-Tranga can download Chapters and Metadata from Scanlation sites such as 
+Tranga can download Chapters and Metadata from "Scanlation" sites such as 
 
 - [MangaDex.org](https://mangadex.org/)
 - [Manganato.com](https://manganato.com/)
 - [Mangasee](https://mangasee123.com/)
+- ❓ Open an [issue](https://github.com/C9Glax/tranga/issues)
 
-and automatically start updates in [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/) to import them.
+and automatically import them with [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/). Also Notifications will be sent to your devices using [Gotify](https://gotify.net/) and [LunaSea](https://www.lunasea.app/).
-
 ### Inspiration:
 
 Because [Kaizoku](https://github.com/oae/kaizoku) was relying on [mangal](https://github.com/metafates/mangal) and mangal
@@ -76,19 +76,18 @@ That is why I wanted to create my own project, in a language I understand, and t
 - Newtonsoft.JSON
 - [PuppeteerSharp](https://www.puppeteersharp.com/)
 - [Html Agility Pack (HAP)](https://html-agility-pack.net/)
-- Love <3 Blåhaj 🦈
+- 💙 Blåhaj 🦈
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 
 ## Screenshots
 
-![image](screenshots/overview.png)
+| ![image](screenshots/overview.png) | ![image](screenshots/addtask.png) |
+|-----------------------------------:|:----------------------------------|
 
-![image](screenshots/addtask.png)
+| ![image](screenshots/settings.png) | ![image](screenshots/publication-description.png) | ![image](screenshots/progress.png) |
-
+|-----------------------------------:|:-------------------------------------------------:|:-----------------------------------|
-| ![image](screenshots/settings.png) | ![image](screenshots/publication-description.png) |
-|-----------------------------------:|:-------------------------------------------------:|
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
@@ -110,39 +109,42 @@ Download [docker-compose.yaml](https://git.bernloehr.eu/glax/Tranga/src/branch/m
 
 Wherever you are mounting `/usr/share/Tranga-API` you also need to mount that same path + `/imageCache` in the webserver container.
 
-### Usage
+### Docker-Website usage
 
 There is two ways to download Mangas:
 - Downloading everything and monitor for new Chapters
 - Selecting specific Volumes/Chapters
 
 On the website you add new tasks, by selecting the blue '+' field. Next select the connector/site you want to use, and enter a search term.
-After pressing 'Search', the results will be presented below - this might, depending on the result-size, take a while.
+After clicking 'Search' (or pressing Enter), the results will be presented below - this might, depending on the result-size, take a while because we are already preloading the cover-images.
-Next select the publication and a new popup will open with two options:
+Next select the publication (by selecting the cover) and a new popup will open with two options:
 - "Monitor" - Download all chapters and monitor for new ones
 - "Download Chapter" - Download specific chapters only
 
-When selecting `Monitor` you will be presented with a new window and the selection of the interval you want to check for new chapters.
+When selecting `Monitor` you will be presented with a new window and the selection of the interval you want to check for new chapters (Default: Every 3 hours).
-When selecting `Download Chapter` a list will open with all available chapters from which you can then select a range.
+When selecting `Download Chapter` a list will open with all available chapters - that have not yet been downloaded - from which you can then select a range (see below).
 
 The syntax for selecting chapters is as follows:
 - To download a single Chapter enter either the index number (the number at the very start of the line) or its absolute number like so: `c(h)(apter)[number]`, spaces are allowed.
 - To download a range of chapters enter either a range of index numbers (`3-6`) or chapters (`ch 12-23`).
 - For volumes the syntax is as follows: `v(ol)[number](-[number])`, again spaces allowed.
 
-Examples: `2-12`, `c1`, `ch 2`, `chapter 3`, `v 2`, `vol3-4`, `v2c4` (note: you can only specify a single chapter with this syntax).
+Examples: `2-12`, `c1`, `ch 2`, `chapter 3`, `v 2`, `vol3-4`, `v2c4` (note: you can only specify a single chapter with this last syntax).
 
 ### Prerequisites
 
+#### To Build
 [.NET-Core 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
+#### To Run
+[.NET-Core 7.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) scroll down a bit, should be on the right the second item.
 
 <!-- ROADMAP -->
 ## Roadmap
 
 - [ ] Docker ARM support
-- [ ] ? 
+- [ ] ❓
 
-See the [open issues](https://git.bernloehr.eu/glax/Tranga/issues) for a full list of proposed features (and known issues).
+See the [open issues](https://github.com/C9Glax/tranga/issues) for a full list of proposed features (and known issues).
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 

Tranga/TaskManager.cs

@@ -81,23 +81,15 @@ public class TaskManager
                         break;
                 }
             }
-
+            
-            TrangaTask[] failedDownloadChapterTasks = _allTasks.Where(taskQuery =>
+            foreach (TrangaTask failedDownloadChapterTask in _allTasks.Where(taskQuery =>
-                taskQuery.state is TrangaTask.ExecutionState.Failed && taskQuery is DownloadChapterTask).ToArray();
+                         taskQuery.state is TrangaTask.ExecutionState.Failed && taskQuery is DownloadChapterTask).ToArray())
-            foreach (TrangaTask failedDownloadChapterTask in failedDownloadChapterTasks)
             {
                 DeleteTask(failedDownloadChapterTask);
                 TrangaTask newTask = failedDownloadChapterTask.Clone();
                 failedDownloadChapterTask.parentTask?.AddChildTask(newTask);
                 AddTask(newTask);
             }
-
-            TrangaTask[] successfulDownloadChapterTasks = _allTasks.Where(taskQuery =>
-                taskQuery.state is TrangaTask.ExecutionState.Success && taskQuery is DownloadChapterTask).ToArray();
-            foreach(TrangaTask successfulDownloadChapterTask in successfulDownloadChapterTasks)
-            {
-                DeleteTask(successfulDownloadChapterTask);
-            }
             
             if(waitingTasksCount != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
                 ExportDataAndSettings();
@@ -166,6 +158,8 @@ public class TaskManager
             _runningDownloadChapterTasks[cRemoveTask].Cancel();
             _runningDownloadChapterTasks.Remove(cRemoveTask);
         }
+        foreach(TrangaTask childTask in removeTask.childTasks)
+            DeleteTask(childTask);
     }
 
     public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null)

Tranga/TrangaTask.cs

@@ -22,14 +22,14 @@ public abstract class TrangaTask
     public DateTime lastExecuted { get; set; }
     [Newtonsoft.Json.JsonIgnore] public ExecutionState state { get; set; }
     public Task task { get; }
-    public string taskId { get; }
+    public string taskId { get; init; }
     [Newtonsoft.Json.JsonIgnore] public TrangaTask? parentTask { get; set; }
     public string? parentTaskId { get; set; }
-    [Newtonsoft.Json.JsonIgnore] protected HashSet<TrangaTask> childTasks { get; }
+    [Newtonsoft.Json.JsonIgnore] internal HashSet<TrangaTask> childTasks { get; }
     public double progress => GetProgress();
     [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; private set; }
-    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; private set; }
+    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; internal set; }
-    [Newtonsoft.Json.JsonIgnore]public DateTime executionApproximatelyFinished => progress != 0 ? lastChange.Add(GetRemainingTime()) : DateTime.MaxValue;
+    [Newtonsoft.Json.JsonIgnore]public DateTime executionApproximatelyFinished => lastChange.Add(GetRemainingTime());
     public TimeSpan executionApproximatelyRemaining => executionApproximatelyFinished.Subtract(DateTime.Now);
     [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
 
@@ -72,9 +72,16 @@ public abstract class TrangaTask
         this.state = ExecutionState.Running;
         this.executionStarted = DateTime.Now;
         this.lastChange = DateTime.Now;
+        if(parentTask is not null && parentTask.childTasks.All(ct => ct.state is ExecutionState.Waiting))
+            parentTask.executionStarted = DateTime.Now;
+        
         HttpStatusCode statusCode = ExecuteTask(taskManager, logger, cancellationToken);
+        
         while(childTasks.Any(ct => ct.state is ExecutionState.Enqueued or ExecutionState.Running))
             Thread.Sleep(1000);
+        foreach(TrangaTask childTask in this.childTasks.ToArray())
+            taskManager.DeleteTask(childTask);
+        
         if ((int)statusCode >= 200 && (int)statusCode < 300)
         {
             this.lastExecuted = DateTime.Now;
@@ -106,10 +113,10 @@ public abstract class TrangaTask
 
     private TimeSpan GetRemainingTime()
     {
-        if(progress == 0 || lastChange == DateTime.MaxValue || executionStarted == DateTime.UnixEpoch)
+        if(progress == 0 || state is ExecutionState.Enqueued or ExecutionState.Waiting or ExecutionState.Failed || lastChange == DateTime.MaxValue)
-            return TimeSpan.Zero;
+            return DateTime.MaxValue.Subtract(lastChange).Subtract(TimeSpan.FromHours(1));
         TimeSpan elapsed = lastChange.Subtract(executionStarted);
-        return elapsed.Divide(progress).Subtract(elapsed);
+        return elapsed.Divide(progress).Multiply(1 - progress);
     }
 
     public enum Task : byte

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -47,6 +47,9 @@ public class DownloadChapterTask : TrangaTask
     internal void IncrementProgress(double amount)
     {
         this._dctProgress += amount;
+        this.lastChange = DateTime.Now;
+        if(this.parentTask is not null)
+            this.parentTask.lastChange = DateTime.Now;
     }
 
     public override string ToString()

Website/interaction.js

@@ -195,7 +195,7 @@ function DownloadChapterTaskClick(){
 
 function DeleteTaskClick(){
     taskToDelete = tasks.filter(tTask => tTask.publication.internalId === toEditId)[0];
-    DeleteTask("DownloadNewChapters", taskToDelete.connectorName, toEditId);
+    DeleteTask("MonitorPublication", taskToDelete.connectorName, toEditId);
     HidePublicationPopup();
 }