#33 Update Website

Added Code for Kavita

Tranga-API/Program.cs

@@ -15,9 +15,9 @@ logger.WriteLine("Tranga", "Loading settings.");
 
 TrangaSettings settings;
 if (File.Exists(settingsFilePath))
-    settings = TrangaSettings.LoadSettings(settingsFilePath);
+    settings = TrangaSettings.LoadSettings(settingsFilePath, logger);
 else
-    settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, null);
+    settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet<LibraryManager>());
 
 Directory.CreateDirectory(settings.workingDirectory);
 Directory.CreateDirectory(settings.downloadLocation);
@@ -51,8 +51,6 @@ builder.Services.AddCors(options =>
 var app = builder.Build();
 app.UseSwagger();
 app.UseSwaggerUI();
-app.UseSwagger();
-app.UseSwaggerUI();
 
 app.UseCors(corsHeader);
 
@@ -105,6 +103,31 @@ app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? search
     }
 });
 
+app.MapGet("/Tasks/GetTaskProgress", (string taskType, string? connectorName, string? publicationId) =>
+{
+    try
+    {
+        TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
+        TrangaTask? task = null;
+        if (connectorName is null || publicationId is null)
+            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+                tTask.task == pTask);
+        else
+            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+                tTask.task == pTask && tTask.publication?.internalId == publicationId &&
+                tTask.connectorName == connectorName);
+            
+        if (task is null)
+            return -1f;
+
+        return task.progress;
+    }
+    catch (ArgumentException)
+    {
+        return -1f;
+    }
+});
+
 app.MapPost("/Tasks/Start", (string taskType, string? connectorName, string? publicationId) =>
 {
     try
@@ -186,6 +209,8 @@ app.MapDelete("/Queue/Dequeue", (string taskType, string? connectorName, string?
 
 app.MapGet("/Settings/Get", () => taskManager.settings);
 
-app.MapPost("/Settings/Update", (string? downloadLocation, string? komgaUrl, string? komgaAuth) => taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth) );
+app.MapPost("/Settings/Update",
+    (string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaApiKey) =>
+        taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaApiKey));
 
 app.Run();

Tranga-CLI/Tranga_Cli.cs

@@ -1,6 +1,7 @@
 using System.Globalization;
 using Logging;
 using Tranga;
+using Tranga.LibraryManagers;
 
 namespace Tranga_CLI;
 
@@ -25,10 +26,10 @@ public static class Tranga_Cli
         Console.WriteLine($"Logfile-Path: {logFilePath}");
         Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
 
-        Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
+        Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, Console.Out.Encoding, logFilePath);
         
         logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
-        TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, null);
+        TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath, logger) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, new HashSet<LibraryManager>());
 
             
         logger.WriteLine("Tranga_CLI", "User Input");
@@ -38,12 +39,12 @@ public static class Tranga_Cli
             tmpPath = Console.ReadLine();
         if (tmpPath.Length > 0)
             settings.downloadLocation = tmpPath;
-        
+
-        Console.WriteLine($"Komga BaseURL [{settings.komga?.baseUrl}]:");
+        Console.WriteLine($"Komga BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga))?.baseUrl}]:");
-        string? tmpUrl = Console.ReadLine();
+        string? tmpUrlKomga = Console.ReadLine();
-        while (tmpUrl is null)
+        while (tmpUrlKomga is null)
-            tmpUrl = Console.ReadLine();
+            tmpUrlKomga = Console.ReadLine();
-        if (tmpUrl.Length > 0)
+        if (tmpUrlKomga.Length > 0)
         {
             Console.WriteLine("Username:");
             string? tmpUser = Console.ReadLine();
@@ -69,8 +70,24 @@ public static class Tranga_Cli
                     tmpPass += keyInfo.KeyChar;
                 }
             } while (key != ConsoleKey.Enter);
-            
+
-            settings.komga = new Komga(tmpUrl, tmpUser, tmpPass, logger);
+            settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
+            settings.libraryManagers.Add(new Komga(tmpUrlKomga, tmpUser, tmpPass, logger));
+        }
+        
+        Console.WriteLine($"Kavita BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Kavita))?.baseUrl}]:");
+        string? tmpUrlKavita = Console.ReadLine();
+        while (tmpUrlKavita is null)
+            tmpUrlKavita = Console.ReadLine();
+        if (tmpUrlKavita.Length > 0)
+        {
+            Console.WriteLine("Username:");
+            string? tmpApiKey = Console.ReadLine();
+            while (tmpApiKey is null || tmpApiKey.Length < 1)
+                tmpApiKey = Console.ReadLine();
+
+            settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
+            settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpApiKey, logger));
         }
         
         logger.WriteLine("Tranga_CLI", "Loaded.");
