Tranga/GlobalBase.cs

@@ -9,9 +9,8 @@ public abstract class GlobalBase
 {
     protected Logger? logger { get; init; }
     protected TrangaSettings settings { get; init; }
-    protected HashSet<NotificationConnector> notificationConnectors { get; init; }
-    protected HashSet<LibraryConnector> libraryConnectors { get; init; }
-    protected List<Publication> cachedPublications { get; init; }
+    private HashSet<NotificationConnector> notificationConnectors { get; init; }
+    private HashSet<LibraryConnector> libraryConnectors { get; init; }
 
     protected GlobalBase(GlobalBase clone)
     {
@@ -19,7 +18,6 @@ public abstract class GlobalBase
         this.settings = clone.settings;
         this.notificationConnectors = clone.notificationConnectors;
         this.libraryConnectors = clone.libraryConnectors;
-        this.cachedPublications = clone.cachedPublications;
     }
 
     protected GlobalBase(Logger? logger, TrangaSettings settings)
@@ -28,7 +26,6 @@ public abstract class GlobalBase
         this.settings = settings;
         this.notificationConnectors = settings.LoadNotificationConnectors();
         this.libraryConnectors = settings.LoadLibraryConnectors();
-        this.cachedPublications = new();
     }
 
     protected void Log(string message)

Tranga/Jobs/DownloadChapter.cs

@@ -1,5 +1,4 @@
-using System.Text;
-using Tranga.MangaConnectors;
+using Tranga.MangaConnectors;
 
 namespace Tranga.Jobs;
 
@@ -11,11 +10,6 @@ public class DownloadChapter : Job
     {
         this.chapter = chapter;
     }
-    
-    protected override string GetId()
-    {
-        return Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Concat(this.GetType().ToString(), chapter.parentPublication.internalId, chapter.chapterNumber)));
-    }
 
     protected override IEnumerable<Job> ExecuteReturnSubTasksInternal()
     {

Tranga/Jobs/DownloadNewChapters.cs

@@ -1,5 +1,4 @@
-using System.Text;
-using Tranga.MangaConnectors;
+using Tranga.MangaConnectors;
 
 namespace Tranga.Jobs;
 
@@ -12,11 +11,6 @@ public class DownloadNewChapters : Job
         this.publication = publication;
     }
 
-    protected override string GetId()
-    {
-        return Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Concat(this.GetType().ToString(), publication.internalId)));
-    }
-
     protected override IEnumerable<Job> ExecuteReturnSubTasksInternal()
     {
         Chapter[] chapters = mangaConnector.GetNewChapters(publication);

Tranga/Jobs/Job.cs

@@ -10,7 +10,6 @@ public abstract class Job : GlobalBase
     public TimeSpan? recurrenceTime { get; set; }
     public DateTime? lastExecution { get; private set; }
     public DateTime nextExecution => NextExecution();
-    public string id => GetId();
 
     public Job(GlobalBase clone, MangaConnector connector, bool recurring = false, TimeSpan? recurrenceTime = null) : base(clone)
     {
@@ -22,8 +21,6 @@ public abstract class Job : GlobalBase
         this.recurrenceTime = recurrenceTime;
     }
 
-    protected abstract string GetId();
-
     public Job(GlobalBase clone, MangaConnector connector, ProgressToken progressToken, bool recurring = false, TimeSpan? recurrenceTime = null) : base(clone)
     {
         this.mangaConnector = connector;

Tranga/Jobs/JobBoss.cs

@@ -1,10 +1,11 @@
-using Tranga.MangaConnectors;
+using System.Runtime.CompilerServices;
+using Tranga.MangaConnectors;
 
 namespace Tranga.Jobs;
 
 public class JobBoss : GlobalBase
 {
-    public HashSet<Job> jobs { get; init; }
+    private HashSet<Job> jobs { get; init; }
     private Dictionary<MangaConnector, Queue<Job>> mangaConnectorJobQueue { get; init; }
 
     public JobBoss(GlobalBase clone) : base(clone)

Tranga/MangaConnectors/DownloadClient.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Net.Http.Headers;
 
 namespace Tranga.MangaConnectors;
 
@@ -7,14 +6,7 @@ internal class DownloadClient : GlobalBase
     {
         private static readonly HttpClient Client = new()
         {
-            Timeout = TimeSpan.FromSeconds(60),
-            DefaultRequestHeaders =
-            {
-                UserAgent =
-                {
-                    new ProductInfoHeaderValue("Tranga", "0.1")
-                }
-            }
+            Timeout = TimeSpan.FromSeconds(60)
         };
 
         private readonly Dictionary<byte, DateTime> _lastExecutedRateLimit;

Tranga/MangaConnectors/MangaConnector.cs

@@ -30,7 +30,7 @@ public abstract class MangaConnector : GlobalBase
     /// </summary>
     /// <param name="publicationTitle">Search-Query</param>
     /// <returns>Publications matching the query</returns>
-    public abstract Publication[] GetPublications(string publicationTitle = "");
+    protected abstract Publication[] GetPublications(string publicationTitle = "");
     
     /// <summary>
     /// Returns all Chapters of the publication in the provided language.
@@ -39,7 +39,7 @@ public abstract class MangaConnector : GlobalBase
     /// <param name="publication">Publication to get Chapters for</param>
     /// <param name="language">Language of the Chapters</param>
     /// <returns>Array of Chapters matching Publication and Language</returns>
-    public abstract Chapter[] GetChapters(Publication publication, string language="en");
+    public abstract Chapter[] GetChapters(Publication publication, string language = "");
 
     /// <summary>
     /// Updates the available Chapters of a Publication

Tranga/MangaConnectors/MangaDex.cs

@@ -31,7 +31,7 @@ public class MangaDex : MangaConnector
         }, clone);
     }
 
-    public override Publication[] GetPublications(string publicationTitle = "")
+    protected override Publication[] GetPublications(string publicationTitle = "")
     {
         Log($"Searching Publications. Term=\"{publicationTitle}\"");
         const int limit = 100; //How many values we want returned at once
@@ -146,12 +146,11 @@ public class MangaDex : MangaConnector
             }
         }
 
