Debug: MatchJobsRunningAndWaiting

UpdateCoverJobs not starting.

API/Controllers/JobController.cs

@@ -374,4 +374,25 @@ public class JobController(PgsqlContext context, ILog Log) : Controller
     {
         return StatusCode(Status501NotImplemented);
     }
+
+    /// <summary>
+    /// Removes failed and completed Jobs (that are not recurring)
+    /// </summary>
+    /// <response code="202">Job started</response>
+    /// <response code="500">Error during Database Operation</response>
+    [HttpPost("Cleanup")]
+    public IActionResult CleanupJobs()
+    {
+        try
+        {
+            context.Jobs.RemoveRange(context.Jobs.Where(j => j.state == JobState.Failed || j.state == JobState.Completed));
+            context.SaveChanges();
+            return Ok();
+        }
+        catch (Exception e)
+        {
+            Log.Error(e);
+            return StatusCode(500, e.Message);
+        }
+    }
 }

API/Schema/Chapter.cs

@@ -187,6 +187,8 @@ public class Chapter : IComparable<Chapter>
             comicInfo.Add(new XElement("Writer", string.Join(',', ParentManga.Authors.Select(author => author.AuthorName))));
         if(ParentManga.OriginalLanguage is not null)
             comicInfo.Add(new XElement("LanguageISO", ParentManga.OriginalLanguage));
+        if(ParentManga.Description != string.Empty)
+            comicInfo.Add(new XElement("Summary", ParentManga.Description));
         return comicInfo.ToString();
     }
 

API/Schema/Jobs/DownloadSingleChapterJob.cs

@@ -45,6 +45,11 @@ public class DownloadSingleChapterJob : Job
     
     protected override IEnumerable<Job> RunInternal(PgsqlContext context)
     {
+        if (Chapter.Downloaded)
+        {
+            Log.Info("Chapter was already downloaded.");
+            return [];
+        }
         string[] imageUrls = Chapter.ParentManga.MangaConnector.GetChapterImageUrls(Chapter);
         if (imageUrls.Length < 1)
         {
@@ -129,21 +134,39 @@ public class DownloadSingleChapterJob : Job
     {
         if (!TrangaSettings.bwImages && TrangaSettings.compression == 100)
         {
-            Log.Debug($"No processing requested for image");
+            Log.Debug("No processing requested for image");
             return;
         }
         
         Log.Debug($"Processing image: {imagePath}");
 
+        try
+        {
             using Image image = Image.Load(imagePath);
-        File.Delete(imagePath);
             if (TrangaSettings.bwImages)
                 image.Mutate(i => i.ApplyProcessor(new AdaptiveThresholdProcessor()));
+            File.Delete(imagePath);
             image.SaveAsJpeg(imagePath, new JpegEncoder()
             {
                 Quality = TrangaSettings.compression
             });
         }
+        catch (Exception e)
+        {
+            if (e is UnknownImageFormatException or NotSupportedException)
+            {
+                //If the Image-Format is not processable by ImageSharp, we can't modify it.
+                Log.Debug($"Unable to process {imagePath}: Not supported image format");
+            }else if (e is InvalidImageContentException)
+            {
+                Log.Debug($"Unable to process {imagePath}: Invalid Content");
+            }
+            else
+            {
+                Log.Error(e);
+            }
+        }
+    }
     
     private void CopyCoverFromCacheToDownloadLocation(Manga manga)
     {

API/Schema/MangaConnectors/ComickIo.cs

@@ -78,7 +78,7 @@ public class ComickIo : MangaConnector
     public override Chapter[] GetChapters(Manga manga, string? language = null)
     {
         Log.Info($"Getting Chapters: {manga.IdOnConnectorSite}");
-        List<string> chapterHids = new();
+        List<Chapter> chapters = new();
         int page = 1;
         while(page < 50)
         {
@@ -95,16 +95,13 @@ public class ComickIo : MangaConnector
             JToken data = JToken.Parse(sr.ReadToEnd());
             JArray? chaptersArray = data["chapters"] as JArray;
 
-            if (chaptersArray?.Count < 1)
+            if (chaptersArray is null || chaptersArray.Count < 1)
                 break;
             
-            chapterHids.AddRange(chaptersArray?.Select(token => token.Value<string>("hid")!)!);
+            chapters.AddRange(ParseChapters(manga, chaptersArray));
 
             page++;
         }
-        Log.Debug($"Getting chapters for {manga.Name} yielded {chapterHids.Count} hids. Requesting chapters now...");
-
-        List<Chapter> chapters = chapterHids.Select(hid => ChapterFromHid(manga, hid)).ToList();
 
         return chapters.ToArray();
     }
@@ -219,29 +216,23 @@ public class ComickIo : MangaConnector
             year: year, originalLanguage: originalLanguage);
     }
 
-    private Chapter ChapterFromHid(Manga parentManga, string hid)
+    private List<Chapter> ParseChapters(Manga parentManga, JArray chaptersArray)
     {
-        string requestUrl = $"https://api.comick.fun/chapter/{hid}";
+        List<Chapter> chapters = new ();
-        RequestResult result = downloadClient.MakeRequest(requestUrl, RequestType.Default);
+        foreach (JToken chapter in chaptersArray)
-        if ((int)result.statusCode < 200 || (int)result.statusCode >= 300)
         {
-            Log.Error("Request failed");
+            string? chapterNum = chapter.Value<string>("chap");
-            throw new Exception("Request failed");
+            string? volumeNumStr = chapter.Value<string>("vol");
-        }
-        
-        using StreamReader sr = new (result.result);
-        JToken data = JToken.Parse(sr.ReadToEnd());
-
-        string? canonical = data.Value<string>("canonical");
-        string? chapterNum = data["chapter"]?.Value<string>("chap");
-        string? volumeNumStr = data["chapter"]?.Value<string>("vol");
             int? volumeNum = volumeNumStr is null ? null : int.Parse(volumeNumStr);
-        string? title = data["chapter"]?.Value<string>("title");
+            string? title = chapter.Value<string>("title");
+            string? hid = chapter.Value<string>("hid");
+            string url = $"https://comick.io/comic/{parentManga.IdOnConnectorSite}/{hid}";
             
-        if(chapterNum is null)
+            if(chapterNum is null || hid is null)
-            throw new Exception("chapterNum is null");
+                continue;
 
-        string url = $"https://comick.io{canonical}";
+            chapters.Add(new (parentManga, url, chapterNum, volumeNum, hid, title));
-        return new Chapter(parentManga, url, chapterNum, volumeNum, hid, title);
+        }
+        return chapters;
     }
 }