@@ -332,7 +349,7 @@ public static class Tranga_Cli
         TrangaTask.Task task = (TrangaTask.Task)tmpTask;
                     
         Connector? connector = null;
-        if (task != TrangaTask.Task.UpdateKomgaLibrary)
+        if (task != TrangaTask.Task.UpdateLibraries)
         {
             connector = SelectConnector(taskManager.GetAvailableConnectors().Values.ToArray(), logger);
             if (connector is null)
@@ -340,7 +357,7 @@ public static class Tranga_Cli
         }
                     
         Publication? publication = null;
-        if (task != TrangaTask.Task.UpdateKomgaLibrary)
+        if (task != TrangaTask.Task.UpdateLibraries)
         {
             publication = SelectPublication(taskManager, connector!, logger);
             if (publication is null)

Tranga/Connector.cs

@@ -70,9 +70,7 @@ public abstract class Connector
     {
         logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} {publication.internalId}");
         //Check if Publication already has a Folder and cover
-        string publicationFolder = Path.Join(downloadLocation, publication.folderName);
+        string publicationFolder = publication.CreatePublicationFolder(downloadLocation);
-        if(!Directory.Exists(publicationFolder))
-            Directory.CreateDirectory(publicationFolder);
         DirectoryInfo dirInfo = new (publicationFolder);
         if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover.")))
         {
@@ -84,6 +82,8 @@ public abstract class Connector
         string newFilePath = Path.Join(publicationFolder, $"cover.{Path.GetFileName(fileInCache).Split('.')[^1]}" );
         logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {fileInCache} -> {newFilePath}");
         File.Copy(fileInCache, newFilePath, true);
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
     }
 
     /// <summary>

Tranga/Connectors/Manganato.cs

@@ -1,5 +1,4 @@
-using System.Collections;
+using System.Net;
-using System.Net;
 using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using Logging;
@@ -15,14 +14,14 @@ public class Manganato : Connector
         this.name = "Manganato";
         this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
         {
-            {(byte)1, 100}
+            {(byte)1, 60}
         }, logger);
     }
 
     public override Publication[] GetPublications(string publicationTitle = "")
     {
         logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
-        string sanitizedTitle = publicationTitle.ToLower().Replace(' ', '_');
+        string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '_');
         logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={sanitizedTitle})");
         string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
         DownloadClient.RequestResult requestResult =
@@ -152,7 +151,7 @@ public class Manganato : Connector
             string fullString = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name")).InnerText;
 
             string? volumeNumber = fullString.Contains("Vol.") ? fullString.Replace("Vol.", "").Split(' ')[0] : null;
-            string? chapterNumber = fullString.Split(':')[0].Split(' ')[^1];
+            string? chapterNumber = fullString.Split(':')[0].Split("Chapter ")[1].Replace('-','.');
             string chapterName = string.Concat(fullString.Split(':')[1..]);
             string url = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name"))
                 .GetAttributeValue("href", "");

Tranga/Komga.cs

