glax/Tranga
2
0
Fork 0
Code

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

Browse Source
This commit is contained in:
Glax 2024-09-16 22:48:06 +02:00
commit ce1c4d3f65
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Tranga/Jobs/JobBoss.cs
View File

@ -148,7 +148,7 @@ public class JobBoss : GlobalBase
Regex idRex = new (@"(.*)\.json"); 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 new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name)))
{ {
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),
@ -163,6 +163,7 @@ public class JobBoss : GlobalBase
{ {
Log($"Adding Job {job}"); Log($"Adding Job {job}");
this.jobs.Add(job); this.jobs.Add(job);
UpdateJobFile(job, file.Name);
} }
} }
@ -188,42 +189,28 @@ public class JobBoss : GlobalBase
internal void UpdateJobFile(Job job, string? oldFile = null) internal void UpdateJobFile(Job job, string? oldFile = null)
{ {
string newJobFilePath = Path.Join(TrangaSettings.jobsFolderPath, $"{job.id}.json"); 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 try
{ {
Log($"Deleting Job-file {newJobFilePath}"); while(IsFileInUse(oldFilePath))
while(IsFileInUse(newJobFilePath))
Thread.Sleep(10); Thread.Sleep(10);
File.Delete(newJobFilePath); File.Delete(oldFilePath);
} }
catch (Exception e) catch (Exception e)
{ {
Log(e.ToString()); Log(e.ToString());
} }
} }
else
{
Log($"Exporting Job {newJobFilePath}");
string jobStr = JsonConvert.SerializeObject(job, Formatting.Indented);
while(IsFileInUse(newJobFilePath))
Thread.Sleep(10);
File.WriteAllText(newJobFilePath, jobStr);
}
if(oldFile is not null) Log($"Exporting Job {newJobFilePath}");
try string jobStr = JsonConvert.SerializeObject(job, Formatting.Indented);
{ while(IsFileInUse(newJobFilePath))
Log($"Deleting old Job-file {oldFile}"); Thread.Sleep(10);
while(IsFileInUse(oldFile)) File.WriteAllText(newJobFilePath, jobStr);
Thread.Sleep(10);
File.Delete(oldFile);
}
catch (Exception e)
{
Log(e.ToString());
}
} }
private void UpdateAllJobFiles() private void UpdateAllJobFiles()