From 209aaca0c0bf5026a6beb080e209abe90d336d38 Mon Sep 17 00:00:00 2001 From: Matt Pannella Date: Tue, 3 Dec 2024 23:14:10 -0500 Subject: [PATCH 1/3] replaced if statements --- src/Program.cs | 13 ++++--- src/models/Settings/Debug.cs | 8 ++++ src/models/Settings/Settings.cs | 1 + src/partials/Program.DisplayModes.cs | 26 ++++++++----- src/partials/Program.GameBoyPalettes.cs | 13 ++++--- src/partials/Program.Helpers.cs | 13 ++++--- src/partials/Program.PocketLibraryImages.cs | 14 ++++--- src/services/ArchiveService.cs | 13 ++++--- src/services/AssetsService.cs | 13 ++++--- src/services/CoreUpdaterService.cs | 13 ++++--- src/services/CoresService.DisplayModes.cs | 13 ++++--- src/services/CoresService.Download.cs | 26 ++++++++----- src/services/CoresService.Extras.cs | 39 ++++++++++++------- .../CoresService.IgnoreInstanceJson.cs | 13 ++++--- src/services/CoresService.Jotego.cs | 13 ++++--- src/services/CoresService.cs | 13 ++++--- 16 files changed, 154 insertions(+), 90 deletions(-) create mode 100644 src/models/Settings/Debug.cs diff --git a/src/Program.cs b/src/Program.cs index 3711a086..3d769176 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -221,11 +221,14 @@ private static void Main(string[] args) catch (Exception e) { Console.WriteLine("Well, something went wrong. Sorry about that."); -#if DEBUG - Console.WriteLine(e); -#else - Console.WriteLine(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(e); + } + else + { + Console.WriteLine(e.Message); + } Pause(); } } diff --git a/src/models/Settings/Debug.cs b/src/models/Settings/Debug.cs new file mode 100644 index 00000000..479facee --- /dev/null +++ b/src/models/Settings/Debug.cs @@ -0,0 +1,8 @@ +using Newtonsoft.Json; + +namespace Pannella.Models.Settings; + +public class Debug +{ + public bool show_stack_traces { get; set; } = false; +} diff --git a/src/models/Settings/Settings.cs b/src/models/Settings/Settings.cs index 5e5b704d..f94c2a65 100644 --- a/src/models/Settings/Settings.cs +++ b/src/models/Settings/Settings.cs @@ -6,6 +6,7 @@ public class Settings { public Config config { get; set; } = new(); public Dictionary core_settings { get; set; } = new(); + public Debug debug { get; set; } = new(); [JsonProperty] private Dictionary coreSettings { set => this.core_settings = value; } diff --git a/src/partials/Program.DisplayModes.cs b/src/partials/Program.DisplayModes.cs index c29176ec..2dc280e7 100644 --- a/src/partials/Program.DisplayModes.cs +++ b/src/partials/Program.DisplayModes.cs @@ -33,11 +33,14 @@ private static void EnableDisplayModes(List coreIdentifiers = null, List catch (Exception e) { Console.WriteLine("Uh oh something went wrong."); -#if DEBUG - Console.WriteLine(e.ToString()); -#else - Console.WriteLine(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(e.ToString()); + } + else + { + Console.WriteLine(e.Message); + } } } @@ -78,11 +81,14 @@ private static void ResetDisplayModes(List coreIdentifiers = null) catch (Exception e) { Console.WriteLine("Uh oh something went wrong."); -#if DEBUG - Console.WriteLine(e.ToString()); -#else - Console.WriteLine(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(e.ToString()); + } + else + { + Console.WriteLine(e.Message); + } } } diff --git a/src/partials/Program.GameBoyPalettes.cs b/src/partials/Program.GameBoyPalettes.cs index b94e6054..ed825995 100644 --- a/src/partials/Program.GameBoyPalettes.cs +++ b/src/partials/Program.GameBoyPalettes.cs @@ -39,11 +39,14 @@ private static void DownloadGameBoyPalettes() catch (Exception e) { Console.WriteLine("Something happened while trying to install the asset files..."); -#if DEBUG - Console.WriteLine(e); -#else - Console.WriteLine(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(e); + } + else + { + Console.WriteLine(e.Message); + } } } } diff --git a/src/partials/Program.Helpers.cs b/src/partials/Program.Helpers.cs index f5d9d10f..6ac7dd15 100644 --- a/src/partials/Program.Helpers.cs +++ b/src/partials/Program.Helpers.cs @@ -48,11 +48,14 @@ private static bool CheckVersion(string path) } catch (HttpRequestException e) { -#if DEBUG - Console.WriteLine(e); -#else - Console.WriteLine(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(e); + } + else + { + Console.WriteLine(e.Message); + } return false; } } diff --git a/src/partials/Program.PocketLibraryImages.cs b/src/partials/Program.PocketLibraryImages.cs index ec09f173..53df2f4e 100644 --- a/src/partials/Program.PocketLibraryImages.cs +++ b/src/partials/Program.PocketLibraryImages.cs @@ -1,5 +1,6 @@ using Pannella.Helpers; using Pannella.Models.Settings; +using Pannella.Services; using ArchiveFile = Pannella.Models.Archive.File; namespace Pannella; @@ -36,11 +37,14 @@ private static void DownloadPockLibraryImages() catch (Exception e) { Console.WriteLine("Something happened while trying to install the asset files..."); -#if DEBUG - Console.WriteLine(e); -#else - Console.WriteLine(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(e); + } + else + { + Console.WriteLine(e.Message); + } } } else diff --git a/src/services/ArchiveService.cs b/src/services/ArchiveService.cs index aeacaf22..3c4db10f 100644 --- a/src/services/ArchiveService.cs +++ b/src/services/ArchiveService.cs @@ -183,11 +183,14 @@ public bool DownloadArchiveFile(SettingsArchive archive, ArchiveFile archiveFile catch (Exception e) { WriteMessage($"Something went wrong with '{archiveFile.name}'"); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } return false; } diff --git a/src/services/AssetsService.cs b/src/services/AssetsService.cs index 9f1de5ab..cd8b43a8 100644 --- a/src/services/AssetsService.cs +++ b/src/services/AssetsService.cs @@ -58,11 +58,14 @@ public List Blacklist catch (Exception ex) { Console.WriteLine($"There was an error parsing the {BLACKLIST_FILE} file."); -#if DEBUG - Console.WriteLine(ex); -#else - Console.WriteLine(ex.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + Console.WriteLine(ex); + } + else + { + Console.WriteLine(ex.Message); + } } } else diff --git a/src/services/CoreUpdaterService.cs b/src/services/CoreUpdaterService.cs index fdb81a5d..7d4ba766 100644 --- a/src/services/CoreUpdaterService.cs +++ b/src/services/CoreUpdaterService.cs @@ -294,11 +294,14 @@ public void RunUpdates(string[] ids = null, bool clean = false) catch (Exception e) { WriteMessage("Uh oh something went wrong."); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } } } diff --git a/src/services/CoresService.DisplayModes.cs b/src/services/CoresService.DisplayModes.cs index 6dab24ba..ee8b069d 100644 --- a/src/services/CoresService.DisplayModes.cs +++ b/src/services/CoresService.DisplayModes.cs @@ -51,11 +51,14 @@ public Dictionary> DisplayModes catch (Exception ex) { WriteMessage($"There was an error parsing the {DISPLAY_MODES_FILE} file."); -#if DEBUG - WriteMessage(ex.ToString()); -#else - WriteMessage(ex.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(ex.ToString()); + } + else + { + WriteMessage(ex.Message); + } } } else diff --git a/src/services/CoresService.Download.cs b/src/services/CoresService.Download.cs index b8f31eca..de24a1e7 100644 --- a/src/services/CoresService.Download.cs +++ b/src/services/CoresService.Download.cs @@ -60,11 +60,14 @@ public void DownloadCoreAssets(List coreList) catch (Exception e) { WriteMessage("Uh oh something went wrong."); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } } } @@ -338,11 +341,14 @@ public Dictionary DownloadAssets(Core core, bool ignoreGlobalSet catch (Exception e) { WriteMessage($"Error while processing '{file}'"); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } } } } diff --git a/src/services/CoresService.Extras.cs b/src/services/CoresService.Extras.cs index 4ebff7b2..316cd462 100644 --- a/src/services/CoresService.Extras.cs +++ b/src/services/CoresService.Extras.cs @@ -37,11 +37,14 @@ public List PocketExtrasList catch (Exception ex) { WriteMessage($"There was an error parsing the {POCKET_EXTRAS_FILE} file."); -#if DEBUG - WriteMessage(ex.ToString()); -#else - WriteMessage(ex.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(ex.ToString()); + } + else + { + WriteMessage(ex.Message); + } } } else @@ -177,11 +180,14 @@ private void DownloadPocketExtrasPlatform(PocketExtra pocketExtra, string path, catch (Exception e) { WriteMessage("Something happened while trying to install the asset files..."); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } return; } @@ -326,11 +332,14 @@ private void DownloadPocketExtras(PocketExtra pocketExtra, string path, bool dow catch (Exception e) { WriteMessage("Something happened while trying to install the asset files..."); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } return; } diff --git a/src/services/CoresService.IgnoreInstanceJson.cs b/src/services/CoresService.IgnoreInstanceJson.cs index d0155bff..c49657b8 100644 --- a/src/services/CoresService.IgnoreInstanceJson.cs +++ b/src/services/CoresService.IgnoreInstanceJson.cs @@ -32,11 +32,14 @@ private List IgnoreInstanceJson catch (Exception ex) { WriteMessage($"There was an error parsing the {IGNORE_INSTANCE_JSON_FILE} file."); -#if DEBUG - WriteMessage(ex.ToString()); -#else - WriteMessage(ex.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(ex.ToString()); + } + else + { + WriteMessage(ex.Message); + } } } else diff --git a/src/services/CoresService.Jotego.cs b/src/services/CoresService.Jotego.cs index 7cf0950c..a26d089b 100644 --- a/src/services/CoresService.Jotego.cs +++ b/src/services/CoresService.Jotego.cs @@ -43,11 +43,14 @@ private Dictionary LoadRenamedPlatformFiles() catch (Exception e) { WriteMessage("Unable to retrieve archive contents. Asset download may not work."); -#if DEBUG - WriteMessage(e.ToString()); -#else - WriteMessage(e.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(e.ToString()); + } + else + { + WriteMessage(e.Message); + } } return platformFiles; diff --git a/src/services/CoresService.cs b/src/services/CoresService.cs index f2ee72c8..6de0efc5 100644 --- a/src/services/CoresService.cs +++ b/src/services/CoresService.cs @@ -67,11 +67,14 @@ public List Cores catch (Exception ex) { WriteMessage($"There was an error parsing the {CORES_FILE} file from the openFPGA cores inventory."); -#if DEBUG - WriteMessage(ex.ToString()); -#else - WriteMessage(ex.Message); -#endif + if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + { + WriteMessage(ex.ToString()); + } + else + { + WriteMessage(ex.Message); + } throw; } } From 32e4962d0d21620089575f9df937f182a5a394d7 Mon Sep 17 00:00:00 2001 From: Matt Pannella Date: Tue, 3 Dec 2024 23:23:14 -0500 Subject: [PATCH 2/3] fixed --- src/Program.cs | 2 +- src/models/Settings/Debug.cs | 3 +++ src/partials/Program.DisplayModes.cs | 4 ++-- src/partials/Program.GameBoyPalettes.cs | 2 +- src/partials/Program.Helpers.cs | 2 +- src/partials/Program.PocketLibraryImages.cs | 2 +- src/services/ArchiveService.cs | 2 +- src/services/AssetsService.cs | 2 +- src/services/CoreUpdaterService.cs | 2 +- src/services/CoresService.DisplayModes.cs | 2 +- src/services/CoresService.Download.cs | 4 ++-- src/services/CoresService.Extras.cs | 6 +++--- src/services/CoresService.IgnoreInstanceJson.cs | 2 +- src/services/CoresService.Jotego.cs | 2 +- src/services/CoresService.cs | 2 +- 15 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/Program.cs b/src/Program.cs index 3d769176..1a683af5 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -221,7 +221,7 @@ private static void Main(string[] args) catch (Exception e) { Console.WriteLine("Well, something went wrong. Sorry about that."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/models/Settings/Debug.cs b/src/models/Settings/Debug.cs index 479facee..f34d7f8e 100644 --- a/src/models/Settings/Debug.cs +++ b/src/models/Settings/Debug.cs @@ -4,5 +4,8 @@ namespace Pannella.Models.Settings; public class Debug { +#if DEBUG + public bool show_stack_traces true; +#else public bool show_stack_traces { get; set; } = false; } diff --git a/src/partials/Program.DisplayModes.cs b/src/partials/Program.DisplayModes.cs index 2dc280e7..9cb35f9f 100644 --- a/src/partials/Program.DisplayModes.cs +++ b/src/partials/Program.DisplayModes.cs @@ -33,7 +33,7 @@ private static void EnableDisplayModes(List coreIdentifiers = null, List catch (Exception e) { Console.WriteLine("Uh oh something went wrong."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(e.ToString()); } @@ -81,7 +81,7 @@ private static void ResetDisplayModes(List coreIdentifiers = null) catch (Exception e) { Console.WriteLine("Uh oh something went wrong."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(e.ToString()); } diff --git a/src/partials/Program.GameBoyPalettes.cs b/src/partials/Program.GameBoyPalettes.cs index ed825995..30c89f7e 100644 --- a/src/partials/Program.GameBoyPalettes.cs +++ b/src/partials/Program.GameBoyPalettes.cs @@ -39,7 +39,7 @@ private static void DownloadGameBoyPalettes() catch (Exception e) { Console.WriteLine("Something happened while trying to install the asset files..."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/partials/Program.Helpers.cs b/src/partials/Program.Helpers.cs index 6ac7dd15..1a3645f0 100644 --- a/src/partials/Program.Helpers.cs +++ b/src/partials/Program.Helpers.cs @@ -48,7 +48,7 @@ private static bool CheckVersion(string path) } catch (HttpRequestException e) { - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/partials/Program.PocketLibraryImages.cs b/src/partials/Program.PocketLibraryImages.cs index 53df2f4e..d186eb4d 100644 --- a/src/partials/Program.PocketLibraryImages.cs +++ b/src/partials/Program.PocketLibraryImages.cs @@ -37,7 +37,7 @@ private static void DownloadPockLibraryImages() catch (Exception e) { Console.WriteLine("Something happened while trying to install the asset files..."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/services/ArchiveService.cs b/src/services/ArchiveService.cs index 3c4db10f..d528486f 100644 --- a/src/services/ArchiveService.cs +++ b/src/services/ArchiveService.cs @@ -183,7 +183,7 @@ public bool DownloadArchiveFile(SettingsArchive archive, ArchiveFile archiveFile catch (Exception e) { WriteMessage($"Something went wrong with '{archiveFile.name}'"); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/AssetsService.cs b/src/services/AssetsService.cs index cd8b43a8..3757738e 100644 --- a/src/services/AssetsService.cs +++ b/src/services/AssetsService.cs @@ -58,7 +58,7 @@ public List Blacklist catch (Exception ex) { Console.WriteLine($"There was an error parsing the {BLACKLIST_FILE} file."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { Console.WriteLine(ex); } diff --git a/src/services/CoreUpdaterService.cs b/src/services/CoreUpdaterService.cs index 7d4ba766..f137ff83 100644 --- a/src/services/CoreUpdaterService.cs +++ b/src/services/CoreUpdaterService.cs @@ -294,7 +294,7 @@ public void RunUpdates(string[] ids = null, bool clean = false) catch (Exception e) { WriteMessage("Uh oh something went wrong."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.DisplayModes.cs b/src/services/CoresService.DisplayModes.cs index ee8b069d..debc9a10 100644 --- a/src/services/CoresService.DisplayModes.cs +++ b/src/services/CoresService.DisplayModes.cs @@ -51,7 +51,7 @@ public Dictionary> DisplayModes catch (Exception ex) { WriteMessage($"There was an error parsing the {DISPLAY_MODES_FILE} file."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(ex.ToString()); } diff --git a/src/services/CoresService.Download.cs b/src/services/CoresService.Download.cs index de24a1e7..8a3b4754 100644 --- a/src/services/CoresService.Download.cs +++ b/src/services/CoresService.Download.cs @@ -60,7 +60,7 @@ public void DownloadCoreAssets(List coreList) catch (Exception e) { WriteMessage("Uh oh something went wrong."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } @@ -341,7 +341,7 @@ public Dictionary DownloadAssets(Core core, bool ignoreGlobalSet catch (Exception e) { WriteMessage($"Error while processing '{file}'"); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.Extras.cs b/src/services/CoresService.Extras.cs index 316cd462..6303688a 100644 --- a/src/services/CoresService.Extras.cs +++ b/src/services/CoresService.Extras.cs @@ -37,7 +37,7 @@ public List PocketExtrasList catch (Exception ex) { WriteMessage($"There was an error parsing the {POCKET_EXTRAS_FILE} file."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(ex.ToString()); } @@ -180,7 +180,7 @@ private void DownloadPocketExtrasPlatform(PocketExtra pocketExtra, string path, catch (Exception e) { WriteMessage("Something happened while trying to install the asset files..."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } @@ -332,7 +332,7 @@ private void DownloadPocketExtras(PocketExtra pocketExtra, string path, bool dow catch (Exception e) { WriteMessage("Something happened while trying to install the asset files..."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.IgnoreInstanceJson.cs b/src/services/CoresService.IgnoreInstanceJson.cs index c49657b8..1b5a2551 100644 --- a/src/services/CoresService.IgnoreInstanceJson.cs +++ b/src/services/CoresService.IgnoreInstanceJson.cs @@ -32,7 +32,7 @@ private List IgnoreInstanceJson catch (Exception ex) { WriteMessage($"There was an error parsing the {IGNORE_INSTANCE_JSON_FILE} file."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(ex.ToString()); } diff --git a/src/services/CoresService.Jotego.cs b/src/services/CoresService.Jotego.cs index a26d089b..802745da 100644 --- a/src/services/CoresService.Jotego.cs +++ b/src/services/CoresService.Jotego.cs @@ -43,7 +43,7 @@ private Dictionary LoadRenamedPlatformFiles() catch (Exception e) { WriteMessage("Unable to retrieve archive contents. Asset download may not work."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.cs b/src/services/CoresService.cs index 6de0efc5..28d7ba77 100644 --- a/src/services/CoresService.cs +++ b/src/services/CoresService.cs @@ -67,7 +67,7 @@ public List Cores catch (Exception ex) { WriteMessage($"There was an error parsing the {CORES_FILE} file from the openFPGA cores inventory."); - if (DEBUG || ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) { WriteMessage(ex.ToString()); } From d19d73a0464aa710479d5751d143528a9537c057 Mon Sep 17 00:00:00 2001 From: Matt Pannella Date: Tue, 3 Dec 2024 23:32:20 -0500 Subject: [PATCH 3/3] woops --- src/Program.cs | 2 +- src/models/Settings/Debug.cs | 3 ++- src/partials/Program.DisplayModes.cs | 4 ++-- src/partials/Program.GameBoyPalettes.cs | 2 +- src/partials/Program.Helpers.cs | 2 +- src/partials/Program.PocketLibraryImages.cs | 2 +- src/services/ArchiveService.cs | 2 +- src/services/AssetsService.cs | 2 +- src/services/CoreUpdaterService.cs | 2 +- src/services/CoresService.DisplayModes.cs | 2 +- src/services/CoresService.Download.cs | 4 ++-- src/services/CoresService.Extras.cs | 6 +++--- src/services/CoresService.IgnoreInstanceJson.cs | 2 +- src/services/CoresService.Jotego.cs | 2 +- src/services/CoresService.cs | 2 +- src/services/SettingsService.cs | 1 + 16 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/Program.cs b/src/Program.cs index 1a683af5..e6a9379d 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -221,7 +221,7 @@ private static void Main(string[] args) catch (Exception e) { Console.WriteLine("Well, something went wrong. Sorry about that."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/models/Settings/Debug.cs b/src/models/Settings/Debug.cs index f34d7f8e..5741d76d 100644 --- a/src/models/Settings/Debug.cs +++ b/src/models/Settings/Debug.cs @@ -5,7 +5,8 @@ namespace Pannella.Models.Settings; public class Debug { #if DEBUG - public bool show_stack_traces true; + public bool show_stack_traces = true; #else public bool show_stack_traces { get; set; } = false; +#endif } diff --git a/src/partials/Program.DisplayModes.cs b/src/partials/Program.DisplayModes.cs index 9cb35f9f..2e2bf367 100644 --- a/src/partials/Program.DisplayModes.cs +++ b/src/partials/Program.DisplayModes.cs @@ -33,7 +33,7 @@ private static void EnableDisplayModes(List coreIdentifiers = null, List catch (Exception e) { Console.WriteLine("Uh oh something went wrong."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(e.ToString()); } @@ -81,7 +81,7 @@ private static void ResetDisplayModes(List coreIdentifiers = null) catch (Exception e) { Console.WriteLine("Uh oh something went wrong."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(e.ToString()); } diff --git a/src/partials/Program.GameBoyPalettes.cs b/src/partials/Program.GameBoyPalettes.cs index 30c89f7e..a7685182 100644 --- a/src/partials/Program.GameBoyPalettes.cs +++ b/src/partials/Program.GameBoyPalettes.cs @@ -39,7 +39,7 @@ private static void DownloadGameBoyPalettes() catch (Exception e) { Console.WriteLine("Something happened while trying to install the asset files..."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/partials/Program.Helpers.cs b/src/partials/Program.Helpers.cs index 1a3645f0..658938ee 100644 --- a/src/partials/Program.Helpers.cs +++ b/src/partials/Program.Helpers.cs @@ -48,7 +48,7 @@ private static bool CheckVersion(string path) } catch (HttpRequestException e) { - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/partials/Program.PocketLibraryImages.cs b/src/partials/Program.PocketLibraryImages.cs index d186eb4d..17daba43 100644 --- a/src/partials/Program.PocketLibraryImages.cs +++ b/src/partials/Program.PocketLibraryImages.cs @@ -37,7 +37,7 @@ private static void DownloadPockLibraryImages() catch (Exception e) { Console.WriteLine("Something happened while trying to install the asset files..."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(e); } diff --git a/src/services/ArchiveService.cs b/src/services/ArchiveService.cs index d528486f..13f46f60 100644 --- a/src/services/ArchiveService.cs +++ b/src/services/ArchiveService.cs @@ -183,7 +183,7 @@ public bool DownloadArchiveFile(SettingsArchive archive, ArchiveFile archiveFile catch (Exception e) { WriteMessage($"Something went wrong with '{archiveFile.name}'"); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/AssetsService.cs b/src/services/AssetsService.cs index 3757738e..0ee80ded 100644 --- a/src/services/AssetsService.cs +++ b/src/services/AssetsService.cs @@ -58,7 +58,7 @@ public List Blacklist catch (Exception ex) { Console.WriteLine($"There was an error parsing the {BLACKLIST_FILE} file."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { Console.WriteLine(ex); } diff --git a/src/services/CoreUpdaterService.cs b/src/services/CoreUpdaterService.cs index f137ff83..9f62fb87 100644 --- a/src/services/CoreUpdaterService.cs +++ b/src/services/CoreUpdaterService.cs @@ -294,7 +294,7 @@ public void RunUpdates(string[] ids = null, bool clean = false) catch (Exception e) { WriteMessage("Uh oh something went wrong."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.DisplayModes.cs b/src/services/CoresService.DisplayModes.cs index debc9a10..2860809e 100644 --- a/src/services/CoresService.DisplayModes.cs +++ b/src/services/CoresService.DisplayModes.cs @@ -51,7 +51,7 @@ public Dictionary> DisplayModes catch (Exception ex) { WriteMessage($"There was an error parsing the {DISPLAY_MODES_FILE} file."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (this.settingsService.debug.show_stack_traces) { WriteMessage(ex.ToString()); } diff --git a/src/services/CoresService.Download.cs b/src/services/CoresService.Download.cs index 8a3b4754..03da2f33 100644 --- a/src/services/CoresService.Download.cs +++ b/src/services/CoresService.Download.cs @@ -60,7 +60,7 @@ public void DownloadCoreAssets(List coreList) catch (Exception e) { WriteMessage("Uh oh something went wrong."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } @@ -341,7 +341,7 @@ public Dictionary DownloadAssets(Core core, bool ignoreGlobalSet catch (Exception e) { WriteMessage($"Error while processing '{file}'"); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.Extras.cs b/src/services/CoresService.Extras.cs index 6303688a..3ecd2ec2 100644 --- a/src/services/CoresService.Extras.cs +++ b/src/services/CoresService.Extras.cs @@ -37,7 +37,7 @@ public List PocketExtrasList catch (Exception ex) { WriteMessage($"There was an error parsing the {POCKET_EXTRAS_FILE} file."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(ex.ToString()); } @@ -180,7 +180,7 @@ private void DownloadPocketExtrasPlatform(PocketExtra pocketExtra, string path, catch (Exception e) { WriteMessage("Something happened while trying to install the asset files..."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } @@ -332,7 +332,7 @@ private void DownloadPocketExtras(PocketExtra pocketExtra, string path, bool dow catch (Exception e) { WriteMessage("Something happened while trying to install the asset files..."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.IgnoreInstanceJson.cs b/src/services/CoresService.IgnoreInstanceJson.cs index 1b5a2551..7450a8e4 100644 --- a/src/services/CoresService.IgnoreInstanceJson.cs +++ b/src/services/CoresService.IgnoreInstanceJson.cs @@ -32,7 +32,7 @@ private List IgnoreInstanceJson catch (Exception ex) { WriteMessage($"There was an error parsing the {IGNORE_INSTANCE_JSON_FILE} file."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (this.settingsService.debug.show_stack_traces) { WriteMessage(ex.ToString()); } diff --git a/src/services/CoresService.Jotego.cs b/src/services/CoresService.Jotego.cs index 802745da..8a1af150 100644 --- a/src/services/CoresService.Jotego.cs +++ b/src/services/CoresService.Jotego.cs @@ -43,7 +43,7 @@ private Dictionary LoadRenamedPlatformFiles() catch (Exception e) { WriteMessage("Unable to retrieve archive contents. Asset download may not work."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(e.ToString()); } diff --git a/src/services/CoresService.cs b/src/services/CoresService.cs index 28d7ba77..4875a367 100644 --- a/src/services/CoresService.cs +++ b/src/services/CoresService.cs @@ -67,7 +67,7 @@ public List Cores catch (Exception ex) { WriteMessage($"There was an error parsing the {CORES_FILE} file from the openFPGA cores inventory."); - if (ServiceHelper.SettingsService.Config().debug.show_stack_traces) + if (ServiceHelper.SettingsService.debug.show_stack_traces) { WriteMessage(ex.ToString()); } diff --git a/src/services/SettingsService.cs b/src/services/SettingsService.cs index 417bf76b..076ce088 100644 --- a/src/services/SettingsService.cs +++ b/src/services/SettingsService.cs @@ -15,6 +15,7 @@ public class SettingsService private readonly List missingCores; public Config Config => this.settings.config; + public Debug debug => this.settings.debug; public SettingsService(string settingsPath, List cores = null) {