@@ -1,148 +0,0 @@
-using System.Net;
-using System.Net.Http.Headers;
-using System.Text.Json.Nodes;
-using Logging;
-using Newtonsoft.Json;
-using JsonSerializer = System.Text.Json.JsonSerializer;
-
-namespace Tranga;
-
-/// <summary>
-/// Provides connectivity to Komga-API
-/// Can fetch and update libraries
-/// </summary>
-public class Komga
-{
-    public string baseUrl { get; }
-    public string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
-
-    private Logger? logger;
-    
-    /// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
-    /// <param name="username">Komga Username</param>
-    /// <param name="password">Komga password, will be base64 encoded. yea</param>
-    public Komga(string baseUrl, string username, string password, Logger? logger)
-    {
-        this.baseUrl = baseUrl;
-        this.auth = Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}"));
-        this.logger = logger;
-    }
-    
-    /// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
-    /// <param name="auth">Base64 string of username and password (username):(password)</param>
-    [JsonConstructor]
-    public Komga(string baseUrl, string auth, Logger? logger)
-    {
-        this.baseUrl = baseUrl;
-        this.auth = auth;
-        this.logger = logger;
-    }
-
-    /// <summary>
-    /// Fetches all libraries available to the user
-    /// </summary>
-    /// <returns>Array of KomgaLibraries</returns>
-    public KomgaLibrary[] GetLibraries()
-    {
-        logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
-        Stream data = NetClient.MakeRequest($"{baseUrl}/api/v1/libraries", auth);
-        if (data == Stream.Null)
-        {
-            logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
-            return Array.Empty<KomgaLibrary>();
-        }
-        JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
-        if (result is null)
-        {
-            logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
-            return Array.Empty<KomgaLibrary>();
-        }
-
-        HashSet<KomgaLibrary> ret = new();
-
-        foreach (JsonNode? jsonNode in result)
-        {
-            var jObject = (JsonObject?)jsonNode;
-            string libraryId = jObject!["id"]!.GetValue<string>();
-            string libraryName = jObject!["name"]!.GetValue<string>();
-            ret.Add(new KomgaLibrary(libraryId, libraryName));
-        }
-
-        return ret.ToArray();
-    }
-
-    /// <summary>
-    /// Updates library with given id
-    /// </summary>
-    /// <param name="libraryId">Id of the Komga-Library</param>
-    /// <returns>true if successful</returns>
-    public bool UpdateLibrary(string libraryId)
-    {
-        logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
-        return NetClient.MakePost($"{baseUrl}/api/v1/libraries/{libraryId}/scan", auth);
-    }
-
-    public struct KomgaLibrary
-    {
-        public string id { get; }
-        public string name { get; }
-
-        public KomgaLibrary(string id, string name)
-        {
-            this.id = id;
-            this.name = name;
-        }
-    }
-
-    private static class NetClient
-    {
-        public static Stream MakeRequest(string url, string auth)
-        {
-            HttpClientHandler clientHandler = new ();
-            clientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, sslPolicyErrors) => true;
-            HttpClient client = new(clientHandler);
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", auth);
-            
-            HttpRequestMessage requestMessage = new ()
-            {
-                Method = HttpMethod.Get,
-                RequestUri = new Uri(url)
-            };
-            HttpResponseMessage response = client.Send(requestMessage);
-            Stream ret;
-            if (response.StatusCode is HttpStatusCode.Unauthorized)
-            {
-                ret = MakeRequest(response.RequestMessage!.RequestUri!.AbsoluteUri, auth);
-            }else
-                return response.IsSuccessStatusCode ? response.Content.ReadAsStream() : Stream.Null;
-            return ret;
-        }
-
-        public static bool MakePost(string url, string auth)
-        {
-            HttpClientHandler clientHandler = new HttpClientHandler();
-            clientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, sslPolicyErrors) => true;
-            HttpClient client = new(clientHandler)
-            {
-                DefaultRequestHeaders =
-                {
-                    { "Accept", "application/json" },
-                    { "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
-                }
-            };
-            HttpRequestMessage requestMessage = new HttpRequestMessage
-            {
-                Method = HttpMethod.Post,
-                RequestUri = new Uri(url)
-            };
-            HttpResponseMessage response = client.Send(requestMessage);
-            bool ret;
-            if (response.StatusCode is HttpStatusCode.Unauthorized)
-            {
-                ret = MakePost(response.RequestMessage!.RequestUri!.AbsoluteUri, auth);
-            }else
-                return response.IsSuccessStatusCode;
-            return ret;
-        }
-    }
-}

Tranga/LibraryManager.cs

