From 39307f4313633d319a65b1aadca8de403c442432 Mon Sep 17 00:00:00 2001 From: glax Date: Sat, 9 Sep 2023 19:15:20 +0200 Subject: [PATCH] Changed jobs.json to instead be a directory with one file per job #48 --- Tranga/Jobs/JobBoss.cs | 74 +++++++++++++++++++++++++++++++--------- Tranga/TrangaSettings.cs | 2 +- 2 files changed, 59 insertions(+), 17 deletions(-) diff --git a/Tranga/Jobs/JobBoss.cs b/Tranga/Jobs/JobBoss.cs index d3d5583..a54a023 100644 --- a/Tranga/Jobs/JobBoss.cs +++ b/Tranga/Jobs/JobBoss.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using System.Text.RegularExpressions; +using Newtonsoft.Json; using Tranga.MangaConnectors; namespace Tranga.Jobs; @@ -10,16 +11,8 @@ public class JobBoss : GlobalBase public JobBoss(GlobalBase clone, HashSet connectors) : base(clone) { - if (File.Exists(settings.jobsFilePath)) - { - this.jobs = JsonConvert.DeserializeObject>(File.ReadAllText(settings.jobsFilePath), new JobJsonConverter(this, new MangaConnectorJsonConverter(this, connectors)))!; - foreach (Job job in this.jobs) - this.jobs.FirstOrDefault(jjob => jjob.id == job.parentJobId)?.AddSubJob(job); - } - else - this.jobs = new(); - foreach (DownloadNewChapters ncJob in this.jobs.Where(job => job is DownloadNewChapters)) - cachedPublications.Add(ncJob.manga); + this.jobs = new(); + LoadJobsList(connectors); this.mangaConnectorJobQueue = new(); } @@ -148,13 +141,62 @@ public class JobBoss : GlobalBase AddJobToQueue(job); } + public void LoadJobsList(HashSet connectors) + { + Directory.CreateDirectory(settings.jobsFolderPath); + Regex idRex = new (@"(.*)\.json"); + + foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles()) + if (idRex.IsMatch(file.Name)) + { + Job job = JsonConvert.DeserializeObject(File.ReadAllText(file.FullName), + new JobJsonConverter(this, new MangaConnectorJsonConverter(this, connectors)))!; + this.jobs.Add(job); + } + + foreach (Job job in this.jobs) + this.jobs.FirstOrDefault(jjob => jjob.id == job.parentJobId)?.AddSubJob(job); + + foreach (DownloadNewChapters ncJob in this.jobs.Where(job => job is DownloadNewChapters)) + cachedPublications.Add(ncJob.manga); + } + public void ExportJobsList() { - Log($"Exporting {settings.jobsFilePath}"); - string content = JsonConvert.SerializeObject(this.jobs); - while(IsFileInUse(settings.jobsFilePath)) - Thread.Sleep(10); - File.WriteAllText(settings.jobsFilePath, content); + Log("Exporting Jobs"); + foreach (Job job in this.jobs) + { + string jobFilePath = Path.Join(settings.jobsFolderPath, $"{job.id}.json"); + if (!File.Exists(jobFilePath)) + { + string jobStr = JsonConvert.SerializeObject(job); + while(IsFileInUse(jobFilePath)) + Thread.Sleep(10); + Log($"Exporting Job {jobFilePath}"); + File.WriteAllText(jobFilePath, jobStr); + } + } + + //Remove files with jobs not in this.jobs-list + Regex idRex = new (@"(.*)\.json"); + foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles()) + { + if (idRex.IsMatch(file.Name)) + { + string id = idRex.Match(file.Name).Groups[1].Value; + if (!this.jobs.Any(job => job.id == id)) + { + try + { + file.Delete(); + } + catch (Exception e) + { + Log(e.ToString()); + } + } + } + } } public void CheckJobs() diff --git a/Tranga/TrangaSettings.cs b/Tranga/TrangaSettings.cs index 96e8fed..cb62cf6 100644 --- a/Tranga/TrangaSettings.cs +++ b/Tranga/TrangaSettings.cs @@ -14,7 +14,7 @@ public class TrangaSettings [JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json"); [JsonIgnore] public string libraryConnectorsFilePath => Path.Join(workingDirectory, "libraryConnectors.json"); [JsonIgnore] public string notificationConnectorsFilePath => Path.Join(workingDirectory, "notificationConnectors.json"); - [JsonIgnore] public string jobsFilePath => Path.Join(workingDirectory, "jobs.json"); + [JsonIgnore] public string jobsFolderPath => Path.Join(workingDirectory, "jobs"); [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache"); public ushort? version { get; set; }