JsonIgnore

And better working directory stuff

Tranga-API/Program.cs

@@ -1,11 +1,11 @@
-
 using Logging;
 using Tranga;
 
-string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Tranga-API");
+string applicationFolderPath =
+    Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga-API");
 string logsFolderPath = Path.Join(applicationFolderPath, "logs");
 string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
-string settingsFilePath = Path.Join(applicationFolderPath, "data.json");
+string settingsFilePath = Path.Join(applicationFolderPath, "settings.json");
 
 Directory.CreateDirectory(applicationFolderPath);
 Directory.CreateDirectory(logsFolderPath);
@@ -16,17 +16,23 @@ Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
 Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
         
 logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
-TaskManager.SettingsData settings;
+TrangaSettings settings;
 if (File.Exists(settingsFilePath))
-    settings = TaskManager.LoadData(settingsFilePath);
+    settings = TrangaSettings.LoadSettings(settingsFilePath);
 else
-    settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), settingsFilePath, null, new HashSet<TrangaTask>());
+    settings = new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, null);
 
 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());
 
@@ -52,7 +58,7 @@ app.MapPost("/Tasks/Create", (string taskType, string? connectorName, string? pu
     taskManager.AddTask(task, connectorName, publication, TimeSpan.Parse(reoccurrenceTime), language??"");
 });
 
-app.MapPost("/Tasks/Delete", (string taskType, string? connectorName, string? publicationId) =>
+app.MapDelete("/Tasks/Delete", (string taskType, string? connectorName, string? publicationId) =>
 {
     Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == publicationId);
     TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
@@ -87,7 +93,7 @@ app.MapPost("/Queue/Enqueue", (string taskType, string? connectorName, string? p
     taskManager.AddTaskToQueue(task);
 });
 
-app.MapPost("/Queue/Dequeue", (string taskType, string? connectorName, string? publicationId) =>
+app.MapDelete("/Queue/Dequeue", (string taskType, string? connectorName, string? publicationId) =>
 {
     TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
     TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
@@ -97,26 +103,8 @@ app.MapPost("/Queue/Dequeue", (string taskType, string? connectorName, string? p
     taskManager.RemoveTaskFromQueue(task);
 });
 
-app.MapGet("/Settings/Get", () => new Settings(taskManager.settings));
+app.MapGet("/Settings/Get", () => 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 Settings(TaskManager.SettingsData settings)
-    {
-        this.downloadLocation = settings.downloadLocation;
-        this.komga = 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

@@ -14,10 +14,10 @@ public static class Tranga_Cli
 {
     public static void Main(string[] args)
     {
-        string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Tranga");
+        string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga");
         string logsFolderPath = Path.Join(applicationFolderPath, "logs");
         string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
-        string settingsFilePath = Path.Join(applicationFolderPath, "data.json");
+        string settingsFilePath = Path.Join(applicationFolderPath, "settings.json");
 
         Directory.CreateDirectory(applicationFolderPath);
         Directory.CreateDirectory(logsFolderPath);
@@ -28,11 +28,11 @@ public static class Tranga_Cli
         Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
         
         logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
-        TaskManager.SettingsData settings;
+        TrangaSettings settings;
         if (File.Exists(settingsFilePath))
-            settings = TaskManager.LoadData(settingsFilePath);
+            settings = TrangaSettings.LoadSettings(settingsFilePath);
         else
-            settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), settingsFilePath, null, new HashSet<TrangaTask>());
+            settings = new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, null);
 
             
         logger.WriteLine("Tranga_CLI", "User Input");
@@ -40,7 +40,7 @@ public static class Tranga_Cli
         string? tmpPath = Console.ReadLine();
         while(tmpPath is null)
             tmpPath = Console.ReadLine();
-        if(tmpPath.Length > 0)
+        if (tmpPath.Length > 0)
             settings.downloadLocation = tmpPath;
         
         Console.WriteLine($"Komga BaseURL [{settings.komga?.baseUrl}]:");
@@ -81,7 +81,7 @@ public static class Tranga_Cli
         TaskMode(settings, logger);
     }
 
-    private static void TaskMode(TaskManager.SettingsData settings, Logger logger)
+    private static void TaskMode(TrangaSettings settings, Logger logger)
     {
         TaskManager taskManager = new (settings, logger);
         ConsoleKey selection = ConsoleKey.EraseEndOfFile;
@@ -143,7 +143,7 @@ public static class Tranga_Cli
                         TailLog(logger);
                         Console.ReadKey();
                         break;
-                    case ConsoleKey.M:
+                    case ConsoleKey.G:
                         RemoveTaskFromQueue(taskManager, logger);
                         Console.WriteLine("Press any key.");
                         Console.ReadKey();
@@ -153,6 +153,11 @@ public static class Tranga_Cli
                         Console.WriteLine("Press any key.");
                         Console.ReadKey();
                         break;
+                    case ConsoleKey.M:
+                        AddMangaTaskToQueue(taskManager, logger);
+                        Console.WriteLine("Press any key.");
+                        Console.ReadKey();
+                        break; 
                 }
                 PrintMenu(taskManager, taskManager.settings.downloadLocation, logger);
             }
@@ -186,8 +191,8 @@ public static class Tranga_Cli
         Console.WriteLine();
         Console.WriteLine($"{"C: Create Task",-30}{"L: List tasks",-30}{"B: Enqueue Task", -30}");
         Console.WriteLine($"{"D: Delete Task",-30}{"S: Search Tasks", -30}{"K: List Task Queue", -30}");
-        Console.WriteLine($"{"E: Execute Task now",-30}{"R: List Running Tasks", -30}{"M: Remove Task from Queue", -30}");
-        Console.WriteLine();
+        Console.WriteLine($"{"E: Execute Task now",-30}{"R: List Running Tasks", -30}{"G: Remove Task from Queue", -30}");
+        Console.WriteLine($"{"M: New Download Manga Task",-30}{"", -30}{"", -30}");
         Console.WriteLine($"{"",-30}{"F: Show Log",-30}{"Q: Exit",-30}");
     }
 
@@ -251,6 +256,25 @@ public static class Tranga_Cli
         return null;
     }
     
+    private static void AddMangaTaskToQueue(TaskManager taskManager, Logger logger)
+    {
+        Console.Clear();
+        logger.WriteLine("Tranga_CLI", "Menu: Add Manga Download to queue");
+        
+        Connector? connector = SelectConnector(taskManager.settings.downloadLocation, taskManager.GetAvailableConnectors().Values.ToArray(), logger);
+        if (connector is null)
+            return;
+                    
+        Publication? publication = SelectPublication(taskManager, connector!, logger);
+        if (publication is null)
+            return;
+        
+        TimeSpan reoccurrence = SelectReoccurrence(logger);
+        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
+        TrangaTask newTask = taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connector?.name, publication, reoccurrence, "en");
+        Console.WriteLine(newTask);
+    }
+
     private static void AddTaskToQueue(TaskManager taskManager, Logger logger)
     {
         Console.Clear();
@@ -300,7 +324,7 @@ public static class Tranga_Cli
         }
     }
 