@@ -0,0 +1,123 @@
+using System.Net;
+using System.Net.Http.Headers;
+using Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Tranga.LibraryManagers;
+
+namespace Tranga;
+
+public abstract class LibraryManager
+{
+    public enum LibraryType : byte
+    {
+        Komga = 0,
+        Kavita = 1
+    }
+
+    public LibraryType libraryType { get; }
+    public string baseUrl { get; }
+    protected string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
+    protected Logger? logger;
+    
+    /// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
+    /// <param name="auth">Base64 string of username and password (username):(password)</param>
+    /// <param name="logger"></param>
+    protected LibraryManager(string baseUrl, string auth, Logger? logger, LibraryType libraryType)
+    {
+        this.baseUrl = baseUrl;
+        this.auth = auth;
+        this.logger = logger;
+        this.libraryType = libraryType;
+    }
+    public abstract void UpdateLibrary();
+
+    public void AddLogger(Logger newLogger)
+    {
+        this.logger = newLogger;
+    }
+
+    protected static class NetClient
+    {
+        public static Stream MakeRequest(string url, string auth, Logger? logger)
+        {
+            HttpClientHandler clientHandler = new ();
+            HttpClient client = new(clientHandler);
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", auth);
+            
+            HttpRequestMessage requestMessage = new ()
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(url)
+            };
+            logger?.WriteLine("LibraryManager", $"GET {url}");
+            HttpResponseMessage response = client.Send(requestMessage);
+            logger?.WriteLine("LibraryManager", $"{(int)response.StatusCode} {response.StatusCode}: {response.ReasonPhrase}");
+            
+            if(response.StatusCode is HttpStatusCode.Unauthorized && response.RequestMessage!.RequestUri!.AbsoluteUri != url)
+                return MakeRequest(response.RequestMessage!.RequestUri!.AbsoluteUri, auth, logger);
+            else if (response.IsSuccessStatusCode)
+                return response.Content.ReadAsStream();
+            else
+                return Stream.Null;
+        }
+
+        public static bool MakePost(string url, string auth, Logger? logger)
+        {
+            HttpClientHandler clientHandler = new ();
+            HttpClient client = new(clientHandler)
+            {
+                DefaultRequestHeaders =
+                {
+                    { "Accept", "application/json" },
+                    { "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
+                }
+            };
+            HttpRequestMessage requestMessage = new ()
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri(url)
+            };
+            logger?.WriteLine("LibraryManager", $"POST {url}");
+            HttpResponseMessage response = client.Send(requestMessage);
+            logger?.WriteLine("LibraryManager", $"{(int)response.StatusCode} {response.StatusCode}: {response.ReasonPhrase}");
+            
+            if(response.StatusCode is HttpStatusCode.Unauthorized && response.RequestMessage!.RequestUri!.AbsoluteUri != url)
+                return MakePost(response.RequestMessage!.RequestUri!.AbsoluteUri, auth, logger);
+            else if (response.IsSuccessStatusCode)
+                return true;
+            else 
+                return false;
+        }
+    }
+    
+    public class LibraryManagerJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return (objectType == typeof(LibraryManager));
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            JObject jo = JObject.Load(reader);
+            if (jo["libraryType"]!.Value<Int64>() == (Int64)LibraryType.Komga)
+                return jo.ToObject<Komga>(serializer)!;
+
+            if (jo["libraryType"]!.Value<Int64>() == (Int64)LibraryType.Kavita)
+                return jo.ToObject<Kavita>(serializer)!;
+
+            throw new Exception();
+        }
+
+        public override bool CanWrite => false;
+
+        /// <summary>
+        /// Don't call this
+        /// </summary>
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            throw new Exception("Dont call this");
+        }
+    }
+}

Tranga/LibraryManagers/Kavita.cs

@@ -0,0 +1,64 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Logging;
+
+namespace Tranga.LibraryManagers;
+
+public class Kavita : LibraryManager
+{
+    public Kavita(string baseUrl, string apiKey, Logger? logger) : base(baseUrl, apiKey, logger, LibraryType.Kavita)
+    {
+    }
+
+    public override void UpdateLibrary()
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
+        foreach (KavitaLibrary lib in GetLibraries())
+            NetClient.MakePost($"{baseUrl}/api/Library/scan?libraryId={lib.id}", auth, logger);
+    }
+    
+    /// <summary>
+    /// Fetches all libraries available to the user
+    /// </summary>
+    /// <returns>Array of KavitaLibrary</returns>
+    private IEnumerable<KavitaLibrary> GetLibraries()
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
+        Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library", auth, logger);
+        if (data == Stream.Null)
+        {
+            logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
+            return Array.Empty<KavitaLibrary>();
+        }
+        JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
+        if (result is null)
+        {
+            logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
+            return Array.Empty<KavitaLibrary>();
+        }
+
+        HashSet<KavitaLibrary> ret = new();
+
+        foreach (JsonNode? jsonNode in result)
+        {
+            var jObject = (JsonObject?)jsonNode;
+            string libraryId = jObject!["id"]!.GetValue<string>();
+            string libraryName = jObject!["name"]!.GetValue<string>();
+            ret.Add(new KavitaLibrary(libraryId, libraryName));
+        }
+
+        return ret;
+    }
+    
+    private struct KavitaLibrary
+    {
+        public string id { get; }
+        public string name { get; }
+
+        public KavitaLibrary(string id, string name)
+        {
+            this.id = id;
+            this.name = name;
+        }
+    }
+}

Tranga/LibraryManagers/Komga.cs

