Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge
This commit is contained in:
commit
ce1c4d3f65
@ -163,6 +163,7 @@ public class JobBoss : GlobalBase
|
||||
{
|
||||
Log($"Adding Job {job}");
|
||||
this.jobs.Add(job);
|
||||
UpdateJobFile(job, file.Name);
|
||||
}
|
||||
}
|
||||
|
||||
@ -188,23 +189,23 @@ public class JobBoss : GlobalBase
|
||||
internal void UpdateJobFile(Job job, string? oldFile = null)
|
||||
{
|
||||
string newJobFilePath = Path.Join(TrangaSettings.jobsFolderPath, $"{job.id}.json");
|
||||
string oldFilePath = Path.Join(TrangaSettings.jobsFolderPath, oldFile);
|
||||
|
||||
if (!this.jobs.Any(jjob => jjob.id == job.id))
|
||||
if (File.Exists(oldFilePath))
|
||||
{
|
||||
Log($"Deleting Job-file {oldFilePath}");
|
||||
try
|
||||
{
|
||||
Log($"Deleting Job-file {newJobFilePath}");
|
||||
while(IsFileInUse(newJobFilePath))
|
||||
while(IsFileInUse(oldFilePath))
|
||||
Thread.Sleep(10);
|
||||
File.Delete(newJobFilePath);
|
||||
File.Delete(oldFilePath);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log(e.ToString());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Log($"Exporting Job {newJobFilePath}");
|
||||
string jobStr = JsonConvert.SerializeObject(job, Formatting.Indented);
|
||||
while(IsFileInUse(newJobFilePath))
|
||||
@ -212,20 +213,6 @@ public class JobBoss : GlobalBase
|
||||
File.WriteAllText(newJobFilePath, jobStr);
|
||||
}
|
||||
|
||||
if(oldFile is not null)
|
||||
try
|
||||
{
|
||||
Log($"Deleting old Job-file {oldFile}");
|
||||
while(IsFileInUse(oldFile))
|
||||
Thread.Sleep(10);
|
||||
File.Delete(oldFile);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateAllJobFiles()
|
||||
{
|
||||
Log("Exporting Jobs");
|
||||
|
Loading…
Reference in New Issue
Block a user