From 84d6e8d121a1b329d26cc0e462aadd1108d99a04 Mon Sep 17 00:00:00 2001 From: jcm <john.moody@coloradocollege.edu> Date: Sat, 10 Feb 2024 19:17:19 -0600 Subject: Standardize logging locations across desktop platforms (#6238) * Standardize logging locations across desktop platforms * Return null instead of empty literal on exceptions * Remove LogDirectoryPath from LoggerModule * Catch exception when creating DirectoryInfo in FileLogTarget * Remove redundant log path vars, handle exception better, add null check * Address styling issues * Remove extra newline, quote file path in log, move directory check to OpenHelper * Add GetOrCreateLogsDir to get/create log directory during runtime * misc format changes * Update src/Ryujinx.Common/Configuration/AppDataManager.cs --------- Co-authored-by: jcm <butt@butts.com> Co-authored-by: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Co-authored-by: Ac_K <Acoustik666@gmail.com> --- src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs') diff --git a/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs index 2caee16c..243d870a 100644 --- a/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs @@ -1350,16 +1350,11 @@ namespace Ryujinx.Ava.UI.ViewModels public void OpenLogsFolder() { - string logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Logs"); - - if (LoggerModule.LogDirectoryPath != null) + string logPath = AppDataManager.GetOrCreateLogsDir(); + if (!string.IsNullOrEmpty(logPath)) { - logPath = LoggerModule.LogDirectoryPath; + OpenHelper.OpenFolder(logPath); } - - new DirectoryInfo(logPath).Create(); - - OpenHelper.OpenFolder(logPath); } public void ToggleDockMode() -- cgit v1.2.3-70-g09d2