@@ -0,0 +1,75 @@
+using System.Text.Json.Nodes;
+using Logging;
+using Newtonsoft.Json;
+using JsonSerializer = System.Text.Json.JsonSerializer;
+
+namespace Tranga.LibraryManagers;
+
+/// <summary>
+/// Provides connectivity to Komga-API
+/// Can fetch and update libraries
+/// </summary>
+public class Komga : LibraryManager
+{
+    public Komga(string baseUrl, string username, string password, Logger? logger)
+        : base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger, LibraryType.Komga)
+    {
+    }
+
+    [JsonConstructor]
+    public Komga(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger, LibraryType.Komga)
+    {
+    }
+
+    public override void UpdateLibrary()
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
+        foreach (KomgaLibrary lib in GetLibraries())
+            NetClient.MakePost($"{baseUrl}/api/v1/libraries/{lib.id}/scan", auth, logger);
+    }
+
+    /// <summary>
+    /// Fetches all libraries available to the user
+    /// </summary>
+    /// <returns>Array of KomgaLibraries</returns>
+    private IEnumerable<KomgaLibrary> GetLibraries()
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
+        Stream data = NetClient.MakeRequest($"{baseUrl}/api/v1/libraries", auth, logger);
+        if (data == Stream.Null)
+        {
+            logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
+            return Array.Empty<KomgaLibrary>();
+        }
+        JsonArray? result = JsonSerializer.Deserialize<JsonArray>(data);
+        if (result is null)
+        {
+            logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
+            return Array.Empty<KomgaLibrary>();
+        }
+
+        HashSet<KomgaLibrary> ret = new();
+
+        foreach (JsonNode? jsonNode in result)
+        {
+            var jObject = (JsonObject?)jsonNode;
+            string libraryId = jObject!["id"]!.GetValue<string>();
+            string libraryName = jObject!["name"]!.GetValue<string>();
+            ret.Add(new KomgaLibrary(libraryId, libraryName));
+        }
+
+        return ret;
+    }
+
+    private struct KomgaLibrary
+    {
+        public string id { get; }
+        public string name { get; }
+
+        public KomgaLibrary(string id, string name)
+        {
+            this.id = id;
+            this.name = name;
+        }
+    }
+}

Tranga/Publication.cs

@@ -50,11 +50,19 @@ public readonly struct Publication
         this.internalId = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{onlyLowerLetters}{this.year}"));
     }
 
-    public void SaveSeriesInfoJson(string downloadDirectory)
+    public string CreatePublicationFolder(string downloadDirectory)
     {
         string publicationFolder = Path.Join(downloadDirectory, this.folderName);
         if(!Directory.Exists(publicationFolder))
             Directory.CreateDirectory(publicationFolder);
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            File.SetUnixFileMode(publicationFolder, GroupRead | GroupWrite | GroupExecute | OtherRead | OtherWrite | OtherExecute | UserRead | UserWrite | UserExecute);
+        return publicationFolder;
+    }
+
+    public void SaveSeriesInfoJson(string downloadDirectory)
+    {
+        string publicationFolder = CreatePublicationFolder(downloadDirectory);
         string seriesInfoPath = Path.Join(publicationFolder, "series.json");
         if(!File.Exists(seriesInfoPath))
             File.WriteAllText(seriesInfoPath,this.GetSeriesInfoJson());

Tranga/TaskManager.cs

@@ -1,6 +1,7 @@
 using Logging;
 using Newtonsoft.Json;
 using Tranga.Connectors;
+using Tranga.LibraryManagers;
 using Tranga.TrangaTasks;
 
 namespace Tranga;
@@ -18,7 +19,6 @@ public class TaskManager
     private readonly Dictionary<Connector, List<TrangaTask>> _taskQueue = new();
     public TrangaSettings settings { get; }
     private Logger? logger { get; }
-    public Komga? komga => settings.komga;
 
     /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
     /// <param name="workingDirectory">Path to the working directory</param>
@@ -27,16 +27,12 @@ public class TaskManager
     /// <param name="komgaUsername">The Komga username</param>
     /// <param name="komgaPassword">The Komga password</param>
     /// <param name="logger"></param>
-    public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
+    public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, Logger? logger = null)
     {
         this.logger = logger;
         _allTasks = new HashSet<TrangaTask>();
 
-        Komga? newKomga = null;
+        this.settings = new TrangaSettings(downloadFolderPath, workingDirectory, libraryManagers);
-        if (komgaBaseUrl != null && komgaUsername != null && komgaPassword != null)
-            newKomga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
-        
-        this.settings = new TrangaSettings(downloadFolderPath, workingDirectory, newKomga);
         ExportDataAndSettings();
         
         this._connectors = new Connector[]
@@ -51,10 +47,18 @@ public class TaskManager
         taskChecker.Start();
     }
 