-        cachedPublications.AddRange(publications);
-        Log($"Retrieved {publications.Count} publications. Term=\"{publicationTitle}\"");
+        Log($"Retrieved {publications.Count} publications.");
         return publications.ToArray();
     }
 
-    public override Chapter[] GetChapters(Publication publication, string language="en")
+    public override Chapter[] GetChapters(Publication publication, string language = "")
     {
         Log($"Getting chapters {publication}");
         const int limit = 100; //How many values we want returned at once

Tranga/MangaConnectors/MangaKatana.cs

@@ -19,7 +19,7 @@ public class MangaKatana : MangaConnector
 		}, clone);
 	}
 
-	public override Publication[] GetPublications(string publicationTitle = "")
+	protected override Publication[] GetPublications(string publicationTitle = "")
 	{
 		Log($"Searching Publications. Term=\"{publicationTitle}\"");
 		string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*").Where(m => m.Value.Length > 0)).ToLower();
@@ -39,8 +39,7 @@ public class MangaKatana : MangaConnector
 		}
 
 		Publication[] publications = ParsePublicationsFromHtml(requestResult.result);
-		cachedPublications.AddRange(publications);
-		Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
+		Log($"Retrieved {publications.Length} publications.");
 		return publications;
 	}
 
@@ -138,7 +137,7 @@ public class MangaKatana : MangaConnector
 			year, originalLanguage, status, publicationId);
 	}
 
-	public override Chapter[] GetChapters(Publication publication, string language="en")
+	public override Chapter[] GetChapters(Publication publication, string language = "")
 	{
 		Log($"Getting chapters {publication}");
 		string requestUrl = $"https://mangakatana.com/manga/{publication.publicationId}";

Tranga/MangaConnectors/Manganato.cs

@@ -19,7 +19,7 @@ public class Manganato : MangaConnector
         }, clone);
     }
 
-    public override Publication[] GetPublications(string publicationTitle = "")
+    protected override Publication[] GetPublications(string publicationTitle = "")
     {
         Log($"Searching Publications. Term=\"{publicationTitle}\"");
         string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*")).ToLower();
@@ -30,8 +30,7 @@ public class Manganato : MangaConnector
             return Array.Empty<Publication>();
 
         Publication[] publications = ParsePublicationsFromHtml(requestResult.result);
-        cachedPublications.AddRange(publications);
-        Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
+        Log($"Retrieved {publications.Length} publications.");
         return publications;
     }
 
@@ -126,7 +125,7 @@ public class Manganato : MangaConnector
             year, originalLanguage, status, publicationId);
     }
 
-    public override Chapter[] GetChapters(Publication publication, string language="en")
+    public override Chapter[] GetChapters(Publication publication, string language = "")
     {
         Log($"Getting chapters {publication}");
         string requestUrl = $"https://chapmanganato.com/{publication.publicationId}";

Tranga/MangaConnectors/Mangasee.cs

@@ -69,7 +69,7 @@ public class Mangasee : MangaConnector
         });
     }
 
