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-11-02 16:25:49 +01:00
commit 5018800d09
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tranga/Jobs/JobBoss.cs
View File

@ -148,13 +148,12 @@ public class JobBoss : GlobalBase
File.SetUnixFileMode(TrangaSettings.jobsFolderPath, UserRead | UserWrite | UserExecute | GroupRead | OtherRead); File.SetUnixFileMode(TrangaSettings.jobsFolderPath, UserRead | UserWrite | UserExecute | GroupRead | OtherRead);
if (!Directory.Exists(TrangaSettings.jobsFolderPath)) //No jobs to load if (!Directory.Exists(TrangaSettings.jobsFolderPath)) //No jobs to load
return; return;
Regex idRex = new (@"(.*)\.json");
//Load Manga-Files //Load Manga-Files
ImportManga(); ImportManga();
//Load json-job-files //Load json-job-files
foreach (FileInfo file in new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name))) foreach (FileInfo file in Directory.GetFiles(TrangaSettings.jobsFolderPath, "*.json").Select(f => new FileInfo(f)))
{ {
Log($"Adding {file.Name}"); Log($"Adding {file.Name}");
Job? job = JsonConvert.DeserializeObject<Job>(File.ReadAllText(file.FullName), Job? job = JsonConvert.DeserializeObject<Job>(File.ReadAllText(file.FullName),
@ -170,7 +169,7 @@ public class JobBoss : GlobalBase
Log($"Adding Job {job}"); Log($"Adding Job {job}");
if (!AddJob(job, file.FullName)) //If we detect a duplicate, delete the file. if (!AddJob(job, file.FullName)) //If we detect a duplicate, delete the file.
{ {
string path = string.Concat(file.FullName, ".failed"); string path = string.Concat(file.FullName, ".duplicate");
file.MoveTo(path); file.MoveTo(path);
Log($"Duplicate detected or otherwise not able to add job to list.\nMoved job {job} to {path}"); Log($"Duplicate detected or otherwise not able to add job to list.\nMoved job {job} to {path}");
} }