From 3d6657b483c62f6feb4fa6bb248ace9dcdd40b41 Mon Sep 17 00:00:00 2001 From: glax Date: Sun, 30 Jul 2023 23:31:25 +0200 Subject: [PATCH] Moved libraryManagers, notificationManagers and logger to commonObjects class. --- API/Program.cs | 20 ++-- Tranga/CommonObjects.cs | 117 ++++++++++++++++++++++ Tranga/Connectors/Connector.cs | 22 ++-- Tranga/Connectors/MangaDex.cs | 24 ++--- Tranga/Connectors/MangaKatana.cs | 12 +-- Tranga/Connectors/Manganato.cs | 12 +-- Tranga/Connectors/Mangasee.cs | 26 ++--- Tranga/TaskManager.cs | 46 +++++---- Tranga/TrangaSettings.cs | 75 +++++--------- Tranga/TrangaTasks/DownloadChapterTask.cs | 4 +- Tranga/TrangaTasks/TrangaTask.cs | 4 +- 11 files changed, 229 insertions(+), 133 deletions(-) create mode 100644 Tranga/CommonObjects.cs diff --git a/API/Program.cs b/API/Program.cs index da4f4bf..c2e0237 100644 --- a/API/Program.cs +++ b/API/Program.cs @@ -27,25 +27,25 @@ public static class Program TrangaSettings settings; if (File.Exists(settingsFilePath)) - settings = TrangaSettings.LoadSettings(settingsFilePath, logger); + settings = TrangaSettings.LoadSettings(settingsFilePath); else - settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet(), new HashSet(), logger); + settings = new TrangaSettings(downloadFolderPath, applicationFolderPath); Directory.CreateDirectory(settings.workingDirectory); Directory.CreateDirectory(settings.downloadLocation); Directory.CreateDirectory(settings.coverImageCache); - settings.logger?.WriteLine("Tranga",$"Application-Folder: {settings.workingDirectory}"); - settings.logger?.WriteLine("Tranga",$"Settings-File-Path: {settings.settingsFilePath}"); - settings.logger?.WriteLine("Tranga",$"Download-Folder-Path: {settings.downloadLocation}"); - settings.logger?.WriteLine("Tranga",$"Logfile-Path: {logFilePath}"); - settings.logger?.WriteLine("Tranga",$"Image-Cache-Path: {settings.coverImageCache}"); + logger.WriteLine("Tranga",$"Application-Folder: {settings.workingDirectory}"); + logger.WriteLine("Tranga",$"Settings-File-Path: {settings.settingsFilePath}"); + logger.WriteLine("Tranga",$"Download-Folder-Path: {settings.downloadLocation}"); + logger.WriteLine("Tranga",$"Logfile-Path: {logFilePath}"); + logger.WriteLine("Tranga",$"Image-Cache-Path: {settings.coverImageCache}"); - settings.logger?.WriteLine("Tranga", "Loading Taskmanager."); - TaskManager taskManager = new (settings); + logger.WriteLine("Tranga", "Loading Taskmanager."); + TaskManager taskManager = new (settings, logger); Server server = new (6531, taskManager); - foreach(NotificationManager nm in taskManager.settings.notificationManagers) + foreach(NotificationManager nm in taskManager.commonObjects.notificationManagers) nm.SendNotification("Tranga-API", "Started Tranga-API"); } } diff --git a/Tranga/CommonObjects.cs b/Tranga/CommonObjects.cs new file mode 100644 index 0000000..c4f12bd --- /dev/null +++ b/Tranga/CommonObjects.cs @@ -0,0 +1,117 @@ +using Logging; +using Newtonsoft.Json; +using Tranga.LibraryManagers; +using Tranga.NotificationManagers; + +namespace Tranga; + +public class CommonObjects +{ + public HashSet libraryManagers { get; init; } + public HashSet notificationManagers { get; init; } + public Logger? logger { get; init; } + [JsonIgnore]private string settingsFilePath { get; init; } + + public CommonObjects(HashSet? libraryManagers, HashSet? notificationManagers, Logger? logger, string settingsFilePath) + { + this.libraryManagers = libraryManagers??new(); + this.notificationManagers = notificationManagers??new(); + this.logger = logger; + this.settingsFilePath = settingsFilePath; + } + + public static CommonObjects LoadSettings(string settingsFilePath, Logger? logger) + { + if (!File.Exists(settingsFilePath)) + return new CommonObjects(null, null, logger, settingsFilePath); + + string toRead = File.ReadAllText(settingsFilePath); + TrangaSettings.SettingsJsonObject settings = JsonConvert.DeserializeObject( + toRead, + new JsonSerializerSettings + { + Converters = + { + new NotificationManager.NotificationManagerJsonConverter(), + new LibraryManager.LibraryManagerJsonConverter() + } + })!; + + if(settings.co is null) + return new CommonObjects(null, null, logger, settingsFilePath); + + if (logger is not null) + { + foreach (LibraryManager lm in settings.co.libraryManagers) + lm.AddLogger(logger); + foreach(NotificationManager nm in settings.co.notificationManagers) + nm.AddLogger(logger); + } + + return settings.co; + } + + public void ExportSettings() + { + if (File.Exists(settingsFilePath)) + { + bool inUse = true; + while (inUse) + { + try + { + using FileStream stream = new (settingsFilePath, FileMode.Open, FileAccess.Read, FileShare.None); + stream.Close(); + inUse = false; + } + catch (IOException) + { + inUse = true; + Thread.Sleep(50); + } + } + } + + string toRead = File.ReadAllText(settingsFilePath); + TrangaSettings.SettingsJsonObject? settings = JsonConvert.DeserializeObject(toRead, + new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } }); + settings = new TrangaSettings.SettingsJsonObject(settings?.ts, this); + File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(settings)); + } + + public void UpdateSettings(TrangaSettings.UpdateField field, params string[] values) + { + switch (field) + { + case TrangaSettings.UpdateField.Komga: + if (values.Length != 2) + return; + libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga)); + libraryManagers.Add(new Komga(values[0], values[1], this.logger)); + break; + case TrangaSettings.UpdateField.Kavita: + if (values.Length != 3) + return; + libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita)); + libraryManagers.Add(new Kavita(values[0], values[1], values[2], this.logger)); + break; + case TrangaSettings.UpdateField.Gotify: + if (values.Length != 2) + return; + notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(Gotify)); + Gotify newGotify = new(values[0], values[1], this.logger); + notificationManagers.Add(newGotify); + newGotify.SendNotification("Success!", "Gotify was added to Tranga!"); + break; + case TrangaSettings.UpdateField.LunaSea: + if(values.Length != 1) + return; + notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(LunaSea)); + LunaSea newLunaSea = new(values[0], this.logger); + notificationManagers.Add(newLunaSea); + newLunaSea.SendNotification("Success!", "LunaSea was added to Tranga!"); + break; + } + ExportSettings(); + } +} \ No newline at end of file diff --git a/Tranga/Connectors/Connector.cs b/Tranga/Connectors/Connector.cs index 9233409..391eaa9 100644 --- a/Tranga/Connectors/Connector.cs +++ b/Tranga/Connectors/Connector.cs @@ -14,12 +14,14 @@ namespace Tranga.Connectors; /// public abstract class Connector { + protected CommonObjects commonObjects; protected TrangaSettings settings { get; } internal DownloadClient downloadClient { get; init; } = null!; - protected Connector(TrangaSettings settings) + protected Connector(TrangaSettings settings, CommonObjects commonObjects) { this.settings = settings; + this.commonObjects = commonObjects; if (!Directory.Exists(settings.coverImageCache)) Directory.CreateDirectory(settings.coverImageCache); } @@ -63,11 +65,11 @@ public abstract class Connector Chapter[] newChapters = this.GetChapters(publication, language); collection.Add(publication); NumberFormatInfo decimalPoint = new (){ NumberDecimalSeparator = "." }; - settings.logger?.WriteLine(this.GetType().ToString(), "Checking for duplicates"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Checking for duplicates"); List newChaptersList = newChapters.Where(nChapter => float.Parse(nChapter.chapterNumber, decimalPoint) > publication.ignoreChaptersBelow && !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList(); - settings.logger?.WriteLine(this.GetType().ToString(), $"{newChaptersList.Count} new chapters."); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"{newChaptersList.Count} new chapters."); return newChaptersList; } @@ -161,19 +163,19 @@ public abstract class Connector /// Publication to retrieve Cover for public void CopyCoverFromCacheToDownloadLocation(Publication publication) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}"); //Check if Publication already has a Folder and cover string publicationFolder = publication.CreatePublicationFolder(settings.downloadLocation); DirectoryInfo dirInfo = new (publicationFolder); if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase))) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Cover exists {publication.sortName}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Cover exists {publication.sortName}"); return; } string fileInCache = Path.Join(settings.coverImageCache, publication.coverFileNameInCache); string newFilePath = Path.Join(publicationFolder, $"cover.{Path.GetFileName(fileInCache).Split('.')[^1]}" ); - settings.logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {fileInCache} -> {newFilePath}"); + commonObjects.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); @@ -211,7 +213,7 @@ public abstract class Connector { if (cancellationToken?.IsCancellationRequested ?? false) return HttpStatusCode.RequestTimeout; - settings.logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}"); + commonObjects.logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}"); //Check if Publication Directory already exists string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!; if (!Directory.Exists(directoryPath)) @@ -229,7 +231,7 @@ public abstract class Connector { string[] split = imageUrl.Split('.'); string extension = split[^1]; - settings.logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}"); + commonObjects.logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}"); HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer); if ((int)status < 200 || (int)status >= 300) return status; @@ -241,7 +243,7 @@ public abstract class Connector if(comicInfoPath is not null) File.Copy(comicInfoPath, Path.Join(tempFolder, "ComicInfo.xml")); - settings.logger?.WriteLine("Connector", $"Creating archive {saveArchiveFilePath}"); + commonObjects.logger?.WriteLine("Connector", $"Creating archive {saveArchiveFilePath}"); //ZIP-it and ship-it ZipFile.CreateFromDirectory(tempFolder, saveArchiveFilePath); if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) @@ -263,7 +265,7 @@ public abstract class Connector using MemoryStream ms = new(); coverResult.result.CopyTo(ms); File.WriteAllBytes(saveImagePath, ms.ToArray()); - settings.logger?.WriteLine(this.GetType().ToString(), $"Saving image to {saveImagePath}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Saving image to {saveImagePath}"); return filename; } } \ No newline at end of file diff --git a/Tranga/Connectors/MangaDex.cs b/Tranga/Connectors/MangaDex.cs index 4ff9d2c..b63f7a3 100644 --- a/Tranga/Connectors/MangaDex.cs +++ b/Tranga/Connectors/MangaDex.cs @@ -18,7 +18,7 @@ public class MangaDex : Connector Author, } - public MangaDex(TrangaSettings settings) : base(settings) + public MangaDex(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects) { name = "MangaDex"; this.downloadClient = new DownloadClient(new Dictionary() @@ -28,12 +28,12 @@ public class MangaDex : Connector {(byte)RequestType.AtHomeServer, 40}, {(byte)RequestType.CoverUrl, 250}, {(byte)RequestType.Author, 250} - }, settings.logger); + }, commonObjects.logger); } protected override Publication[] GetPublicationsInternal(string publicationTitle = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); const int limit = 100; //How many values we want returned at once int offset = 0; //"Page" int total = int.MaxValue; //How many total results are there, is updated on first request @@ -59,7 +59,7 @@ public class MangaDex : Connector //Loop each Manga and extract information from JSON foreach (JsonNode? mangeNode in mangaInResult) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting publication data. {++loadedPublicationData}/{total}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting publication data. {++loadedPublicationData}/{total}"); JsonObject manga = (JsonObject)mangeNode!; JsonObject attributes = manga["attributes"]!.AsObject(); @@ -146,13 +146,13 @@ public class MangaDex : Connector } } - settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting publications (title={publicationTitle})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting publications (title={publicationTitle})"); return publications.ToArray(); } public override Chapter[] GetChapters(Publication publication, string language = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})"); const int limit = 100; //How many values we want returned at once int offset = 0; //"Page" int total = int.MaxValue; //How many total results are there, is updated on first request @@ -203,7 +203,7 @@ public class MangaDex : Connector { NumberDecimalSeparator = "." }; - settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting {chapters.Count} Chapters for {publication.internalId}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting {chapters.Count} Chapters for {publication.internalId}"); return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray(); } @@ -211,7 +211,7 @@ public class MangaDex : Connector { if (cancellationToken?.IsCancellationRequested ?? false) return HttpStatusCode.RequestTimeout; - settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); //Request URLs for Chapter-Images DownloadClient.RequestResult requestResult = downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false'", (byte)RequestType.AtHomeServer); @@ -238,10 +238,10 @@ public class MangaDex : Connector private string? GetCoverUrl(string publicationId, string? posterId) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting CoverUrl for {publicationId}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting CoverUrl for {publicationId}"); if (posterId is null) { - settings.logger?.WriteLine(this.GetType().ToString(), $"No posterId, aborting"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"No posterId, aborting"); return null; } @@ -257,7 +257,7 @@ public class MangaDex : Connector string fileName = result["data"]!["attributes"]!["fileName"]!.GetValue(); string coverUrl = $"https://uploads.mangadex.org/covers/{publicationId}/{fileName}"; - settings.logger?.WriteLine(this.GetType().ToString(), $"Got Cover-Url for {publicationId} -> {coverUrl}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Got Cover-Url for {publicationId} -> {coverUrl}"); return coverUrl; } @@ -276,7 +276,7 @@ public class MangaDex : Connector string authorName = result["data"]!["attributes"]!["name"]!.GetValue(); ret.Add(authorName); - settings.logger?.WriteLine(this.GetType().ToString(), $"Got author {authorId} -> {authorName}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Got author {authorId} -> {authorName}"); } return ret; } diff --git a/Tranga/Connectors/MangaKatana.cs b/Tranga/Connectors/MangaKatana.cs index 93a0441..e5cec4d 100644 --- a/Tranga/Connectors/MangaKatana.cs +++ b/Tranga/Connectors/MangaKatana.cs @@ -10,18 +10,18 @@ public class MangaKatana : Connector { public override string name { get; } - public MangaKatana(TrangaSettings settings) : base(settings) + public MangaKatana(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects) { this.name = "MangaKatana"; this.downloadClient = new DownloadClient(new Dictionary() { {1, 60} - }, settings.logger); + }, commonObjects.logger); } protected override Publication[] GetPublicationsInternal(string publicationTitle = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '_'); string requestUrl = $"https://mangakatana.com/?search={sanitizedTitle}&search_by=book_name"; DownloadClient.RequestResult requestResult = @@ -135,7 +135,7 @@ public class MangaKatana : Connector public override Chapter[] GetChapters(Publication publication, string language = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})"); string requestUrl = $"https://mangakatana.com/manga/{publication.publicationId}"; // Leaving this in for verification if the page exists DownloadClient.RequestResult requestResult = @@ -149,7 +149,7 @@ public class MangaKatana : Connector NumberDecimalSeparator = "." }; List chapters = ParseChaptersFromHtml(publication, requestUrl); - settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}"); return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray(); } @@ -182,7 +182,7 @@ public class MangaKatana : Connector { if (cancellationToken?.IsCancellationRequested ?? false) return HttpStatusCode.RequestTimeout; - settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); string requestUrl = chapter.url; // Leaving this in to check if the page exists DownloadClient.RequestResult requestResult = diff --git a/Tranga/Connectors/Manganato.cs b/Tranga/Connectors/Manganato.cs index 19baee7..cfc9791 100644 --- a/Tranga/Connectors/Manganato.cs +++ b/Tranga/Connectors/Manganato.cs @@ -10,18 +10,18 @@ public class Manganato : Connector { public override string name { get; } - public Manganato(TrangaSettings settings) : base(settings) + public Manganato(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects) { this.name = "Manganato"; this.downloadClient = new DownloadClient(new Dictionary() { {1, 60} - }, settings.logger); + }, commonObjects.logger); } protected override Publication[] GetPublicationsInternal(string publicationTitle = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); string sanitizedTitle = string.Join('_', Regex.Matches(publicationTitle, "[A-z]*")).ToLower(); string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}"; DownloadClient.RequestResult requestResult = @@ -125,7 +125,7 @@ public class Manganato : Connector public override Chapter[] GetChapters(Publication publication, string language = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})"); string requestUrl = $"https://chapmanganato.com/{publication.publicationId}"; DownloadClient.RequestResult requestResult = downloadClient.MakeRequest(requestUrl, 1); @@ -138,7 +138,7 @@ public class Manganato : Connector NumberDecimalSeparator = "." }; List chapters = ParseChaptersFromHtml(publication, requestResult.result); - settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}"); return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray(); } @@ -171,7 +171,7 @@ public class Manganato : Connector { if (cancellationToken?.IsCancellationRequested ?? false) return HttpStatusCode.RequestTimeout; - settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); string requestUrl = chapter.url; DownloadClient.RequestResult requestResult = downloadClient.MakeRequest(requestUrl, 1); diff --git a/Tranga/Connectors/Mangasee.cs b/Tranga/Connectors/Mangasee.cs index c82dd7b..ea9de48 100644 --- a/Tranga/Connectors/Mangasee.cs +++ b/Tranga/Connectors/Mangasee.cs @@ -15,13 +15,13 @@ public class Mangasee : Connector private IBrowser? _browser; private const string ChromiumVersion = "1154303"; - public Mangasee(TrangaSettings settings) : base(settings) + public Mangasee(TrangaSettings settings, CommonObjects commonObjects) : base(settings, commonObjects) { this.name = "Mangasee"; this.downloadClient = new DownloadClient(new Dictionary() { { 1, 60 } - }, settings.logger); + }, commonObjects.logger); Task d = new Task(DownloadBrowser); d.Start(); @@ -34,31 +34,31 @@ public class Mangasee : Connector browserFetcher.Remove(rev); if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion)) { - settings.logger?.WriteLine(this.GetType().ToString(), "Downloading headless browser"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Downloading headless browser"); DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5)); browserFetcher.DownloadProgressChanged += (_, args) => { double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive); if (args.TotalBytesToReceive == args.BytesReceived) { - settings.logger?.WriteLine(this.GetType().ToString(), "Browser downloaded."); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Browser downloaded."); } else if (DateTime.Now > last.AddSeconds(5)) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Browser download progress: {currentBytes:P2}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Browser download progress: {currentBytes:P2}"); last = DateTime.Now; } }; if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Can't download browser version {ChromiumVersion}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Can't download browser version {ChromiumVersion}"); return; } await browserFetcher.DownloadAsync(ChromiumVersion); } - settings.logger?.WriteLine(this.GetType().ToString(), "Starting browser."); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Starting browser."); this._browser = await Puppeteer.LaunchAsync(new LaunchOptions { Headless = true, @@ -73,7 +73,7 @@ public class Mangasee : Connector protected override Publication[] GetPublicationsInternal(string publicationTitle = "") { - settings.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})"); string requestUrl = $"https://mangasee123.com/_search.php"; DownloadClient.RequestResult requestResult = downloadClient.MakeRequest(requestUrl, 1); @@ -98,7 +98,7 @@ public class Mangasee : Connector queryFiltered = queryFiltered.Where(item => item.Value >= publicationTitle.Split(' ').Length - 1) .ToDictionary(item => item.Key, item => item.Value); - settings.logger?.WriteLine(this.GetType().ToString(), $"Got {queryFiltered.Count} Publications (title={publicationTitle})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Got {queryFiltered.Count} Publications (title={publicationTitle})"); HashSet ret = new(); List orderedFiltered = @@ -111,7 +111,7 @@ public class Mangasee : Connector downloadClient.MakeRequest($"https://mangasee123.com/manga/{orderedItem.i}", 1); if ((int)requestResult.statusCode >= 200 || (int)requestResult.statusCode < 300) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Retrieving Publication info: {orderedItem.s} {index++}/{orderedFiltered.Count}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Retrieving Publication info: {orderedItem.s} {index++}/{orderedFiltered.Count}"); ret.Add(ParseSinglePublicationFromHtml(requestResult.result, orderedItem.s, orderedItem.i, orderedItem.a)); } } @@ -235,7 +235,7 @@ public class Mangasee : Connector { NumberDecimalSeparator = "." }; - settings.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}"); return ret.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray(); } @@ -245,13 +245,13 @@ public class Mangasee : Connector return HttpStatusCode.RequestTimeout; while (this._browser is null && !(cancellationToken?.IsCancellationRequested??false)) { - settings.logger?.WriteLine(this.GetType().ToString(), "Waiting for headless browser to download..."); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Waiting for headless browser to download..."); Thread.Sleep(1000); } if (cancellationToken?.IsCancellationRequested??false) return HttpStatusCode.RequestTimeout; - settings.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}"); IPage page = _browser!.NewPageAsync().Result; IResponse response = page.GoToAsync(chapter.url).Result; if (response.Ok) diff --git a/Tranga/TaskManager.cs b/Tranga/TaskManager.cs index 11c12d5..132f929 100644 --- a/Tranga/TaskManager.cs +++ b/Tranga/TaskManager.cs @@ -16,21 +16,23 @@ public class TaskManager private bool _continueRunning = true; private readonly Connector[] _connectors; public TrangaSettings settings { get; } + public CommonObjects commonObjects { get; init; } - public TaskManager(TrangaSettings settings) + public TaskManager(TrangaSettings settings, Logging.Logger? logger) { - settings.logger?.WriteLine("Tranga", value: "\n"+ - @"-----------------------------------------------------------------"+"\n"+ - @" |¯¯¯¯¯¯|°|¯¯¯¯¯¯\ /¯¯¯¯¯¯| |¯¯¯\|¯¯¯| /¯¯¯¯¯¯\' /¯¯¯¯¯¯| "+"\n"+ - @" | | | x <|' / ! | | '| | (/¯¯¯\° / ! | "+ "\n"+ - @" ¯|__|¯ |__|\\__\\ /___/¯|_'| |___|\\__| \\_____/' /___/¯|_'| "+ "\n"+ - @"-----------------------------------------------------------------"); + commonObjects = CommonObjects.LoadSettings(settings.settingsFilePath, logger); + commonObjects.logger?.WriteLine("Tranga", value: "\n"+ + @"-----------------------------------------------------------------"+"\n"+ + @" |¯¯¯¯¯¯|°|¯¯¯¯¯¯\ /¯¯¯¯¯¯| |¯¯¯\|¯¯¯| /¯¯¯¯¯¯\' /¯¯¯¯¯¯| "+"\n"+ + @" | | | x <|' / ! | | '| | (/¯¯¯\° / ! | "+ "\n"+ + @" ¯|__|¯ |__|\\__\\ /___/¯|_'| |___|\\__| \\_____/' /___/¯|_'| "+ "\n"+ + @"-----------------------------------------------------------------"); this._connectors = new Connector[] { - new MangaDex(settings), - new Manganato(settings), - new Mangasee(settings), - new MangaKatana(settings) + new MangaDex(settings, commonObjects), + new Manganato(settings, commonObjects), + new Mangasee(settings, commonObjects), + new MangaKatana(settings, commonObjects) }; this.settings = settings; @@ -47,7 +49,7 @@ public class TaskManager /// private void TaskCheckerThread() { - settings.logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread."); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread."); int waitingTasksCount = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting); while (_continueRunning) { @@ -146,7 +148,7 @@ public class TaskManager { case TrangaTask.Task.UpdateLibraries: //Only one UpdateKomgaLibrary Task - settings.logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task."); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task."); if (GetTasksMatching(newTask).FirstOrDefault() is { } exists) _allTasks.Remove(exists); _allTasks.Add(newTask); @@ -155,19 +157,19 @@ public class TaskManager default: if (!GetTasksMatching(newTask).Any()) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}"); _allTasks.Add(newTask); ExportDataAndSettings(); } else - settings.logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}"); break; } } public void DeleteTask(TrangaTask removeTask) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}"); if(_allTasks.Contains(removeTask)) _allTasks.Remove(removeTask); removeTask.parentTask?.RemoveChildTask(removeTask); @@ -319,7 +321,7 @@ public class TaskManager /// If force is true, tasks are aborted. public void Shutdown(bool force = false) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Shutting down (forced={force})"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Shutting down (forced={force})"); _continueRunning = false; ExportDataAndSettings(); @@ -329,16 +331,16 @@ public class TaskManager //Wait for tasks to finish while(_allTasks.Any(task => task.state is TrangaTask.ExecutionState.Running or TrangaTask.ExecutionState.Enqueued)) Thread.Sleep(10); - settings.logger?.WriteLine(this.GetType().ToString(), "Tasks finished. Bye!"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Tasks finished. Bye!"); Environment.Exit(0); } private void ImportData() { - settings.logger?.WriteLine(this.GetType().ToString(), "Importing Data"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), "Importing Data"); if (File.Exists(settings.tasksFilePath)) { - settings.logger?.WriteLine(this.GetType().ToString(), $"Importing tasks from {settings.tasksFilePath}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Importing tasks from {settings.tasksFilePath}"); string buffer = File.ReadAllText(settings.tasksFilePath); this._allTasks = JsonConvert.DeserializeObject>(buffer, new JsonSerializerSettings() { Converters = { new TrangaTask.TrangaTaskJsonConverter() } })!; } @@ -359,10 +361,10 @@ public class TaskManager /// private void ExportDataAndSettings() { - settings.logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}"); settings.ExportSettings(); - settings.logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}"); + commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}"); while(IsFileInUse(settings.tasksFilePath)) Thread.Sleep(50); File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks)); diff --git a/Tranga/TrangaSettings.cs b/Tranga/TrangaSettings.cs index fdeddfe..ae1d835 100644 --- a/Tranga/TrangaSettings.cs +++ b/Tranga/TrangaSettings.cs @@ -1,4 +1,5 @@ -using Logging; +using System.Text.Json.Nodes; +using Logging; using Newtonsoft.Json; using Tranga.LibraryManagers; using Tranga.NotificationManagers; @@ -12,41 +13,26 @@ public class TrangaSettings [JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json"); [JsonIgnore] public string tasksFilePath => Path.Join(workingDirectory, "tasks.json"); [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache"); - public HashSet libraryManagers { get; } - public HashSet notificationManagers { get; } public ushort? version { get; set; } - [JsonIgnore] public Logger? logger { get; init; } - public TrangaSettings(string downloadLocation, string workingDirectory, HashSet? libraryManagers, - HashSet? notificationManagers, Logger? logger) + public TrangaSettings(string downloadLocation, string workingDirectory) { 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.libraryManagers = libraryManagers??new(); - this.notificationManagers = notificationManagers??new(); - this.logger = logger; } - public static TrangaSettings LoadSettings(string importFilePath, Logger? logger) + public static TrangaSettings LoadSettings(string importFilePath) { if (!File.Exists(importFilePath)) - return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), - Directory.GetCurrentDirectory(), new HashSet(), new HashSet(), logger); + return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory()); string toRead = File.ReadAllText(importFilePath); - TrangaSettings settings = JsonConvert.DeserializeObject(toRead, + SettingsJsonObject settings = JsonConvert.DeserializeObject(toRead, new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!; - if (logger is not null) - { - foreach (LibraryManager lm in settings.libraryManagers) - lm.AddLogger(logger); - foreach(NotificationManager nm in settings.notificationManagers) - nm.AddLogger(logger); - } + return settings.ts ?? new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory()); - return settings; } public void ExportSettings() @@ -69,7 +55,12 @@ public class TrangaSettings } } } - File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(this)); + + string toRead = File.ReadAllText(settingsFilePath); + SettingsJsonObject? settings = JsonConvert.DeserializeObject(toRead, + new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } }); + settings = new SettingsJsonObject(this, settings?.co); + File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(settings)); } public void UpdateSettings(UpdateField field, params string[] values) @@ -81,37 +72,21 @@ public class TrangaSettings return; this.downloadLocation = values[0]; break; - case UpdateField.Komga: - if (values.Length != 2) - return; - libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga)); - libraryManagers.Add(new Komga(values[0], values[1], this.logger)); - break; - case UpdateField.Kavita: - if (values.Length != 3) - return; - libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita)); - libraryManagers.Add(new Kavita(values[0], values[1], values[2], this.logger)); - break; - case UpdateField.Gotify: - if (values.Length != 2) - return; - notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(Gotify)); - Gotify newGotify = new(values[0], values[1], this.logger); - notificationManagers.Add(newGotify); - newGotify.SendNotification("Success!", "Gotify was added to Tranga!"); - break; - case UpdateField.LunaSea: - if(values.Length != 1) - return; - notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(LunaSea)); - LunaSea newLunaSea = new(values[0], this.logger); - notificationManagers.Add(newLunaSea); - newLunaSea.SendNotification("Success!", "LunaSea was added to Tranga!"); - break; } ExportSettings(); } public enum UpdateField { DownloadLocation, Komga, Kavita, Gotify, LunaSea} + + internal class SettingsJsonObject + { + internal TrangaSettings? ts; + internal CommonObjects? co; + + public SettingsJsonObject(TrangaSettings? ts, CommonObjects? co) + { + this.ts = ts; + this.co = co; + } + } } \ No newline at end of file diff --git a/Tranga/TrangaTasks/DownloadChapterTask.cs b/Tranga/TrangaTasks/DownloadChapterTask.cs index a70e350..8134be6 100644 --- a/Tranga/TrangaTasks/DownloadChapterTask.cs +++ b/Tranga/TrangaTasks/DownloadChapterTask.cs @@ -32,10 +32,10 @@ public class DownloadChapterTask : TrangaTask HttpStatusCode downloadSuccess = connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken); if ((int)downloadSuccess >= 200 && (int)downloadSuccess < 300) { - foreach(NotificationManager nm in taskManager.settings.notificationManagers) + foreach(NotificationManager nm in taskManager.commonObjects.notificationManagers) nm.SendNotification("Chapter downloaded", $"{this.publication.sortName} {this.chapter.chapterNumber} {this.chapter.name}"); - foreach (LibraryManager lm in taskManager.settings.libraryManagers) + foreach (LibraryManager lm in taskManager.commonObjects.libraryManagers) lm.UpdateLibrary(); } return downloadSuccess; diff --git a/Tranga/TrangaTasks/TrangaTask.cs b/Tranga/TrangaTasks/TrangaTask.cs index b3e4e60..189884c 100644 --- a/Tranga/TrangaTasks/TrangaTask.cs +++ b/Tranga/TrangaTasks/TrangaTask.cs @@ -66,7 +66,7 @@ public abstract class TrangaTask /// public void Execute(TaskManager taskManager, CancellationToken? cancellationToken = null) { - taskManager.settings.logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}"); + taskManager.commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}"); this.state = ExecutionState.Running; this.executionStarted = DateTime.Now; this.lastChange = DateTime.Now; @@ -89,7 +89,7 @@ public abstract class TrangaTask if (this is DownloadChapterTask) taskManager.DeleteTask(this); - taskManager.settings.logger?.WriteLine(this.GetType().ToString(), $"Finished Executing Task {this}"); + taskManager.commonObjects.logger?.WriteLine(this.GetType().ToString(), $"Finished Executing Task {this}"); } public void AddChildTask(TrangaTask childTask)