-    private static void CreateTask(TaskManager taskManager, TaskManager.SettingsData settings, Logger logger)
+    private static void CreateTask(TaskManager taskManager, TrangaSettings settings, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Creating Task");
         TrangaTask.Task? tmpTask = SelectTaskType(logger);
@@ -319,7 +343,7 @@ public static class Tranga_Cli
         Publication? publication = null;
         if (task != TrangaTask.Task.UpdatePublications && task != TrangaTask.Task.UpdateKomgaLibrary)
         {
-            publication = SelectPublication(connector!, logger);
+            publication = SelectPublication(taskManager, connector!, logger);
             if (publication is null)
                 return;
         }
@@ -443,7 +467,7 @@ public static class Tranga_Cli
         return null;
     }
 
-    private static Publication? SelectPublication(Connector connector, Logger logger)
+    private static Publication? SelectPublication(TaskManager taskManager, Connector connector, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Select Publication");
         
@@ -452,7 +476,7 @@ public static class Tranga_Cli
         Console.WriteLine("Publication search query (leave empty for all):");
         string? query = Console.ReadLine();
 
-        Publication[] publications = connector.GetPublications(query ?? "");
+        Publication[] publications = taskManager.GetPublicationsFromConnector(connector, query ?? "");
         
         int pIndex = 0;
         Console.WriteLine("Publications:");

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();
@@ -83,7 +83,6 @@ public class MangaDex : Connector
                 }
 
                 Dictionary<string, string> linksDict = new();
