Tranga-API/Program.cs

@@ -5,7 +5,7 @@ using Tranga;
 string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "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, "settings.json");
+string settingsFilePath = Path.Join(applicationFolderPath, "data.json");
 
 Directory.CreateDirectory(applicationFolderPath);
 Directory.CreateDirectory(logsFolderPath);
@@ -16,11 +16,11 @@ Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
 Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
         
 logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
-TrangaSettings settings;
+TaskManager.SettingsData settings;
 if (File.Exists(settingsFilePath))
-    settings = TrangaSettings.LoadSettings(settingsFilePath);
+    settings = TaskManager.LoadData(settingsFilePath);
 else
-    settings = new TrangaSettings(Directory.GetCurrentDirectory(), settingsFilePath, null);
+    settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), settingsFilePath, null, new HashSet<TrangaTask>());
 
 TaskManager taskManager = new (settings, logger);
 
@@ -114,7 +114,7 @@ class Settings
     public string downloadLocation { get; }
     public Komga? komga { get; }
 
-    public Settings(TrangaSettings settings)
+    public Settings(TaskManager.SettingsData settings)
     {
         this.downloadLocation = settings.downloadLocation;
         this.komga = settings.komga;

Tranga-CLI/Tranga_Cli.cs

@@ -17,7 +17,7 @@ public static class Tranga_Cli
         string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "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, "settings.json");
+        string settingsFilePath = Path.Join(applicationFolderPath, "data.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.");
-        TrangaSettings settings;
+        TaskManager.SettingsData settings;
         if (File.Exists(settingsFilePath))
-            settings = TrangaSettings.LoadSettings(settingsFilePath);
+            settings = TaskManager.LoadData(settingsFilePath);
         else
-            settings = new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, null);
+            settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), settingsFilePath, null, new HashSet<TrangaTask>());
 
             
         logger.WriteLine("Tranga_CLI", "User Input");
@@ -40,8 +40,8 @@ public static class Tranga_Cli
         string? tmpPath = Console.ReadLine();
         while(tmpPath is null)
             tmpPath = Console.ReadLine();
-        if (tmpPath.Length > 0)
-            settings.downloadLocation = tmpPath;
+        if(tmpPath.Length > 0)
+            settings.UpdateSettings(pDownloadLocation: tmpPath, null);
         
         Console.WriteLine($"Komga BaseURL [{settings.komga?.baseUrl}]:");
         string? tmpUrl = Console.ReadLine();
@@ -74,14 +74,14 @@ 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.");
         TaskMode(settings, logger);
     }
 
-    private static void TaskMode(TrangaSettings settings, Logger logger)
+    private static void TaskMode(TaskManager.SettingsData 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.G:
+                    case ConsoleKey.M:
                         RemoveTaskFromQueue(taskManager, logger);
                         Console.WriteLine("Press any key.");
                         Console.ReadKey();
@@ -153,11 +153,6 @@ 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);
             }
@@ -191,8 +186,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}{"G: Remove Task from Queue", -30}");
-        Console.WriteLine($"{"M: New Download Manga Task",-30}{"", -30}{"", -30}");
+        Console.WriteLine($"{"E: Execute Task now",-30}{"R: List Running Tasks", -30}{"M: Remove Task from Queue", -30}");
+        Console.WriteLine();
         Console.WriteLine($"{"",-30}{"F: Show Log",-30}{"Q: Exit",-30}");
     }
 
@@ -255,25 +250,6 @@ 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)
     {
@@ -324,7 +300,7 @@ public static class Tranga_Cli
         }
     }
 
-    private static void CreateTask(TaskManager taskManager, TrangaSettings settings, Logger logger)
+    private static void CreateTask(TaskManager taskManager, TaskManager.SettingsData settings, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Creating Task");
         TrangaTask.Task? tmpTask = SelectTaskType(logger);
@@ -343,7 +319,7 @@ public static class Tranga_Cli
         Publication? publication = null;
         if (task != TrangaTask.Task.UpdatePublications && task != TrangaTask.Task.UpdateKomgaLibrary)
         {
-            publication = SelectPublication(taskManager, connector!, logger);
+            publication = SelectPublication(connector!, logger);
             if (publication is null)
                 return;
         }
@@ -467,7 +443,7 @@ public static class Tranga_Cli
         return null;
     }
 
