Merge pull request #163 from C9Glax/cuttingedge

Connector Bugs, AprilFools Mode

.github/workflows/docker-image-dev.yml

@@ -0,0 +1,45 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "dev" ]
+  workflow_dispatch:
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # https://github.com/docker/setup-qemu-action#usage
+      - name: Set up QEMU
+        uses: docker/[email protected]
+
+      # https://github.com/marketplace/actions/docker-setup-buildx
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/[email protected]
+
+      # https://github.com/docker/login-action#docker-hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # https://github.com/docker/build-push-action#multi-platform-image
+      - name: Build and push API
+        uses: docker/[email protected]
+        with:
+          context: ./
+          file: ./Dockerfile
+          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
+          platforms: linux/amd64
+          pull: true
+          push: true
+          tags: |
+            glax/tranga-api:dev

CLI/Program.cs

@@ -44,8 +44,8 @@ public override int Execute([NotNull] CommandContext context, [NotNull] Settings
         if(settings.fileLogger is true)
             enabledLoggers.Add(Logger.LoggerType.FileLogger);
 
-        string? logFilePath = settings.fileLoggerPath ?? "";
-        Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFilePath);
+        string? logFolderPath = settings.fileLoggerPath ?? "";
+        Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFolderPath);
 
         TrangaSettings? trangaSettings = null;
 

Logging/Logger.cs

@@ -20,17 +20,17 @@ public enum LoggerType
     private readonly FormattedConsoleLogger? _formattedConsoleLogger;
     private readonly MemoryLogger _memoryLogger;
 
-    public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFilePath)
+    public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFolderPath)
     {
         this.Encoding = encoding ?? Encoding.UTF8;
-        if(enabledLoggers.Contains(LoggerType.FileLogger) && (logFilePath is null || logFilePath == ""))
+        DateTime now = DateTime.Now;
+        if(enabledLoggers.Contains(LoggerType.FileLogger) && (logFolderPath is null || logFolderPath == ""))
         {
-            DateTime now = DateTime.Now;
-            logFilePath = Path.Join(LogDirectoryPath,
+            string filePath = Path.Join(LogDirectoryPath,
                 $"{now.ToShortDateString()}_{now.Hour}-{now.Minute}-{now.Second}.log");
-            _fileLogger = new FileLogger(logFilePath, encoding);
-        }else if (enabledLoggers.Contains(LoggerType.FileLogger) && logFilePath is not null)
-            _fileLogger = new FileLogger(logFilePath, encoding);
+            _fileLogger = new FileLogger(filePath, encoding);
+        }else if (enabledLoggers.Contains(LoggerType.FileLogger) && logFolderPath is not null)
+            _fileLogger = new FileLogger(Path.Join(logFolderPath, $"{now.ToShortDateString()}_{now.Hour}-{now.Minute}-{now.Second}.log") , encoding);
 
 
         if (enabledLoggers.Contains(LoggerType.ConsoleLogger) && stdOut is not null)
@@ -43,6 +43,7 @@ public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encodin
             throw new ArgumentException($"stdOut can not be null for LoggerType {LoggerType.ConsoleLogger}");
         }
         _memoryLogger = new MemoryLogger(encoding);
+        WriteLine(GetType().ToString(), $"Logfile: {logFilePath}");
     }
 
     public void WriteLine(string caller, string? value)

Tranga/Jobs/JobBoss.cs

@@ -164,7 +164,7 @@ private void LoadJobsList(HashSet<MangaConnector> connectors)
         }
 
         HashSet<string> coverFileNames = cachedPublications.Select(manga => manga.coverFileNameInCache!).ToHashSet();
-        foreach (string fileName in Directory.GetFiles(settings.coverImageCache))
+        foreach (string fileName in Directory.GetFiles(settings.coverImageCache)) //Cleanup Unused Covers
         {
             if(!coverFileNames.Any(existingManga => fileName.Contains(existingManga)))
                 File.Delete(fileName);

Tranga/MangaConnectors/ChromiumDownloadClient.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using HtmlAgilityPack;
 using PuppeteerSharp;
+using PuppeteerSharp.Input;
 
 namespace Tranga.MangaConnectors;
 
@@ -81,7 +82,7 @@ protected override RequestResult MakeRequestInternal(string url, string? referre
         {
             if (content.Contains("text/html"))
             {
-                if(clickButton is not null)
+                if (clickButton is not null && page.QuerySelectorAsync(clickButton).Result is not null)
                     page.ClickAsync(clickButton).Wait();
                 string htmlString = page.GetContentAsync().Result;
                 stream = new MemoryStream(Encoding.Default.GetBytes(htmlString));

Tranga/MangaConnectors/MangaConnector.cs

@@ -237,7 +237,7 @@ protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveAr
             return HttpStatusCode.Created;
 
         //Create a temporary folder to store images
-        string tempFolder = Directory.CreateTempSubdirectory().FullName;
+        string tempFolder = Directory.CreateTempSubdirectory("trangatemp").FullName;
 
         int chapter = 0;
         //Download all Images to temporary Folder
@@ -260,8 +260,10 @@ protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveAr
             progressToken?.Increment();
         }
 
-        if(comicInfoPath is not null)
+        if(comicInfoPath is not null){
             File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml"));
+            File.Delete(comicInfoPath); //Delete tmp-file
+        }
 
         Log($"Creating archive {saveArchiveFilePath}");
         //ZIP-it and ship-it