-                string[,]? links = null;
                 if (attributes.ContainsKey("links") && attributes["links"] is not null)
                 {
                     JsonObject linksObject = attributes["links"]!.AsObject();
@@ -214,7 +213,10 @@ public class MangaDex : Connector
         DirectoryInfo dirInfo = new (publicationFolder);
         foreach(FileInfo fileInfo in dirInfo.EnumerateFiles())
             if (fileInfo.Name.Contains("cover."))
+            {
+                logger?.WriteLine(this.GetType().ToString(), $"Cover exists {publication.sortName}");
                 return;
+            }
 
         //Request information where to download Cover
         DownloadClient.RequestResult requestResult =

Tranga/Publication.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Text;
+using Newtonsoft.Json;
 
 namespace Tranga;
 
@@ -9,23 +10,18 @@ public readonly struct Publication
 {
     public string sortName { get; }
     // ReSharper disable UnusedAutoPropertyAccessor.Global we need it, trust
-    [JsonIgnore]public Dictionary<string,string> altTitles { get; }
+    public Dictionary<string,string> altTitles { get; }
     // ReSharper disable trice MemberCanBePrivate.Global, trust
     public string? description { get; }
     public string[] tags { get; }
     public string? posterUrl { get; }
-    [JsonIgnore]public Dictionary<string,string> links { get; }
+    public Dictionary<string,string> links { get; }
     public int? year { get; }
     public string? originalLanguage { get; }
     public string status { get; }
     public string folderName { get; }
     public string downloadUrl { get; }
-    public string internalId { get; }
-
-    public readonly struct ValueTuple
-    {
-        
-    }
+    [JsonIgnore]public string internalId { get; }
 
     public Publication(string sortName, string? description, Dictionary<string,string> altTitles, string[] tags, string? posterUrl, Dictionary<string,string>? links, int? year, string? originalLanguage, string status, string downloadUrl)
     {
@@ -40,7 +36,8 @@ public readonly struct Publication
         this.status = status;
         this.downloadUrl = downloadUrl;
         this.folderName = string.Concat(sortName.Split(Path.GetInvalidPathChars().Concat(Path.GetInvalidFileNameChars()).ToArray()));
-        this.internalId = Guid.NewGuid().ToString();
+        string onlyLowerAscii = this.sortName.ToLower().Where(Char.IsAscii).ToString()!;
+        this.internalId = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{onlyLowerAscii}{this.year}"));
     }
     
     /// <returns>Serialized JSON String for series.json</returns>

Tranga/TaskManager.cs

@@ -11,28 +11,30 @@ namespace Tranga;
 public class TaskManager
 {
     public Dictionary<Publication, List<Chapter>> _chapterCollection = new();
-    private readonly HashSet<TrangaTask> _allTasks;
+    private HashSet<TrangaTask> _allTasks;
     private bool _continueRunning = true;
     private readonly Connector[] _connectors;
     private readonly Dictionary<Connector, List<TrangaTask>> _taskQueue = new();
-    public SettingsData settings { get; }
+    public TrangaSettings settings { get; }
     private Logger? logger { get; }
-    public Komga? komga { get; }
+    public Komga? komga => settings.komga;
 
     /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
-    /// <param name="settingsFilePath">Path to the settings file (data.json)</param>
+    /// <param name="workingDirectory">Path to the working directory</param>
     /// <param name="komgaBaseUrl">The Url of the Komga-instance that you want to update</param>
     /// <param name="komgaUsername">The Komga username</param>
     /// <param name="komgaPassword">The Komga password</param>
     /// <param name="logger"></param>
-    public TaskManager(string downloadFolderPath, string? settingsFilePath = null, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
+    public TaskManager(string downloadFolderPath, string? workingDirectory = null, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
     {
         this.logger = logger;
         _allTasks = new HashSet<TrangaTask>();
-        if (komgaBaseUrl != null && komgaUsername != null && komgaPassword != null)
-            this.komga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
 
-        this.settings = new SettingsData(downloadFolderPath, settingsFilePath, this.komga, this._allTasks);
+        Komga? newKomga = null;
+        if (komgaBaseUrl != null && komgaUsername != null && komgaPassword != null)
+            newKomga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
+        
+        this.settings = new TrangaSettings(downloadFolderPath, workingDirectory, newKomga);
         ExportData();
         
         this._connectors = new Connector[]{ new MangaDex(downloadFolderPath, logger) };
@@ -43,17 +45,27 @@ public class TaskManager
         taskChecker.Start();
     }
 
-    public TaskManager(SettingsData settings, Logger? logger = null)
+    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.downloadLocation = downloadLocation ?? settings.downloadLocation;
+        settings.komga = komga ?? komga;
+        ExportData();
+    }
+
+    public TaskManager(TrangaSettings settings, Logger? logger = null)
     {
         this.logger = logger;
         this._connectors = new Connector[]{ new MangaDex(settings.downloadLocation, logger) };
-        this.settings = settings;
-        ExportData();
-        
         foreach(Connector cConnector in this._connectors)
             _taskQueue.Add(cConnector, new List<TrangaTask>());
-        this.komga = settings.komga;
-        _allTasks = settings.allTasks;
+        _allTasks = new HashSet<TrangaTask>();
+        
+        this.settings = settings;
+        ImportData();
+        ExportData();
         Thread taskChecker = new(TaskCheckerThread);
         taskChecker.Start();
     }
@@ -154,7 +166,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 +243,11 @@ public class TaskManager
     public Publication[] GetPublicationsFromConnector(Connector connector, string? title = null)
     {
         Publication[] ret = connector.GetPublications(title ?? "");
-        foreach(Publication publication in ret)
-            this._chapterCollection.TryAdd(publication, new List<Chapter>());
+        foreach (Publication publication in ret)
+        {
+            if(!_chapterCollection.Any(pub => pub.Key.sortName == publication.sortName))
+                this._chapterCollection.TryAdd(publication, new List<Chapter>());
+        }
         return ret;
     }
     
@@ -277,19 +292,25 @@ public class TaskManager
         Environment.Exit(0);
     }
 
-    /// <summary>
-    /// Loads stored data (settings, tasks) from file
-    /// </summary>
-    /// <param name="importFilePath">working directory, filename has to be data.json</param>
-    public static SettingsData LoadData(string importFilePath)
+    private void ImportData()
     {
-        if (!File.Exists(importFilePath))
-            return new SettingsData(Directory.GetCurrentDirectory(), null, null, new HashSet<TrangaTask>());
+        logger?.WriteLine(this.GetType().ToString(), "Importing Data");
+        string buffer;
+        if (File.Exists(settings.tasksFilePath))
+        {
+            logger?.WriteLine(this.GetType().ToString(), $"Importing tasks from {settings.tasksFilePath}");
+            buffer = File.ReadAllText(settings.tasksFilePath);
+            this._allTasks = JsonConvert.DeserializeObject<HashSet<TrangaTask>>(buffer)!;
+        }
 
-        string toRead = File.ReadAllText(importFilePath);
-        SettingsData data = JsonConvert.DeserializeObject<SettingsData>(toRead)!;
-
-        return data;
+        if (File.Exists(settings.knownPublicationsPath))
+        {
+            logger?.WriteLine(this.GetType().ToString(), $"Importing known publications from {settings.knownPublicationsPath}");
+            buffer = File.ReadAllText(settings.knownPublicationsPath);
+            Publication[] publications = JsonConvert.DeserializeObject<Publication[]>(buffer)!;
+            foreach (Publication publication in publications)
+                this._chapterCollection.TryAdd(publication, new List<Chapter>());
+        }
     }
 
     /// <summary>
@@ -297,30 +318,15 @@ public class TaskManager
     /// </summary>
     private void ExportData()
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Exporting data to {settings.settingsFilePath}");
+        logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}");
+        File.WriteAllText(settings.settingsFilePath, JsonConvert.SerializeObject(settings));
         
+        logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}");
+        File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks));
         