API/Tranga.cs

@@ -169,11 +169,15 @@ public static class Tranga
                 while(!running)
                     Thread.Sleep(10);
             }
-            Log.Debug($"Running: {runningJobs.Count} Waiting: {waitingJobs.Count} Due: {dueJobs.Count} of which \n" +
+            Log.Debug($"Running: {runningJobs.Count}\n" +
-                      $"{jobsWithoutDependencies.Count} without missing dependencies, of which\n" +
+                      $"{string.Join("\n", runningJobs.Select(s => "\t- " + s))}\n" +
+                      $"Waiting: {waitingJobs.Count} Due: {dueJobs.Count}\n" +
+                      $"{string.Join("\n", dueJobs.Select(s => "\t- " + s))}\n" +
+                      $"of which {jobsWithoutDependencies.Count} without missing dependencies, of which\n" +
                       $"\t{jobsWithoutDownloading.Count} without downloading\n" +
                       $"\t{jobsNotHeldBackByConnector.Count} not held back by Connector\n" +
-                      $"{startJobs.Count} were started.");
+                      $"{startJobs.Count} were started:\n" +
+                      $"{string.Join("\n", startJobs.Select(s => "\t- " + s))}");
 
             if (Log.IsDebugEnabled && dueJobs.Count < 1)
                 if(waitingJobs.MinBy(j => j.NextExecution) is { } nextJob)
