Bring CLI in line with new Methods

Added Method UpdateSettings to TaskManager (to export data after update)

Tranga-API/Program.cs

@@ -25,8 +25,14 @@ else
 TaskManager taskManager = new (settings, logger);
 
 var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
 builder.Services.AddControllers().AddNewtonsoftJson();
 var app = builder.Build();
+app.UseSwagger();
+app.UseSwaggerUI();
+app.UseSwagger();
+app.UseSwaggerUI();
 
 app.MapGet("/GetAvailableControllers", () =>  taskManager.GetAvailableConnectors());
 
@@ -99,24 +105,18 @@ app.MapPost("/Queue/Dequeue", (string taskType, string? connectorName, string? p
 
 app.MapGet("/Settings/Get", () => new Settings(taskManager.settings));
 
-app.MapPost("/Setting/Update", (string? downloadLocation, string? komgaUrl, string? komgaAuth) =>
-{
-    if(downloadLocation is not null)
-        taskManager.settings.downloadLocation = downloadLocation;
-    if(komgaUrl is not null && komgaAuth is not null)
-        taskManager.settings.komga = new Komga(komgaUrl, komgaAuth, logger);
-});
+app.MapPost("/Settings/Update", (string? downloadLocation, string? komgaUrl, string? komgaAuth) => taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth) );
 
 app.Run();
 
 class Settings
 {
-    public string downloadLocation;
-    public Komga? komga;
+    public string downloadLocation { get; }
+    public Komga? komga { get; }
 
     public Settings(TaskManager.SettingsData settings)
     {
         this.downloadLocation = settings.downloadLocation;
-        this.komga = komga;
+        this.komga = settings.komga;
     }
 }

Tranga-API/Tranga-API.csproj

@@ -21,6 +21,8 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
+      <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.6" />
+      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     </ItemGroup>
 
 </Project>

Tranga-CLI/Tranga_Cli.cs

@@ -41,7 +41,7 @@ public static class Tranga_Cli
         while(tmpPath is null)
             tmpPath = Console.ReadLine();
         if(tmpPath.Length > 0)
-            settings.downloadLocation = tmpPath;
+            settings.UpdateSettings(pDownloadLocation: tmpPath, null);
         
         Console.WriteLine($"Komga BaseURL [{settings.komga?.baseUrl}]:");
         string? tmpUrl = Console.ReadLine();
@@ -74,7 +74,7 @@ public static class Tranga_Cli
                 }
             } while (key != ConsoleKey.Enter);
             
-            settings.komga = new Komga(tmpUrl, tmpUser, tmpPass, logger);
+            settings.UpdateSettings(null, new Komga(tmpUrl, tmpUser, tmpPass, logger));
         }
         
         logger.WriteLine("Tranga_CLI", "Loaded.");

Tranga/Connectors/MangaDex.cs

@@ -63,7 +63,7 @@ public class MangaDex : Connector
                 {
                     JsonObject altTitleObject = (JsonObject)altTitleNode!;
                     string key = ((IDictionary<string, JsonNode?>)altTitleObject).Keys.ToArray()[0];
-                    altTitlesDict.Add(key, altTitleObject[key]!.GetValue<string>());
+                    altTitlesDict.TryAdd(key, altTitleObject[key]!.GetValue<string>());
                 }
 
                 JsonArray tagsObject = attributes["tags"]!.AsArray();

Tranga/TaskManager.cs

@@ -43,6 +43,15 @@ public class TaskManager
         taskChecker.Start();
     }
 
+    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth)
+    {
+        Komga? komga = null;
+        if (komgaUrl is not null && komgaAuth is not null)
+            komga = new Komga(komgaUrl, komgaAuth, null);
+        settings.UpdateSettings(downloadLocation, komga);
+        ExportData();
+    }
+
     public TaskManager(SettingsData settings, Logger? logger = null)
     {
         this.logger = logger;
@@ -154,7 +163,7 @@ public class TaskManager
                                              trangaTask.publication?.downloadUrl == publication?.downloadUrl))
             {
                 if(task != TrangaTask.Task.UpdatePublications)
-                    _chapterCollection.Add((Publication)publication!, new List<Chapter>());
+                    _chapterCollection.TryAdd((Publication)publication!, new List<Chapter>());
                 _allTasks.Add(newTask);
             }
         }
@@ -231,8 +240,11 @@ public class TaskManager
     public Publication[] GetPublicationsFromConnector(Connector connector, string? title = null)
     {
         Publication[] ret = connector.GetPublications(title ?? "");
-        foreach(Publication publication in ret)
+        foreach (Publication publication in ret)
+        {
+            if(!_chapterCollection.Any(pub => pub.Key.sortName == publication.sortName))
                 this._chapterCollection.TryAdd(publication, new List<Chapter>());
+        }
         return ret;
     }
     
@@ -308,9 +320,9 @@ public class TaskManager
 
     public class SettingsData
     {
-        public string downloadLocation { get; set; }
+        public string downloadLocation { get; private set; }
         public string settingsFilePath { get; }
-        public Komga? komga { get; set; }
+        public Komga? komga { get; private set; }
         public HashSet<TrangaTask> allTasks { get; }
 
         public SettingsData(string downloadLocation, string? settingsFilePath, Komga? komga, HashSet<TrangaTask> allTasks)
@@ -322,5 +334,13 @@ public class TaskManager
             this.komga = komga;
             this.allTasks = allTasks;
         }
+
+        public void UpdateSettings(string? pDownloadLocation, Komga? pKomga)
+        {
+            if(pDownloadLocation is not null)
+                this.downloadLocation = pDownloadLocation;
+            if(pKomga is not null)
+                this.komga = pKomga;
+        }
     }
 }