-    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth)
+    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaApiKey)
     {
         if (komgaUrl is not null && komgaAuth is not null && komgaUrl.Length > 0 && komgaAuth.Length > 0)
-            settings.komga = new Komga(komgaUrl, komgaAuth, null);
+        {
+            settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
+            settings.libraryManagers.Add(new Komga(komgaUrl, komgaAuth, logger));
+        }
+        if (kavitaUrl is not null && kavitaApiKey is not null && kavitaUrl.Length > 0 && kavitaApiKey.Length > 0)
+        {
+            settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
+            settings.libraryManagers.Add(new Kavita(kavitaUrl, kavitaApiKey, logger));
+        }
         if (downloadLocation is not null && downloadLocation.Length > 0)
             settings.downloadLocation = downloadLocation;
         ExportDataAndSettings();
@@ -103,7 +107,7 @@ public class TaskManager
             foreach (TrangaTask task in _allTasks.Where(aTask => aTask.ShouldExecute()))
             {
                 task.state = TrangaTask.ExecutionState.Enqueued;
-                if(task.task == TrangaTask.Task.UpdateKomgaLibrary)
+                if(task.task == TrangaTask.Task.UpdateLibraries)
                     ExecuteTaskNow(task);
                 else
                 {
@@ -146,12 +150,12 @@ public class TaskManager
         logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {task} {connectorName} {publication?.sortName}");
 
         TrangaTask? newTask = null;
-        if (task == TrangaTask.Task.UpdateKomgaLibrary)
+        if (task == TrangaTask.Task.UpdateLibraries)
         {
-            newTask = new UpdateKomgaLibraryTask(task, reoccurrence);
+            newTask = new UpdateLibrariesTask(task, reoccurrence);
             logger?.WriteLine(this.GetType().ToString(), $"Removing old {task}-Task.");
             //Only one UpdateKomgaLibrary Task
-            _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateKomgaLibrary);
+            _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
             _allTasks.Add(newTask);
             logger?.WriteLine(this.GetType().ToString(), $"Added new Task {newTask}");
         }else if (task == TrangaTask.Task.DownloadNewChapters)
@@ -192,9 +196,9 @@ public class TaskManager
     public void DeleteTask(TrangaTask.Task task, string? connectorName, Publication? publication)
     {
         logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publication?.sortName}");
-        if (task == TrangaTask.Task.UpdateKomgaLibrary)
+        if (task == TrangaTask.Task.UpdateLibraries)
         {
-            _allTasks.RemoveWhere(uTask => uTask.task == TrangaTask.Task.UpdateKomgaLibrary);
+            _allTasks.RemoveWhere(uTask => uTask.task == TrangaTask.Task.UpdateLibraries);
             logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task} from all Tasks.");
         }
         else if (connectorName is null)

Tranga/TrangaSettings.cs

@@ -1,4 +1,6 @@
-using Newtonsoft.Json;
+using Logging;
+using Newtonsoft.Json;
+using Tranga.LibraryManagers;
 
 namespace Tranga;
 
@@ -10,24 +12,27 @@ public class TrangaSettings
     [JsonIgnore]public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
     [JsonIgnore]public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
     [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
-    public Komga? komga { get; set; }
+    public HashSet<LibraryManager> libraryManagers { get; }
 
-    public TrangaSettings(string downloadLocation, string workingDirectory, Komga? komga)
+    public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager> libraryManagers)
     {
         if (downloadLocation.Length < 1 || workingDirectory.Length < 1)
             throw new ArgumentException("Download-location and working-directory paths can not be empty!");
         this.workingDirectory = workingDirectory;
         this.downloadLocation = downloadLocation;
-        this.komga = komga;
+        this.libraryManagers = libraryManagers;
     }
 
-    public static TrangaSettings LoadSettings(string importFilePath)
+    public static TrangaSettings LoadSettings(string importFilePath, Logger? logger)
     {
         if (!File.Exists(importFilePath))
-            return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory(), null);
+            return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory(), new HashSet<LibraryManager>());
 
         string toRead = File.ReadAllText(importFilePath);
-        TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead)!;
+        TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead, new JsonSerializerSettings() { Converters = { new LibraryManager.LibraryManagerJsonConverter()} })!;
+        if(logger is not null)
+            foreach(LibraryManager lm in settings.libraryManagers)
+                lm.AddLogger(logger);
 
         return settings;
     }