-    public override Publication[] GetPublications(string publicationTitle = "")
+    protected override Publication[] GetPublications(string publicationTitle = "")
     {
         Log($"Searching Publications. Term=\"{publicationTitle}\"");
         string requestUrl = $"https://mangasee123.com/_search.php";
@@ -78,10 +78,7 @@ public class Mangasee : MangaConnector
         if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
             return Array.Empty<Publication>();
 
-        Publication[] publications = ParsePublicationsFromHtml(requestResult.result, publicationTitle);
-        cachedPublications.AddRange(publications);
-        Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
-        return publications;
+        return ParsePublicationsFromHtml(requestResult.result, publicationTitle);
     }
 
     private Publication[] ParsePublicationsFromHtml(Stream html, string publicationTitle)
@@ -215,7 +212,7 @@ public class Mangasee : MangaConnector
         }
     }
 
-    public override Chapter[] GetChapters(Publication publication, string language="en")
+    public override Chapter[] GetChapters(Publication publication, string language = "")
     {
         Log($"Getting chapters {publication}");
         XDocument doc = XDocument.Load($"https://mangasee123.com/rss/{publication.publicationId}.xml");

Tranga/Server.cs

@@ -1,10 +1,7 @@
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Text.RegularExpressions;
 using Newtonsoft.Json;
-using Tranga.Jobs;
-using Tranga.MangaConnectors;
 
 namespace Tranga;
 
@@ -35,7 +32,10 @@ public class Server : GlobalBase
             Log($"{context.Request.HttpMethod} {context.Request.Url} {context.Request.UserAgent}");
             Task t = new(() =>
             {
-                HandleRequest(context);
+                if(context.Request.HttpMethod == "OPTIONS")
+                    SendResponse(HttpStatusCode.OK, context.Response);
+                else
+                    HandleRequest(context);
             });
             t.Start();
         }