@@ -272,13 +276,17 @@ public static class Tranga
     private static List<Job> MatchJobsRunningAndWaiting(Dictionary<string, Dictionary<JobType, List<Job>>> running,
         Dictionary<string, Dictionary<JobType, List<Job>>> waiting)
     {
+        Log.Debug($"Matching {running.Count} running Jobs to {waiting.Count} waiting Jobs. Busy Connectors: {string.Join(", ", running.Select(r => r.Key))}");
         DateTime start = DateTime.UtcNow;
         List<Job> ret = new();
+        //Foreach MangaConnector
         foreach ((string connector, Dictionary<JobType, List<Job>> jobTypeJobsWaiting) in waiting)
         {
+            //Check if MangaConnector has a Job running
             if (running.TryGetValue(connector, out Dictionary<JobType, List<Job>>? jobTypeJobsRunning))
-            {   //MangaConnector has running Jobs
+            {
-                //Match per JobType
+                //MangaConnector has running Jobs
+                //Match per JobType (MangaConnector can have 1 Job per Type running at the same time)
                 foreach ((JobType jobType, List<Job> jobsWaiting) in jobTypeJobsWaiting)
                 {
                     if(jobTypeJobsRunning.ContainsKey(jobType))
@@ -293,9 +301,13 @@ public static class Tranga
                 }
             }
             else
-            {   //MangaConnector has no running Jobs
+            {
+                //MangaConnector has no running Jobs
                 foreach ((JobType jobType, List<Job> jobsWaiting) in jobTypeJobsWaiting)
                 {
+                    if(ret.Any(j => j.JobType == jobType))
+                        //Already a job of type to be started
+                        continue;
                     if (jobType is not JobType.DownloadSingleChapterJob)
                         //If it is not a DownloadSingleChapterJob, just add the first
                         ret.Add(jobsWaiting.First());

API/TrangaSettings.cs

@@ -36,7 +36,7 @@ public static class TrangaSettings
     [JsonIgnore]
     public static string coverImageCache => Path.Join(workingDirectory, "imageCache");
     public static bool aprilFoolsMode { get; private set; } = true;
-    public static int startNewJobTimeoutMs { get; private set; } = 5000;
+    public static int startNewJobTimeoutMs { get; private set; } = 20000;
     [JsonIgnore]
     internal static readonly Dictionary<RequestType, int> DefaultRequestLimits = new ()
     {

Dockerfile

@@ -39,4 +39,4 @@ WORKDIR /publish
 COPY --chown=1000:1000 --from=build-env /publish .
 USER 0
 ENTRYPOINT ["dotnet", "/publish/API.dll"]
-CMD ["-f", "-c", "-l", "/usr/share/tranga-api/logs"]
+CMD [""]

README.md

@@ -84,17 +84,16 @@ Endpoints are documented in Swagger. Just spin up an instance, and go to `http:/
 
 ## Built With
 
-- .NET
 - ASP.NET
   - Entity Framework Core
 - [PostgreSQL](https://www.postgresql.org/about/licence/)
-- [Swagger](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/blob/master/LICENSE)
 - [Ngpsql](https://github.com/npgsql/npgsql/blob/main/LICENSE)
+- [Swagger](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/blob/master/LICENSE)
 - [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md)
+- [Sixlabors.ImageSharp](https://docs-v2.sixlabors.com/articles/imagesharp/index.html#license)
 - [PuppeteerSharp](https://github.com/hardkoded/puppeteer-sharp/blob/master/LICENSE)
 - [Html Agility Pack (HAP)](https://github.com/zzzprojects/html-agility-pack/blob/master/LICENSE)
 - [Soenneker.Utils.String.NeedlemanWunsch](https://github.com/soenneker/soenneker.utils.string.needlemanwunsch/blob/main/LICENSE)
-- [Sixlabors.ImageSharp](https://docs-v2.sixlabors.com/articles/imagesharp/index.html#license)
 - 💙 Blåhaj 🦈
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
@@ -126,13 +125,13 @@ access the folder. Permission conflicts with Komga and Kavita should thus be lim
 
 ### Bare-Metal
 
-While not supported/currently built, Tranga will also run Bare-Metal without issue.
+While not supported/currently built, Tranga should also run Bare-Metal without issue.
 
 Configuration-Files will be stored per OS:
 - Linux `/usr/share/tranga-api`
 - Windows `%appdata%/tranga-api`
 
-Downloads (default) are stored in - but this can be configured in `settings.json`:
+Downloads (default) are stored in - but this can be configured in `settings.json` (which will be generated on first after first launch):
 - Linux `/Manga`
 - Windows `%currentDirectory%/Downloads`
 
@@ -148,9 +147,10 @@ If you want to contribute, please feel free to fork and create a Pull-Request!
 General rules:
 - Strongly-type your variables. This improves readability.
 ```csharp
-var xyz = Object.GetSomething(); //Do not do this. What type is xyz?
+var xyz = Object.GetSomething(); //Do not do this. What type is xyz (without looking at Method returns etc.)?
 Manga[] zyx = Object.GetAnotherThing(); //I can now easily see that zyx is an Array.
 ```
+Tranga is using a code-first Entity-Framework Core approach. If you modify the db-table structure you need to create a migration.
 
 **A broad overview of where is what:**<br />
 
@@ -171,6 +171,10 @@ If you want to add a new Website-Connector: <br />
 in the constructor).
 4. In `Program.cs` add a new Object to the Array.
 
+### How to test locally
+
+In the Project root a `docker-compose.local.yaml` file will compile the code and create the container(s).
+
 <!-- LICENSE -->
 ## License
 

docker-compose.local.yaml

@@ -16,6 +16,11 @@ services:
     environment:
       - POSTGRES_HOST=tranga-pg
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
   tranga-pg:
     image: postgres:latest
     container_name: tranga-pg
@@ -30,3 +35,8 @@ services:
       retries: 5
       start_period: 80s
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"

docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   tranga-api:
-    image: glax/tranga-api:latest
+    image: glax/tranga-api:Server-V2
     container_name: tranga-api
     volumes:
       - ./Manga:/Manga
@@ -14,14 +14,24 @@ services:
     environment:
       - POSTGRES_HOST=tranga-pg
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
   tranga-website:
-    image: glax/tranga-website:latest
+    image: glax/tranga-website:Server-V2
     container_name: tranga-website
     ports:
       - "9555:80"
     depends_on: 
       - tranga-api
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"
   tranga-pg:
     image: postgres:latest
     container_name: tranga-pg
@@ -36,3 +46,8 @@ services:
       retries: 5
       start_period: 80s
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "5"