-
-        string serializedData = JsonConvert.SerializeObject(settings);
-
-        File.WriteAllText(settings.settingsFilePath, serializedData);
+        logger?.WriteLine(this.GetType().ToString(), $"Exporting known publications to {settings.knownPublicationsPath}");
+        File.WriteAllText(settings.knownPublicationsPath, JsonConvert.SerializeObject(this._chapterCollection.Keys.ToArray()));
     }
 
-    public class SettingsData
-    {
-        public string downloadLocation { get; set; }
-        public string settingsFilePath { get; }
-        public Komga? komga { get; set; }
-        public HashSet<TrangaTask> allTasks { get; }
     
-        public SettingsData(string downloadLocation, string? settingsFilePath, Komga? komga, HashSet<TrangaTask> allTasks)
-        {
-            this.settingsFilePath = settingsFilePath ??
-                                    Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                                        "Tranga", "data.json");
-            this.downloadLocation = downloadLocation;
-            this.komga = komga;
-            this.allTasks = allTasks;
-        }
-    }
 }

Tranga/TrangaSettings.cs

@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+
+namespace Tranga;
+
+public class TrangaSettings
+{
+    public string downloadLocation { get; set; }
+    public string workingDirectory { get; set; }
+    [JsonIgnore]public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
+    [JsonIgnore]public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
+    [JsonIgnore]public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
+    public Komga? komga { get; set; }
+
+    public TrangaSettings(string downloadLocation, string workingDirectory, Komga? komga)
+    {
+        this.workingDirectory = workingDirectory;
+        this.downloadLocation = downloadLocation;
+        this.komga = komga;
+    }
+
+    public static TrangaSettings LoadSettings(string importFilePath)
+    {
+        if (!File.Exists(importFilePath))
+            return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory(), null);
+
+        string toRead = File.ReadAllText(importFilePath);
+        TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead)!;
+
+        return settings;
+    }
+}