glax/Tranga
2
0
Fork 0
Code

Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into Server-V2

Browse Source 
# Conflicts:
#	Tranga/Jobs/JobBoss.cs
This commit is contained in:
Glax 2024-05-26 18:25:08 +02:00
commit 27a559834f
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Tranga/Jobs/JobBoss.cs
View File

@ -150,18 +150,35 @@ public class JobBoss : GlobalBase
//Load json-job-files //Load json-job-files
foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name))) foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name)))
{ {
Job job = JsonConvert.DeserializeObject<Job>(File.ReadAllText(file.FullName), Log($"Adding {file.Name}");
new JobJsonConverter(this, new MangaConnectorJsonConverter(this, connectors)))!; Job? job = JsonConvert.DeserializeObject<Job>(File.ReadAllText(file.FullName),
this.jobs.Add(job); new JobJsonConverter(this, new MangaConnectorJsonConverter(this, connectors)));
if (job is null)
{
string newName = file.FullName + ".failed";
Log($"Failed loading file {file.Name}.\nMoving to {newName}");
File.Move(file.FullName, newName);
}
else
{
Log($"Adding Job {job}");
this.jobs.Add(job);
}
} }
//Load Manga-Files //Load Manga-Files
ImportManga(); ImportManga();
//Connect jobs to parent-jobs //Connect jobs to parent-jobs and add Publications to cache
foreach (Job job in this.jobs) foreach (Job job in this.jobs)
{ {
this.jobs.FirstOrDefault(jjob => jjob.id == job.parentJobId)?.AddSubJob(job); Log($"Loading Job {job}");
Job? parentJob = this.jobs.FirstOrDefault(jjob => jjob.id == job.parentJobId);
if (parentJob is not null)
{
parentJob.AddSubJob(job);
Log($"Parent Job {parentJob}");
}
} }
string[] jobMangaInternalIds = this.jobs.Where(job => job is DownloadNewChapters) string[] jobMangaInternalIds = this.jobs.Where(job => job is DownloadNewChapters)