Tranga/TrangaTask.cs

@@ -74,7 +74,7 @@ public abstract class TrangaTask
     public enum Task : byte
     {
         DownloadNewChapters = 2,
-        UpdateKomgaLibrary = 3
+        UpdateLibraries = 3
     }
 
     public override string ToString()
@@ -95,8 +95,8 @@ public abstract class TrangaTask
             if (jo["task"]!.Value<Int64>() == (Int64)Task.DownloadNewChapters)
                 return jo.ToObject<DownloadNewChaptersTask>(serializer)!;
 
-            if (jo["task"]!.Value<Int64>() == (Int64)Task.UpdateKomgaLibrary)
+            if (jo["task"]!.Value<Int64>() == (Int64)Task.UpdateLibraries)
-                return jo.ToObject<UpdateKomgaLibraryTask>(serializer)!;
+                return jo.ToObject<UpdateLibrariesTask>(serializer)!;
 
             throw new Exception();
         }
@@ -106,10 +106,6 @@ public abstract class TrangaTask
         /// <summary>
         /// Don't call this
         /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="value"></param>
-        /// <param name="serializer"></param>
-        /// <exception cref="Exception"></exception>
         public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
             throw new Exception("Dont call this");

Tranga/TrangaTasks/DownloadNewChaptersTask.cs

@@ -14,9 +14,7 @@ public class DownloadNewChaptersTask : TrangaTask
         Connector connector = taskManager.GetConnector(this.connectorName);
 
         //Check if Publication already has a Folder
-        string publicationFolder = Path.Join(connector.downloadLocation, pub.folderName);
+        pub.CreatePublicationFolder(taskManager.settings.downloadLocation);
-        if(!Directory.Exists(publicationFolder))
-            Directory.CreateDirectory(publicationFolder);
         List<Chapter> newChapters = UpdateChapters(connector, pub, language!, ref taskManager.chapterCollection);
         this.tasksCount = newChapters.Count;
 

Tranga/TrangaTasks/UpdateKomgaLibraryTask.cs

@@ -1,21 +0,0 @@
-using Logging;
-
-namespace Tranga.TrangaTasks;
-
-public class UpdateKomgaLibraryTask : TrangaTask
-{
-    public UpdateKomgaLibraryTask(Task task, TimeSpan reoccurrence) : base(task, null, null, reoccurrence)
-    {
-    }
-
-    protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
-    {
-        if (taskManager.komga is null)
-            return;
-        Komga komga = taskManager.komga;
-
-        Komga.KomgaLibrary[] allLibraries = komga.GetLibraries();
-        foreach (Komga.KomgaLibrary lib in allLibraries)
-            komga.UpdateLibrary(lib.id);
-    }
-}

Tranga/TrangaTasks/UpdateLibrariesTask.cs

@@ -0,0 +1,16 @@
+using Logging;
+
+namespace Tranga.TrangaTasks;
+
+public class UpdateLibrariesTask : TrangaTask
+{
+    public UpdateLibrariesTask(Task task, TimeSpan reoccurrence) : base(task, null, null, reoccurrence)
+    {
+    }
+
+    protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
+    {
+        foreach(LibraryManager lm in taskManager.settings.libraryManagers)
+            lm.UpdateLibrary();
+    }
+}

Website/apiConnector.js

@@ -84,7 +84,7 @@ async function GetSettings(){
 }
 
 async function GetKomgaTask(){
-    var uri = apiUri + "/Tasks/Get?taskType=UpdateKomgaLibrary";
+    var uri = apiUri + "/Tasks/Get?taskType=UpdateLibraries";
     let json = await GetData(uri);
     return json;
 }

Website/index.html

@@ -94,9 +94,17 @@
             <label for="komgaUrl"></label><input placeholder="URL" id="komgaUrl" type="text">
             <label for="komgaUsername"></label><input placeholder="Username" id="komgaUsername" type="text">
             <label for="komgaPassword"></label><input placeholder="Password" id="komgaPassword" type="password">
-            <label for="komgaUpdateTime" style="margin-right: 5px;">Update Time</label><input id="komgaUpdateTime" type="time" value="00:01:00" step="10">
-            <input type="submit" value="Update" onclick="UpdateKomgaSettings()">
           </komga-settings>
