Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge
This commit is contained in:
commit
ee265a7519
@ -150,10 +150,9 @@ 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 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),
|
||||||
@ -169,7 +168,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}");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user