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

Jump to bottom

Improves some log messages and fixes a typo #6773

Merged
merged 4 commits into from
May 15, 2024
Merged

Improves some log messages and fixes a typo #6773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62cad8e
Improves some log messages and fixes a typo
SamusAranX May 4, 2024
23bdc96
oops
SamusAranX May 4, 2024
985ade9
Update src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
SamusAranX May 14, 2024
a9043f3
Log config file path
TSRBerry May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Ryujinx.Gtk3/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,21 +181,24 @@ static void SetEnvironmentVariableNoCaching(string key, string value)
{
// No configuration, we load the default values and save it to disk
ConfigurationPath = appDataConfigurationPath;
Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {ConfigurationPath}");

ConfigurationState.Instance.LoadDefault();
ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
}
else
{
Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {ConfigurationPath}");

if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
{
ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
}
else
{
ConfigurationState.Instance.LoadDefault();
Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");

Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location {ConfigurationPath}");
ConfigurationState.Instance.LoadDefault();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Ryujinx.UI.Common/App/ApplicationData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem,

if (!System.IO.Path.Exists(titleFilePath))
{
Logger.Error?.Print(LogClass.Application, $"File does not exists. {titleFilePath}");
Logger.Error?.Print(LogClass.Application, $"File \"{titleFilePath}\" does not exist.");
return string.Empty;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void LoadApplications(List<string> appDirs, Language desiredTitleLanguage

if (!Directory.Exists(appDir))
{
Logger.Warning?.Print(LogClass.Application, $"The \"game_dirs\" section in \"{ReleaseInformation.ConfigName}\" contains an invalid directory: \"{appDir}\"");
Logger.Warning?.Print(LogClass.Application, $"The specified game directory \"{appDir}\" does not exist.");
TSRBerry marked this conversation as resolved.
Show resolved Hide resolved

continue;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Ryujinx.UI.Common.Helper;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Text.Json.Nodes;

namespace Ryujinx.UI.Common.Configuration
Expand Down Expand Up @@ -1594,7 +1595,9 @@ private static GraphicsBackend DefaultGraphicsBackend()

private static void LogValueChange<T>(ReactiveEventArgs<T> eventArgs, string valueName)
{
Ryujinx.Common.Logging.Logger.Info?.Print(LogClass.Configuration, $"{valueName} set to: {eventArgs.NewValue}");
string message = string.Create(CultureInfo.InvariantCulture, $"{valueName} set to: {eventArgs.NewValue}");
SamusAranX marked this conversation as resolved.
Show resolved Hide resolved

Ryujinx.Common.Logging.Logger.Info?.Print(LogClass.Configuration, message);
}

public static void Initialize()
Expand Down
7 changes: 5 additions & 2 deletions src/Ryujinx/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,24 @@ public static void ReloadConfig()
{
// No configuration, we load the default values and save it to disk
ConfigurationPath = appDataConfigurationPath;
Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {ConfigurationPath}");

ConfigurationState.Instance.LoadDefault();
ConfigurationState.Instance.ToFileFormat().SaveConfig(ConfigurationPath);
}
else
{
Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {ConfigurationPath}");

if (ConfigurationFileFormat.TryLoad(ConfigurationPath, out ConfigurationFileFormat configurationFileFormat))
{
ConfigurationState.Instance.Load(configurationFileFormat, ConfigurationPath);
}
else
{
ConfigurationState.Instance.LoadDefault();
Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");

Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location {ConfigurationPath}");
ConfigurationState.Instance.LoadDefault();
}
}

Expand Down