+          <kavita-settings>
+            <span class="title">Kavita</span>
+            <div>Configured: <span id="kavitaConfigured">✅❌</span></div>
+            <label for="kavitaUrl"></label><input placeholder="URL" id="kavitaUrl" type="text">
+            <label for="kavitaApiKey"></label><input placeholder="API-Key" id="kavitaApiKey" type="text">
+          </kavita-settings>
+          <div>
+            <label for="libraryUpdateTime" style="margin-right: 5px;">Update Time</label><input id="libraryUpdateTime" type="time" value="00:01:00" step="10">
+            <input type="submit" value="Update" onclick="UpdateLibrarySettings()">
+          </div>
         </settings>
       </popup>
     </viewport>

Website/interaction.js

@@ -26,8 +26,11 @@ const settingDownloadLocation = document.querySelector("#downloadLocation");
 const settingKomgaUrl = document.querySelector("#komgaUrl");
 const settingKomgaUser = document.querySelector("#komgaUsername");
 const settingKomgaPass = document.querySelector("#komgaPassword");
-const settingKomgaTime = document.querySelector("#komgaUpdateTime");
+const settingKavitaUrl = document.querySelector("#kavitaUrl");
+const settingKavitaApi = document.querySelector("#kavitaApiKey");
+const libraryUpdateTime = document.querySelector("#libraryUpdateTime");
 const settingKomgaConfigured = document.querySelector("#komgaConfigured");
+const settingKavitaConfigured = document.querySelector("#kavitaConfigured");
 const settingApiUri = document.querySelector("#settingApiUri");
 const tagTasksRunning = document.querySelector("#tasksRunningTag");
 const tagTasksQueued = document.querySelector("#tasksQueuedTag");
@@ -239,38 +242,50 @@ function GetSettingsClick(){
     settingKomgaUrl.value = "";
     settingKomgaUser.value = "";
     settingKomgaPass.value = "";
+    settingKavitaUrl.value = "";
+    settingKavitaApi.value = "";
+    settingKomgaConfigured.innerText = "❌";
+    settingKavitaConfigured.innerText = "❌";
     
     settingApiUri.placeholder = apiUri;
     
     GetSettings().then(json => {
         settingDownloadLocation.innerText = json.downloadLocation;
-        if(json.komga != null) {
+        json.libraryManagers.forEach(lm => {
-            settingKomgaUrl.placeholder = json.komga.baseUrl;
+           if(lm.libraryType == 0){
-            settingKomgaUser.placeholder = "Configured";
+               settingKomgaUrl.placeholder = lm.baseUrl;
-            settingKomgaPass.placeholder = "***";
+               settingKomgaUser.placeholder = "Configured";
-        }
+               settingKomgaPass.placeholder = "***";
+               settingKomgaConfigured.innerText = "✅";
+           } else if(libraryType == 1){
+               settingKavitaUrl.placeholder = lm.baseUrl;
+               settingKavitaApi.placeholder = "***";
+               settingKavitaConfigured.innerText = "✅";
+           }
+        });
     });
     
     GetKomgaTask().then(json => {
-        settingKomgaTime.value = json[0].reoccurrence;
         if(json.length > 0)
-            settingKomgaConfigured.innerText = "✅";
+            libraryUpdateTime.value = json[0].reoccurrence;
-        else
-            settingKomgaConfigured.innerText = "❌";
     });
 }
 
-function UpdateKomgaSettings(){
+function UpdateLibrarySettings(){
     if(settingKomgaUser.value != "" && settingKomgaPass != ""){
         var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
         console.log(auth);
 
         if(settingKomgaUrl.value != "")
-            UpdateSettings("", settingKomgaUrl.value, auth);
+            UpdateSettings("", settingKomgaUrl.value, auth, "", "");
         else
-            UpdateSettings("", settingKomgaUrl.placeholder, auth);
+            UpdateSettings("", settingKomgaUrl.placeholder, auth, "", "");
     }
-    CreateTask("UpdateKomgaLibrary", settingKomgaTime.value, "","","");
+    
+    if(settingKavitaUrl.value != "" && settingKavitaApi != ""){
+        UpdateSettings("", "", "", settingKavitaUrl.value, settingKavitaApi.value);
+    }
+    CreateTask("UpdateLibraries", libraryUpdateTime.value, "","","");
     setTimeout(() => GetSettingsClick(), 100);
 }
 

Website/style.css

@@ -155,7 +155,7 @@ settings {
     z-index: 10;
     position: absolute;
     left: 25%;
-    top: 25%;
+    top: 100px;
     border-radius: 5px;
     padding: 10px 0;
 }