From 639ad72fb49ed35a9d3425bdb6163b836a4cb0e7 Mon Sep 17 00:00:00 2001 From: F K <54195004+fredjk-gh@users.noreply.github.com> Date: Sun, 30 Apr 2023 11:49:22 -0400 Subject: [PATCH] 2 Bug Fixes (#112) Add a try-catch in ReadAllLines to handle a read failure if a file is locked. Add a check for a non-existing export folder when exporting and prompt for new path if it doesn't exist. --- ObservatoryCore/LogMonitor.cs | 13 ++++++++++--- ObservatoryCore/UI/ViewModels/CoreViewModel.cs | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ObservatoryCore/LogMonitor.cs b/ObservatoryCore/LogMonitor.cs index 8539835..c1cc760 100644 --- a/ObservatoryCore/LogMonitor.cs +++ b/ObservatoryCore/LogMonitor.cs @@ -420,13 +420,20 @@ namespace Observatory private List ReadAllLines(string path) { var lines = new List(); - using (StreamReader file = new StreamReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) + try { - while (!file.EndOfStream) + using (StreamReader file = new StreamReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) { - lines.Add(file.ReadLine()); + while (!file.EndOfStream) + { + lines.Add(file.ReadLine()); + } } } + catch (IOException ioEx) + { + ReportErrors(new List<(Exception, string, string)>() { (ioEx, path, "") }); + } return lines; } diff --git a/ObservatoryCore/UI/ViewModels/CoreViewModel.cs b/ObservatoryCore/UI/ViewModels/CoreViewModel.cs index 9dd4a87..e6027d6 100644 --- a/ObservatoryCore/UI/ViewModels/CoreViewModel.cs +++ b/ObservatoryCore/UI/ViewModels/CoreViewModel.cs @@ -112,7 +112,7 @@ namespace Observatory.UI.ViewModels try { var exportFolder = Properties.Core.Default.ExportFolder; - if (string.IsNullOrEmpty(exportFolder)) + if (string.IsNullOrEmpty(exportFolder) || !Directory.Exists(exportFolder)) { exportFolder = System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);