Remove APi for testing

API: Get Task Queue
API: Task Enqueue
API: Task Dequeue

Tranga-API/Dockerfile

@@ -1,20 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
-WORKDIR /app
-EXPOSE 80
-EXPOSE 443
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-WORKDIR /src
-COPY ["Tranga-API/Tranga-API.csproj", "Tranga-API/"]
-RUN dotnet restore "Tranga-API/Tranga-API.csproj"
-COPY . .
-WORKDIR "/src/Tranga-API"
-RUN dotnet build "Tranga-API.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "Tranga-API.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Tranga-API.dll"]

Tranga-API/Program.cs

@@ -1,81 +0,0 @@
-using System.Text.Json;
-using Tranga;
-
-TaskManager taskManager = new (Directory.GetCurrentDirectory());
-var builder = WebApplication.CreateBuilder(args);
-var app = builder.Build();
-
-app.MapGet("/GetConnectors", () => JsonSerializer.Serialize(taskManager.GetAvailableConnectors().Values.ToArray()));
-
-app.MapGet("/GetPublications", (string connectorName, string? publicationName) =>
-{
-    Connector connector = taskManager.GetConnector(connectorName);
-
-    Publication[] publications;
-    if (publicationName is not null)
-        publications = connector.GetPublications(publicationName);
-    else
-        publications = connector.GetPublications();
-
-    return JsonSerializer.Serialize(publications);
-});
-
-app.MapGet("/ListTasks", () => JsonSerializer.Serialize(taskManager.GetAllTasks()));
-
-app.MapGet("/CreateTask",
-    (TrangaTask.Task task, string? connectorName, string? publicationName, TimeSpan reoccurrence, string? language) =>
-    {
-        switch (task)
-        {
-            case TrangaTask.Task.UpdateKomgaLibrary:
-                taskManager.AddTask(TrangaTask.Task.UpdateKomgaLibrary, null, null, reoccurrence);
-                break;
-            case TrangaTask.Task.DownloadNewChapters:
-                try
-                {
-                    Connector connector = taskManager.GetConnector(connectorName);
-                    
-                    Publication[] publications;
-                    if (publicationName is not null)
-                        publications = connector.GetPublications(publicationName);
-                    else
-                        publications = connector.GetPublications();
-                    
-                    Publication? publication = publications.FirstOrDefault(pub => pub.downloadUrl == publicationName);
-                    if (publication is null)
-                        JsonSerializer.Serialize($"Publication {publicationName} is unknown.");
-                    taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication, reoccurrence, language ?? "");
-                    return JsonSerializer.Serialize("Success");
-                }
-                catch (Exception e)
-                {
-                    return JsonSerializer.Serialize(e.Message);
-                }
-
-            default: return JsonSerializer.Serialize("Not Implemented");
-        }
-
-        return JsonSerializer.Serialize("Not Implemented");
-    });
-
-app.MapGet("/RemoveTask", (TrangaTask.Task task, string? connectorName, string? publicationName) =>
-{
-    switch (task)
-    {
-        case TrangaTask.Task.UpdateKomgaLibrary:
-            taskManager.DeleteTask(TrangaTask.Task.UpdateKomgaLibrary, null, null);
-            return JsonSerializer.Serialize("Success");
-        case TrangaTask.Task.DownloadNewChapters:
-            Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.downloadUrl == publicationName);
-            if (publication is null)
-                JsonSerializer.Serialize($"Publication {publicationName} is unknown.");
-            
-            taskManager.DeleteTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication);
-            
-            return JsonSerializer.Serialize("Success");
-        
-        default: return JsonSerializer.Serialize("Not Implemented");
-    }
-});
-
-app.Run();

Tranga-API/Properties/launchSettings.json

@@ -1,37 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:14826",
-      "sslPort": 44333
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5119",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7070;http://localhost:5119",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

Tranga-API/Tranga-API.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <RootNamespace>Tranga_API</RootNamespace>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Content Include="..\.dockerignore">
-        <Link>.dockerignore</Link>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Tranga\Tranga.csproj" />
-    </ItemGroup>
-
-</Project>

Tranga-API/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

Tranga-API/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

Tranga-API/tasks.json

@@ -1 +0,0 @@
-[{"reoccurrence":"00:00:00","lastExecuted":"2023-05-19T17:34:40.5349215+02:00","connectorName":"MangaDex","task":0,"publication":{"sortName":null,"description":null,"tags":null,"posterUrl":null,"year":null,"originalLanguage":null,"status":null,"folderName":null,"downloadUrl":null},"language":"en"}]

Tranga.sln

@@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.c
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-CLI", "Tranga-CLI\Tranga-CLI.csproj", "{4899E3B2-B259-479A-B43E-042D043E9501}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-API", "Tranga-API\Tranga-API.csproj", "{6284C936-4E90-486B-BC46-0AFAD85AD8EE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
 EndProject
 Global
@@ -22,10 +20,6 @@ Global
 		{4899E3B2-B259-479A-B43E-042D043E9501}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.ActiveCfg = Release|Any CPU

Tranga/Connectors/MangaDex.cs

@@ -117,6 +117,7 @@ public class MangaDex : Connector
                     year,
                     originalLanguage,
                     status,
+                    manga["id"]!.GetValue<string>(),
                     manga["id"]!.GetValue<string>()
                 );
                 publications.Add(pub); //Add Publication (Manga) to result

Tranga/Publication.cs

@@ -20,8 +20,10 @@ public readonly struct Publication
     public string status { get; }
     public string folderName { get; }
     public string downloadUrl { get; }
+    
+    public string internalId { get; }
 
-    public Publication(string sortName, string? description, string[,] altTitles, string[] tags, string? posterUrl, string[,]? links, int? year, string? originalLanguage, string status, string downloadUrl)
+    public Publication(string sortName, string? description, string[,] altTitles, string[] tags, string? posterUrl, string[,]? links, int? year, string? originalLanguage, string status, string downloadUrl, string internalId)
     {
         this.sortName = sortName;
         this.description = description;
@@ -34,6 +36,7 @@ public readonly struct Publication
         this.status = status;
         this.downloadUrl = downloadUrl;
         this.folderName = string.Concat(sortName.Split(Path.GetInvalidPathChars().Concat(Path.GetInvalidFileNameChars()).ToArray()));
+        this.internalId = internalId;
     }
     
     /// <returns>Serialized JSON String for series.json</returns>

Tranga/TaskManager.cs

@@ -17,7 +17,6 @@ public class TaskManager
     private readonly Dictionary<Connector, List<TrangaTask>> _taskQueue = new();
     public SettingsData settings { get; }
     private Logger? logger { get; }
-    
     public Komga? komga { get; }
 
     /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
@@ -125,8 +124,6 @@ public class TaskManager
         string language = "")
     {
         logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {task} {connectorName} {publication?.sortName}");
-        if (task != TrangaTask.Task.UpdateKomgaLibrary && connectorName is null)
-            throw new ArgumentException($"connectorName can not be null for task {task}");
 
         TrangaTask newTask;
         if (task == TrangaTask.Task.UpdateKomgaLibrary)
@@ -142,6 +139,9 @@ public class TaskManager
         }
         else
         {
+            if(connectorName is null)
+                throw new ArgumentException($"connectorName can not be null for task {task}");
+            
             //Get appropriate Connector from available Connectors for TrangaTask
             Connector? connector = _connectors.FirstOrDefault(c => c.name == connectorName);
             if (connector is null)