#33 Update Website

Tranga-API/Program.cs

@@ -51,8 +51,6 @@ builder.Services.AddCors(options =>
 var app = builder.Build();
 app.UseSwagger();
 app.UseSwaggerUI();
-app.UseSwagger();
-app.UseSwaggerUI();
 
 app.UseCors(corsHeader);
 
@@ -212,7 +210,7 @@ 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, string? kavitaUrl, string? kavitaAuth) =>
+    (string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaApiKey) =>
-        taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaAuth));
+        taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaApiKey));
 
 app.Run();

Tranga-CLI/Tranga_Cli.cs

@@ -82,32 +82,12 @@ public static class Tranga_Cli
         if (tmpUrlKavita.Length > 0)
         {
             Console.WriteLine("Username:");
-            string? tmpUser = Console.ReadLine();
+            string? tmpApiKey = Console.ReadLine();
-            while (tmpUser is null || tmpUser.Length < 1)
+            while (tmpApiKey is null || tmpApiKey.Length < 1)
-                tmpUser = Console.ReadLine();
+                tmpApiKey = Console.ReadLine();
-            
-            Console.WriteLine("Password:");
-            string tmpPass = string.Empty;
-            ConsoleKey key;
-            do
-            {
-                var keyInfo = Console.ReadKey(intercept: true);
-                key = keyInfo.Key;
-
-                if (key == ConsoleKey.Backspace && tmpPass.Length > 0)
-                {
-                    Console.Write("\b \b");
-                    tmpPass = tmpPass[0..^1];
-                }
-                else if (!char.IsControl(keyInfo.KeyChar))
-                {
-                    Console.Write("*");
-                    tmpPass += keyInfo.KeyChar;
-                }
-            } while (key != ConsoleKey.Enter);
 
             settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
-            settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpUser, tmpPass, logger));
+            settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpApiKey, logger));
         }
         
         logger.WriteLine("Tranga_CLI", "Loaded.");

Tranga/LibraryManager.cs

@@ -15,7 +15,7 @@ public abstract class LibraryManager
         Kavita = 1
     }
 
-    public LibraryType libraryType;
+    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;
@@ -23,11 +23,12 @@ public abstract class LibraryManager
     /// <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)
+    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();
 

Tranga/LibraryManagers/Kavita.cs

@@ -6,15 +6,8 @@ namespace Tranga.LibraryManagers;
 
 public class Kavita : LibraryManager
 {
-    public Kavita(string baseUrl, string username, string password, Logger? logger)
+    public Kavita(string baseUrl, string apiKey, Logger? logger) : base(baseUrl, apiKey, logger, LibraryType.Kavita)
-        : base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger)
     {
-        this.libraryType = LibraryType.Kavita;
-    }
-    
-    public Kavita(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger)
-    {
-        this.libraryType = LibraryType.Kavita;
     }
 
     public override void UpdateLibrary()

Tranga/LibraryManagers/Komga.cs

@@ -12,15 +12,13 @@ namespace Tranga.LibraryManagers;
 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)
+        : base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger, LibraryType.Komga)
     {
-        this.libraryType = LibraryType.Komga;
     }
 
     [JsonConstructor]
-    public Komga(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger)
+    public Komga(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger, LibraryType.Komga)
     {
-        this.libraryType = LibraryType.Komga;
     }
 
     public override void UpdateLibrary()

Tranga/TaskManager.cs

@@ -47,17 +47,17 @@ public class TaskManager
         taskChecker.Start();
     }
 
-    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaAuth)
+    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.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
             settings.libraryManagers.Add(new Komga(komgaUrl, komgaAuth, logger));
         }
-        if (kavitaUrl is not null && kavitaAuth is not null && kavitaUrl.Length > 0 && kavitaAuth.Length > 0)
+        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, kavitaAuth, logger));
+            settings.libraryManagers.Add(new Kavita(kavitaUrl, kavitaApiKey, logger));
         }
         if (downloadLocation is not null && downloadLocation.Length > 0)
             settings.downloadLocation = downloadLocation;

Tranga/TrangaSettings.cs

@@ -12,7 +12,7 @@ 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 readonly HashSet<LibraryManager> libraryManagers;
+    public HashSet<LibraryManager> libraryManagers { get; }
 
     public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager> libraryManagers)
     {

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){
+               settingKomgaUrl.placeholder = lm.baseUrl;
                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;
 }