Tranga-API/Program.cs

@@ -36,7 +36,7 @@ builder.Services.AddCors(options =>
     options.AddPolicy(name: corsHeader,
         policy  =>
         {
-            policy.AllowAnyOrigin();
+            policy.WithOrigins("*");
             policy.WithMethods("GET", "POST", "DELETE");
         });
 });
@@ -82,45 +82,23 @@ app.MapDelete("/Tasks/Delete", (string taskType, string? connectorName, string?
 
 app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? searchString) =>
 {
-    try
-    {
     TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
-        if (searchString is null || connectorName is null)
-            return taskManager.GetAllTasks().Where(tTask => tTask.task == task);
+    if (searchString is null)
+        return taskManager.GetAllTasks().Where(tTask => tTask.task == task && tTask.connectorName == connectorName);
     else
         return taskManager.GetAllTasks().Where(tTask =>
             tTask.task == task && tTask.connectorName == connectorName && tTask.ToString()
                 .Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
-    }
-    catch (ArgumentException)
-    {
-        return Array.Empty<TrangaTask>();
-    }
 });
 
 app.MapPost("/Tasks/Start", (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);
-            
+    TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+        tTask.task == pTask && tTask.publication?.internalId == publicationId && tTask.connectorName == connectorName);
     if (task is null)
         return;
     taskManager.ExecuteTaskNow(task);
-    }
-    catch (ArgumentException)
-    {
-        return;
-    }
-
 });
 
 app.MapGet("/Tasks/GetRunningTasks",
@@ -131,50 +109,22 @@ app.MapGet("/Queue/GetList",
 
 app.MapPost("/Queue/Enqueue", (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);
-            
+    TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+        tTask.task == pTask && tTask.publication?.internalId == publicationId && tTask.connectorName == connectorName);
     if (task is null)
         return;
     taskManager.AddTaskToQueue(task);
-    }
-    catch (ArgumentException)
-    {
-        return;
-    }
 });
 
 app.MapDelete("/Queue/Dequeue", (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);
-            
+    TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+        tTask.task == pTask && tTask.publication?.internalId == publicationId && tTask.connectorName == connectorName);
     if (task is null)
         return;
     taskManager.RemoveTaskFromQueue(task);
-    }
-    catch (ArgumentException)
-    {
-        return;
-    }
 });
 
 app.MapGet("/Settings/Get", () => taskManager.settings);

Tranga/Komga.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Text.Json.Nodes;
 using Logging;
 using Newtonsoft.Json;
@@ -46,17 +45,9 @@ public class Komga
     {
         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();
 
@@ -98,51 +89,37 @@ public class Komga
     {
         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 ()
+            HttpClient client = new();
+            HttpRequestMessage requestMessage = new HttpRequestMessage
             {
                 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 =
+                RequestUri = new Uri(url),
+                Headers =
                 {
                     { "Accept", "application/json" },
                     { "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
                 }
             };
+            HttpResponseMessage response = client.Send(requestMessage);
+            Stream resultString = response.IsSuccessStatusCode ? response.Content.ReadAsStream() : Stream.Null;
+            return resultString;
+        }
+
+        public static bool MakePost(string url, string auth)
+        {
+            HttpClient client = new();
             HttpRequestMessage requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Post,
-                RequestUri = new Uri(url)
+                RequestUri = new Uri(url),
+                Headers =
+                {
+                    { "Accept", "application/json" },
+                    { "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
+                }
             };
             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;
         }
     }
 }

Website/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:1.10.1-alpine
 COPY . /usr/share/nginx/html
-EXPOSE 80
+EXPOSE 6531
 CMD ["nginx", "-g", "daemon off;"]

Website/apiConnector.js

@@ -1,4 +1,4 @@
-const apiUri = "http://localhost:6531";
+const apiUri = "http://localhost:6530";
 
 async function GetData(uri){
     let request = await fetch(uri, {

Website/index.html

@@ -88,7 +88,7 @@
       <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">
-      <div><label for="komgaUpdateTime" style="margin-right: 5px;">Update Time</label><input id="komgaUpdateTime" type="time" value="00:01:00" step="10"></div>
+      <div><label for="komgaUpdateTime" style="margin-right: 5px;">Update Time</label><input id="komgaUpdateTime" type="time" value="00:01"></div>
       <input type="submit" value="Update" onclick="UpdateSettingsClick()">
     </komga-settings>
   </settingstab>