-    private static Publication? SelectPublication(TaskManager taskManager, Connector connector, Logger logger)
+    private static Publication? SelectPublication(Connector connector, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Select Publication");
         
@@ -476,7 +452,7 @@ public static class Tranga_Cli
         Console.WriteLine("Publication search query (leave empty for all):");
         string? query = Console.ReadLine();
 
-        Publication[] publications = taskManager.GetPublicationsFromConnector(connector, query ?? "");
+        Publication[] publications = connector.GetPublications(query ?? "");
         
         int pIndex = 0;
         Console.WriteLine("Publications:");

Tranga/TaskManager.cs

@@ -11,30 +11,28 @@ namespace Tranga;
 public class TaskManager
 {
     public Dictionary<Publication, List<Chapter>> _chapterCollection = new();
-    private HashSet<TrangaTask> _allTasks;
+    private readonly HashSet<TrangaTask> _allTasks;
     private bool _continueRunning = true;
     private readonly Connector[] _connectors;
     private readonly Dictionary<Connector, List<TrangaTask>> _taskQueue = new();
-    public TrangaSettings settings { get; }
+    public SettingsData settings { get; }
     private Logger? logger { get; }
-    public Komga? komga => settings.komga;
+    public Komga? komga { get; }
 
     /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
-    /// <param name="workingDirectory">Path to the working directory</param>
+    /// <param name="settingsFilePath">Path to the settings file (data.json)</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? workingDirectory = null, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
+    public TaskManager(string downloadFolderPath, string? settingsFilePath = null, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
     {
         this.logger = logger;
         _allTasks = new HashSet<TrangaTask>();
-
-        Komga? newKomga = null;
         if (komgaBaseUrl != null && komgaUsername != null && komgaPassword != null)
-            newKomga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
+            this.komga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
         
-        this.settings = new TrangaSettings(downloadFolderPath, workingDirectory, newKomga);
+        this.settings = new SettingsData(downloadFolderPath, settingsFilePath, this.komga, this._allTasks);
         ExportData();
         
         this._connectors = new Connector[]{ new MangaDex(downloadFolderPath, logger) };
@@ -50,22 +48,21 @@ public class TaskManager
         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;
+        settings.UpdateSettings(downloadLocation, komga);
         ExportData();
     }
 
-    public TaskManager(TrangaSettings settings, Logger? logger = null)
+    public TaskManager(SettingsData 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>());
-        _allTasks = new HashSet<TrangaTask>();
-        
-        this.settings = settings;
-        ImportData();
-        ExportData();
+        this.komga = settings.komga;
+        _allTasks = settings.allTasks;
         Thread taskChecker = new(TaskCheckerThread);
         taskChecker.Start();
     }
@@ -292,25 +289,19 @@ public class TaskManager
         Environment.Exit(0);
     }
 
-    private void ImportData()
+    /// <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)
     {
-        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)!;
-        }
+        if (!File.Exists(importFilePath))
+            return new SettingsData(Directory.GetCurrentDirectory(), null, null, new HashSet<TrangaTask>());
 
-        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>());
-        }
+        string toRead = File.ReadAllText(importFilePath);
+        SettingsData data = JsonConvert.DeserializeObject<SettingsData>(toRead)!;
+
+        return data;
     }
 
     /// <summary>
@@ -318,15 +309,38 @@ public class TaskManager
     /// </summary>
     private void ExportData()
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}");
-        File.WriteAllText(settings.settingsFilePath, JsonConvert.SerializeObject(settings));
+        logger?.WriteLine(this.GetType().ToString(), $"Exporting data to {settings.settingsFilePath}");
         
-        logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}");
-        File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks));
         
-        logger?.WriteLine(this.GetType().ToString(), $"Exporting known publications to {settings.knownPublicationsPath}");
-        File.WriteAllText(settings.knownPublicationsPath, JsonConvert.SerializeObject(this._chapterCollection.Keys.ToArray()));
+
+        string serializedData = JsonConvert.SerializeObject(settings);
+
+        File.WriteAllText(settings.settingsFilePath, serializedData);
     }
 
-    
+    public class SettingsData
+    {
+        public string downloadLocation { get; private set; }
+        public string settingsFilePath { get; }
+        public Komga? komga { get; private 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;
+        }
+
+        public void UpdateSettings(string? pDownloadLocation, Komga? pKomga)
+        {
+            if(pDownloadLocation is not null)
+                this.downloadLocation = pDownloadLocation;
+            if(pKomga is not null)
+                this.komga = pKomga;
+        }
+    }
 }

Tranga/TrangaSettings.cs

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