@@ -45,138 +45,15 @@ public class Server : GlobalBase
     {
         HttpListenerRequest request = context.Request;
         HttpListenerResponse response = context.Response;
-        if(request.HttpMethod == "OPTIONS")
-            SendResponse(HttpStatusCode.OK, context.Response);
         if(request.Url!.LocalPath.Contains("favicon"))
             SendResponse(HttpStatusCode.NoContent, response);
-
-        switch (request.HttpMethod)
-        {
-            case "GET":
-                HandleGet(request, request.InputStream, response);
-                break;
-            case "POST":
-                HandlePost(request, request.InputStream, response);
-                break;
-            case "DELETE":
-                HandleDelete(request, request.InputStream, response);
-                break;
-            default: 
-                SendResponse(HttpStatusCode.BadRequest, response);
-                break;
-        }
-    }
-    
-    private Dictionary<string, string> GetRequestVariables(string query)
-    {
-        Dictionary<string, string> ret = new();
-        Regex queryRex = new (@"\?{1}&?([A-z0-9-=]+=[A-z0-9-=]+)+(&[A-z0-9-=]+=[A-z0-9-=]+)*");
-        if (!queryRex.IsMatch(query))
-            return ret;
-        query = query.Substring(1);
-        foreach (string kvpair in query.Split('&').Where(str => str.Length >= 3))
-        {
-            string var = kvpair.Split('=')[0];
-            string val = Regex.Replace(kvpair.Substring(var.Length + 1), "%20", " ");
-            val = Regex.Replace(val, "%[0-9]{2}", "");
-            ret.Add(var, val);
-        }
-        return ret;
-    }
-
-    private void HandleGet(HttpListenerRequest request, Stream content, HttpListenerResponse response)
-    {
-        Dictionary<string, string> requestVariables = GetRequestVariables(request.Url!.Query);
-        string? connectorName, title, internalId, jobId;
-        MangaConnector connector;
-        Publication publication;
-        Job job;
-        string path = Regex.Match(request.Url!.LocalPath, @"[A-z0-9]+(\/[A-z0-9]+)*").Value;
-        switch (path)
-        {
-            case "Connectors":
-                SendResponse(HttpStatusCode.OK, response, _parent.GetConnectors().Select(connector => connector.name).ToArray());
-                break;
-            case "Publications/FromConnector":
-                if (!requestVariables.TryGetValue("connector", out connectorName) ||
-                    !requestVariables.TryGetValue("title", out title) ||
-                    _parent.GetConnector(connectorName) is null)
-                {
-                    SendResponse(HttpStatusCode.BadRequest, response);
-                    break;
-                }
-                connector = _parent.GetConnector(connectorName)!;
-                SendResponse(HttpStatusCode.OK, response, connector.GetPublications(title));
-                break;
-            case "Publications/Chapters":
-                if(!requestVariables.TryGetValue("connector", out connectorName) ||
-                   !requestVariables.TryGetValue("internalId", out internalId) ||
-                   _parent.GetConnector(connectorName) is null ||
-                   _parent.GetPublicationById(internalId) is null)
-                {
-                    SendResponse(HttpStatusCode.BadRequest, response);
-                    break;
-                }
-                connector = _parent.GetConnector(connectorName)!;
-                publication = (Publication)_parent.GetPublicationById(internalId)!;
-                SendResponse(HttpStatusCode.OK, response, connector.GetChapters(publication));
-                break;
-            case "Tasks":
-                if (!requestVariables.TryGetValue("jobId", out jobId))
-                {
-                    if(!_parent._jobBoss.jobs.Any(jjob => jjob.id == jobId))
-                        SendResponse(HttpStatusCode.BadRequest, response);
-                    else
-                        SendResponse(HttpStatusCode.OK, response, _parent._jobBoss.jobs.First(jjob => jjob.id == jobId));
-                    break;
-                }
-                SendResponse(HttpStatusCode.OK, response, _parent._jobBoss.jobs);
-                break;
-            case "Tasks/Progress":
-                if (!requestVariables.TryGetValue("jobId", out jobId))
-                {
-                    if(!_parent._jobBoss.jobs.Any(jjob => jjob.id == jobId))
-                        SendResponse(HttpStatusCode.BadRequest, response);
-                    else
-                        SendResponse(HttpStatusCode.OK, response, _parent._jobBoss.jobs.First(jjob => jjob.id == jobId).progressToken);
-                    break;
-                }
-                SendResponse(HttpStatusCode.OK, response, _parent._jobBoss.jobs.Select(jjob => jjob.progressToken));
-                break;
-            case "Tasks/Running":
-                SendResponse(HttpStatusCode.OK, response, _parent._jobBoss.jobs.Where(jjob => jjob.progressToken.state is ProgressToken.State.Running));
-                break;
-            case "Tasks/Waiting":
-                SendResponse(HttpStatusCode.OK, response, _parent._jobBoss.jobs.Where(jjob => jjob.progressToken.state is ProgressToken.State.Standby));
-                break;
-            case "Settings":
-                SendResponse(HttpStatusCode.OK, response, settings);
-                break;
-            case "NotificationConnectors":
-                SendResponse(HttpStatusCode.OK, response, notificationConnectors);
-                break;
-            case "LibraryConnectors":
-                SendResponse(HttpStatusCode.OK, response, libraryConnectors);
-                break;
-            default:
-                SendResponse(HttpStatusCode.BadRequest, response);
-                break;
-        }
-    }
-
-    private void HandlePost(HttpListenerRequest request, Stream content, HttpListenerResponse response)
-    {
-        
-    }
-
-    private void HandleDelete(HttpListenerRequest request, Stream content, HttpListenerResponse response)
-    {
         
+        SendResponse(HttpStatusCode.NotFound, response);
     }
 
     private void SendResponse(HttpStatusCode statusCode, HttpListenerResponse response, object? content = null)
     {
-        Log($"Response: {statusCode} {content}");
+        //logger?.WriteLine(this.GetType().ToString(), $"Sending response: {statusCode}");
         response.StatusCode = (int)statusCode;
         response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With");
         response.AddHeader("Access-Control-Allow-Methods", "GET, POST, DELETE");

Tranga/Tranga.cs

@@ -1,51 +1,22 @@
 using Logging;
 using Tranga.Jobs;
-using Tranga.MangaConnectors;
 
 namespace Tranga;
 
 public partial class Tranga : GlobalBase
 {
     public bool keepRunning;
-    public JobBoss _jobBoss;
+    private JobBoss _jobBoss;
     private Server server;
-    private HashSet<MangaConnector> connectors;
-
+    
     public Tranga(Logger? logger, TrangaSettings settings) : base(logger, settings)
     {
         keepRunning = true;
         _jobBoss = new(this);
-        connectors = new HashSet<MangaConnector>()
-        {  
-            new Manganato(this),
-            new Mangasee(this),
-            new MangaDex(this),
-            new MangaKatana(this)
-        };
         StartJobBoss();
         this.server = new Server(this);
     }
 
-    public MangaConnector? GetConnector(string name)
-    {
-        foreach(MangaConnector mc in connectors)
-            if (mc.name.Equals(name, StringComparison.InvariantCultureIgnoreCase))
-                return mc;
-        return null;
-    }
-
-    public IEnumerable<MangaConnector> GetConnectors()
-    {
-        return connectors;
-    }
-
-    public Publication? GetPublicationById(string internalId)
-    {
-        if (cachedPublications.Exists(publication => publication.internalId == internalId))
-            return cachedPublications.First(publication => publication.internalId == internalId);
-        return null;
-    }
-
     private void StartJobBoss()
     {
         Thread t = new (() =>