Refactor Controllers

SettingsController.cs

SearchController.cs

QueryController.cs

NotificationConnectorController.cs

MetadataFetcherController.cs

MangaConnectorController.cs

FileLibraryController

LibraryConnectors

WorkerController

API/Schema/LibraryContext/LibraryConnectors/Kavita.cs

@@ -6,7 +6,7 @@ namespace API.Schema.LibraryContext.LibraryConnectors;
 public class Kavita : LibraryConnector
 {
 
-    public Kavita(string baseUrl, string auth) : base(TokenGen.CreateToken(typeof(Kavita), baseUrl), LibraryType.Kavita, baseUrl, auth)
+    public Kavita(string baseUrl, string auth) : base(LibraryType.Kavita, baseUrl, auth)
     {
     }
     

API/Schema/LibraryContext/LibraryConnectors/Komga.cs

@@ -5,8 +5,7 @@ namespace API.Schema.LibraryContext.LibraryConnectors;
 
 public class Komga : LibraryConnector
 {
-    public Komga(string baseUrl, string auth) : base(TokenGen.CreateToken(typeof(Komga), baseUrl), LibraryType.Komga,
-        baseUrl, auth)
+    public Komga(string baseUrl, string auth) : base(LibraryType.Komga, baseUrl, auth)
     {
     }
     

API/Schema/LibraryContext/LibraryConnectors/LibraryConnector.cs

@@ -7,26 +7,51 @@ using Newtonsoft.Json;
 namespace API.Schema.LibraryContext.LibraryConnectors;
 
 [PrimaryKey("LibraryConnectorId")]
-public abstract class LibraryConnector(string libraryConnectorId, LibraryType libraryType, string baseUrl, string auth)
+public abstract class LibraryConnector : Identifiable
 {
-    [StringLength(64)]
     [Required]
-    public string LibraryConnectorId { get; } = libraryConnectorId;
-
-    [Required]
-    public LibraryType LibraryType { get; init; } = libraryType;
+    public LibraryType LibraryType { get; init; }
     [StringLength(256)]
     [Required]
     [Url]
-    public string BaseUrl { get; init; } = baseUrl;
+    public string BaseUrl { get; init; }
     [StringLength(256)]
     [Required]
-    public string Auth { get; init; } = auth;
+    public string Auth { get; init; }
     
     [JsonIgnore]
     [NotMapped]
-    protected ILog Log { get; init; } = LogManager.GetLogger($"{libraryType.ToString()} {baseUrl}");
+    protected ILog Log { get; init; }
+
+    protected LibraryConnector(LibraryType libraryType, string baseUrl, string auth)
+        : base()
+    {
+        this.LibraryType = libraryType;
+        this.BaseUrl = baseUrl;
+        this.Auth = auth;
+        this.Log = LogManager.GetLogger(GetType());
+    }
+
+    /// <summary>
+    /// EF CORE ONLY!!!!
+    /// </summary>
+    internal LibraryConnector(string key, LibraryType libraryType, string baseUrl, string auth)
+        : base(key)
+    {
+        this.LibraryType = libraryType;
+        this.BaseUrl = baseUrl;
+        this.Auth = auth;
+        this.Log = LogManager.GetLogger(GetType());
+    }
+
+    public override string ToString() => $"{base.ToString()} {this.LibraryType} {this.BaseUrl}";
     
     protected abstract void UpdateLibraryInternal();
     internal abstract bool Test();
+}
+
+public enum LibraryType : byte
+{
+    Komga = 0,
+    Kavita = 1
 }

API/Schema/LibraryContext/LibraryConnectors/LibraryType.cs

@@ -1,7 +0,0 @@
-namespace API.Schema.LibraryContext.LibraryConnectors;
-
-public enum LibraryType : byte
-{
-    Komga = 0,
-    Kavita = 1
-}

API/Schema/MangaContext/MangaContext.cs

@@ -8,7 +8,7 @@ public class MangaContext(DbContextOptions<MangaContext> options) : TrangaBaseCo
 {
     public DbSet<MangaConnector> MangaConnectors { get; set; }
     public DbSet<Manga> Mangas { get; set; }
-    public DbSet<FileLibrary> LocalLibraries { get; set; }
+    public DbSet<FileLibrary> FileLibraries { get; set; }
     public DbSet<Chapter> Chapters { get; set; }
     public DbSet<Author> Authors { get; set; }
     public DbSet<MangaTag> Tags { get; set; }

API/Schema/MangaContext/MetadataFetchers/MetadataEntry.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace API.Schema.MangaContext.MetadataFetchers;
 
-[PrimaryKey("MetadataFetcherName", "Identifier")]
+[PrimaryKey("Name", "Identifier")]
 public class MetadataEntry
 {
     [JsonIgnore]
@@ -19,7 +19,7 @@ public class MetadataEntry
         this.Manga = manga;
         this.MangaId = manga.Key;
         this.MetadataFetcher = fetcher;
-        this.MetadataFetcherName = fetcher.MetadataFetcherName;
+        this.MetadataFetcherName = fetcher.Name;
         this.Identifier = identifier;
     }
 

API/Schema/MangaContext/MetadataFetchers/MetadataFetcher.cs

@@ -2,23 +2,23 @@ using Microsoft.EntityFrameworkCore;
 
 namespace API.Schema.MangaContext.MetadataFetchers;
 
-[PrimaryKey("MetadataFetcherName")]
+[PrimaryKey("Name")]
 public abstract class MetadataFetcher
 {
     // ReSharper disable once EntityFramework.ModelValidation.UnlimitedStringLength
-    public string MetadataFetcherName { get; init; }
+    public string Name { get; init; }
 
     protected MetadataFetcher()
     {
-        this.MetadataFetcherName = this.GetType().Name;
+        this.Name = this.GetType().Name;
     }
     
     /// <summary>
     /// EFCORE ONLY!!!
     /// </summary>
-    internal MetadataFetcher(string metadataFetcherName)
+    internal MetadataFetcher(string name)
     {
-        this.MetadataFetcherName = metadataFetcherName;
+        this.Name = name;
     }
 
     internal MetadataEntry CreateMetadataEntry(Manga manga, string identifier) =>