From 7ab4b756d15bd5c705a1719809dbc2217f0d28ca Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 9 Sep 2024 10:26:12 -0700 Subject: [PATCH] Bug Fix --- .../FileHandlers/DownloadWorkItems/FileRead.cs | 3 ++- Adaptation/FileHandlers/json/FileRead.cs | 12 ++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Adaptation/FileHandlers/DownloadWorkItems/FileRead.cs b/Adaptation/FileHandlers/DownloadWorkItems/FileRead.cs index 5ea3a31..b79e85c 100644 --- a/Adaptation/FileHandlers/DownloadWorkItems/FileRead.cs +++ b/Adaptation/FileHandlers/DownloadWorkItems/FileRead.cs @@ -205,7 +205,8 @@ public class FileRead : Shared.FileRead, IFileRead { long tick = DateTime.Now.Ticks; string ids = GetIds(httpClient, basePage, api, query); - DownloadWorkItemsAsync(httpClient, basePage, api, targetFileLocation, ids, tick); + if (!string.IsNullOrEmpty(ids)) + DownloadWorkItemsAsync(httpClient, basePage, api, targetFileLocation, ids, tick); } private void Callback(object state) diff --git a/Adaptation/FileHandlers/json/FileRead.cs b/Adaptation/FileHandlers/json/FileRead.cs index 7f89a2a..18c6fee 100644 --- a/Adaptation/FileHandlers/json/FileRead.cs +++ b/Adaptation/FileHandlers/json/FileRead.cs @@ -110,14 +110,12 @@ public class FileRead : Shared.FileRead, IFileRead private static void ParseWorkItemsAsync(FileConnectorConfiguration fileConnectorConfiguration, string[] alternateTargetFolders, ReadOnlyCollection workItems) { - bool writeFile; string checkFile; string? pathRoot; JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true }; string json = JsonSerializer.Serialize(workItems, jsonSerializerOptions); foreach (string alternateTargetFolder in alternateTargetFolders) { - writeFile = true; if (alternateTargetFolder == fileConnectorConfiguration.TargetFileLocation) continue; pathRoot = Path.GetPathRoot(alternateTargetFolder); @@ -135,10 +133,9 @@ public class FileRead : Shared.FileRead, IFileRead { string old = File.ReadAllText(checkFile); if (old == json) - writeFile = false; + continue; } - if (writeFile) - File.WriteAllText(checkFile, json); + File.WriteAllText(checkFile, json); } } @@ -259,10 +256,9 @@ public class FileRead : Shared.FileRead, IFileRead { string old = File.ReadAllText(checkFile); if (json == old) - { moveFile = false; - File.Delete(reportFullPath); - } + else + File.Delete(checkFile); } if (moveFile) File.Move(reportFullPath, checkFile);