Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debugging messages #364

Merged
merged 3 commits into from
Dec 5, 2024
Merged

debugging messages #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
209aaca
replaced if statements
mattpannella Dec 4, 2024
32e4962
fixed
mattpannella Dec 4, 2024
d19d73a
woops
mattpannella Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(e);
}
else
{
Console.WriteLine(e.Message);
}
Pause();
}
}
Expand Down
12 changes: 12 additions & 0 deletions src/models/Settings/Debug.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using Newtonsoft.Json;

namespace Pannella.Models.Settings;

public class Debug
{
#if DEBUG
public bool show_stack_traces = true;
#else
public bool show_stack_traces { get; set; } = false;
#endif
}
1 change: 1 addition & 0 deletions src/models/Settings/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public class Settings
{
public Config config { get; set; } = new();
public Dictionary<string, CoreSettings> core_settings { get; set; } = new();
public Debug debug { get; set; } = new();

[JsonProperty]
private Dictionary<string, CoreSettings> coreSettings { set => this.core_settings = value; }
Expand Down
26 changes: 16 additions & 10 deletions src/partials/Program.DisplayModes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ private static void EnableDisplayModes(List<string> 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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(e.ToString());
}
else
{
Console.WriteLine(e.Message);
}
}
}

Expand Down Expand Up @@ -78,11 +81,14 @@ private static void ResetDisplayModes(List<string> 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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(e.ToString());
}
else
{
Console.WriteLine(e.Message);
}
}
}

Expand Down
13 changes: 8 additions & 5 deletions src/partials/Program.GameBoyPalettes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(e);
}
else
{
Console.WriteLine(e.Message);
}
}
}
}
Expand Down
13 changes: 8 additions & 5 deletions src/partials/Program.Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(e);
}
else
{
Console.WriteLine(e.Message);
}
return false;
}
}
Expand Down
14 changes: 9 additions & 5 deletions src/partials/Program.PocketLibraryImages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Pannella.Helpers;
using Pannella.Models.Settings;
using Pannella.Services;
using ArchiveFile = Pannella.Models.Archive.File;

namespace Pannella;
Expand Down Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(e);
}
else
{
Console.WriteLine(e.Message);
}
}
}
else
Expand Down
13 changes: 8 additions & 5 deletions src/services/ArchiveService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
return false;
}

Expand Down
13 changes: 8 additions & 5 deletions src/services/AssetsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,14 @@ public List<string> 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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
Console.WriteLine(ex);
}
else
{
Console.WriteLine(ex.Message);
}
}
}
else
Expand Down
13 changes: 8 additions & 5 deletions src/services/CoreUpdaterService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
}
}

Expand Down
13 changes: 8 additions & 5 deletions src/services/CoresService.DisplayModes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ public Dictionary<string, List<DisplayMode>> 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 (this.settingsService.debug.show_stack_traces)
{
WriteMessage(ex.ToString());
}
else
{
WriteMessage(ex.Message);
}
}
}
else
Expand Down
26 changes: 16 additions & 10 deletions src/services/CoresService.Download.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,14 @@ public void DownloadCoreAssets(List<Core> coreList)
catch (Exception e)
{
WriteMessage("Uh oh something went wrong.");
#if DEBUG
WriteMessage(e.ToString());
#else
WriteMessage(e.Message);
#endif
if (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
}
}

Expand Down Expand Up @@ -338,11 +341,14 @@ public Dictionary<string, object> DownloadAssets(Core core, bool ignoreGlobalSet
catch (Exception e)
{
WriteMessage($"Error while processing '{file}'");
#if DEBUG
WriteMessage(e.ToString());
#else
WriteMessage(e.Message);
#endif
if (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
}
}
}
Expand Down
39 changes: 24 additions & 15 deletions src/services/CoresService.Extras.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@ public List<PocketExtra> 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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(ex.ToString());
}
else
{
WriteMessage(ex.Message);
}
}
}
else
Expand Down Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
return;
}

Expand Down Expand Up @@ -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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
return;
}

Expand Down
13 changes: 8 additions & 5 deletions src/services/CoresService.IgnoreInstanceJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ private List<string> 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 (this.settingsService.debug.show_stack_traces)
{
WriteMessage(ex.ToString());
}
else
{
WriteMessage(ex.Message);
}
}
}
else
Expand Down
13 changes: 8 additions & 5 deletions src/services/CoresService.Jotego.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@ private Dictionary<string, string> 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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(e.ToString());
}
else
{
WriteMessage(e.Message);
}
}

return platformFiles;
Expand Down
13 changes: 8 additions & 5 deletions src/services/CoresService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,14 @@ public List<Core> 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 (ServiceHelper.SettingsService.debug.show_stack_traces)
{
WriteMessage(ex.ToString());
}
else
{
WriteMessage(ex.Message);
}
throw;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/services/SettingsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class SettingsService
private readonly List<Core> missingCores;

public Config Config => this.settings.config;
public Debug debug => this.settings.debug;

public SettingsService(string settingsPath, List<Core> cores = null)
{
Expand Down
Loading