UI: RPC: Fix asset image hover string version pointing to the Canary repo in Canary

.github/workflows/canary.yml

@@ -22,6 +22,7 @@ env:
   RYUJINX_BASE_VERSION: "1.2"
   RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary"
   RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
+  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
   RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary"
   RELEASE: 1
 
@@ -92,7 +93,7 @@ jobs:
           sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
         shell: bash
 
@@ -227,7 +228,7 @@ jobs:
           sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
           sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
         shell: bash
 

src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs

@@ -47,7 +47,7 @@ namespace Ryujinx.Common.Logging.Targets
             }
 
             // Clean up old logs, should only keep 3
-            FileInfo[] files = logDir.GetFiles("*.log").OrderBy((info => info.CreationTime)).ToArray();
+            FileInfo[] files = logDir.GetFiles("*.log").OrderBy(info => info.CreationTime).ToArray();
             for (int i = 0; i < files.Length - 2; i++)
             {
                 try

src/Ryujinx.UI.Common/Configuration/LoggerModule.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Logging.Targets;
@@ -11,103 +10,69 @@ namespace Ryujinx.UI.Common.Configuration
     {
         public static void Initialize()
         {
-            ConfigurationState.Instance.Logger.EnableDebug.Event += ReloadEnableDebug;
+            ConfigurationState.Instance.Logger.EnableDebug.Event += 
-            ConfigurationState.Instance.Logger.EnableStub.Event += ReloadEnableStub;
+                (_, e) => Logger.SetEnable(LogLevel.Debug, e.NewValue);
-            ConfigurationState.Instance.Logger.EnableInfo.Event += ReloadEnableInfo;
+            ConfigurationState.Instance.Logger.EnableStub.Event += 
-            ConfigurationState.Instance.Logger.EnableWarn.Event += ReloadEnableWarning;
+                (_, e) => Logger.SetEnable(LogLevel.Stub, e.NewValue);
-            ConfigurationState.Instance.Logger.EnableError.Event += ReloadEnableError;
+            ConfigurationState.Instance.Logger.EnableInfo.Event += 
-            ConfigurationState.Instance.Logger.EnableTrace.Event += ReloadEnableTrace;
+                (_, e) => Logger.SetEnable(LogLevel.Info, e.NewValue);
-            ConfigurationState.Instance.Logger.EnableGuest.Event += ReloadEnableGuest;
+            ConfigurationState.Instance.Logger.EnableWarn.Event += 
-            ConfigurationState.Instance.Logger.EnableFsAccessLog.Event += ReloadEnableFsAccessLog;
+                (_, e) => Logger.SetEnable(LogLevel.Warning, e.NewValue);
-            ConfigurationState.Instance.Logger.FilteredClasses.Event += ReloadFilteredClasses;
+            ConfigurationState.Instance.Logger.EnableError.Event += 
-            ConfigurationState.Instance.Logger.EnableFileLog.Event += ReloadFileLogger;
+                (_, e) => Logger.SetEnable(LogLevel.Error, e.NewValue);
-        }
+            ConfigurationState.Instance.Logger.EnableTrace.Event += 
-
+                (_, e) => Logger.SetEnable(LogLevel.Error, e.NewValue);
-        private static void ReloadEnableDebug(object sender, ReactiveEventArgs<bool> e)
+            ConfigurationState.Instance.Logger.EnableGuest.Event += 
-        {
+                (_, e) => Logger.SetEnable(LogLevel.Guest, e.NewValue);
-            Logger.SetEnable(LogLevel.Debug, e.NewValue);
+            ConfigurationState.Instance.Logger.EnableFsAccessLog.Event +=
-        }
+                (_, e) => Logger.SetEnable(LogLevel.AccessLog, e.NewValue);
-
+            
-        private static void ReloadEnableStub(object sender, ReactiveEventArgs<bool> e)
+            ConfigurationState.Instance.Logger.FilteredClasses.Event += (_, e) =>
-        {
-            Logger.SetEnable(LogLevel.Stub, e.NewValue);
-        }
-
-        private static void ReloadEnableInfo(object sender, ReactiveEventArgs<bool> e)
-        {
-            Logger.SetEnable(LogLevel.Info, e.NewValue);
-        }
-
-        private static void ReloadEnableWarning(object sender, ReactiveEventArgs<bool> e)
-        {
-            Logger.SetEnable(LogLevel.Warning, e.NewValue);
-        }
-
-        private static void ReloadEnableError(object sender, ReactiveEventArgs<bool> e)
-        {
-            Logger.SetEnable(LogLevel.Error, e.NewValue);
-        }
-
-        private static void ReloadEnableTrace(object sender, ReactiveEventArgs<bool> e)
-        {
-            Logger.SetEnable(LogLevel.Trace, e.NewValue);
-        }
-
-        private static void ReloadEnableGuest(object sender, ReactiveEventArgs<bool> e)
-        {
-            Logger.SetEnable(LogLevel.Guest, e.NewValue);
-        }
-
-        private static void ReloadEnableFsAccessLog(object sender, ReactiveEventArgs<bool> e)
-        {
-            Logger.SetEnable(LogLevel.AccessLog, e.NewValue);
-        }
-
-        private static void ReloadFilteredClasses(object sender, ReactiveEventArgs<LogClass[]> e)
-        {
-            bool noFilter = e.NewValue.Length == 0;
-
-            foreach (var logClass in Enum.GetValues<LogClass>())
             {
-                Logger.SetEnable(logClass, noFilter);
+                bool noFilter = e.NewValue.Length == 0;
-            }
 
-            foreach (var logClass in e.NewValue)
+                foreach (var logClass in Enum.GetValues<LogClass>())
-            {
-                Logger.SetEnable(logClass, true);
-            }
-        }
-
-        private static void ReloadFileLogger(object sender, ReactiveEventArgs<bool> e)
-        {
-            if (e.NewValue)
-            {
-                string logDir = AppDataManager.LogsDirPath;
-                FileStream logFile = null;
-
-                if (!string.IsNullOrEmpty(logDir))
                 {
-                    logFile = FileLogTarget.PrepareLogFile(logDir);
+                    Logger.SetEnable(logClass, noFilter);
                 }
 
-                if (logFile == null)
+                foreach (var logClass in e.NewValue)
+                {
+                    Logger.SetEnable(logClass, true);
+                }
+            };
+
+            ConfigurationState.Instance.Logger.EnableFileLog.Event += (_, e) =>
+            {
+                if (e.NewValue)
+                {
+                    string logDir = AppDataManager.LogsDirPath;
+                    FileStream logFile = null;
+
+                    if (!string.IsNullOrEmpty(logDir))
+                    {
+                        logFile = FileLogTarget.PrepareLogFile(logDir);
+                    }
+
+                    if (logFile == null)
+                    {
+                        Logger.Error?.Print(LogClass.Application,
+                            "No writable log directory available. Make sure either the Logs directory, Application Data, or the Ryujinx directory is writable.");
+                        Logger.RemoveTarget("file");
+
+                        return;
+                    }
+
+                    Logger.AddTarget(new AsyncLogTargetWrapper(
+                        new FileLogTarget("file", logFile),
+                        1000
+                    ));
+                }
+                else
                 {
-                    Logger.Error?.Print(LogClass.Application, "No writable log directory available. Make sure either the Logs directory, Application Data, or the Ryujinx directory is writable.");
                     Logger.RemoveTarget("file");
-
-                    return;
                 }
-
+            };
-                Logger.AddTarget(new AsyncLogTargetWrapper(
-                    new FileLogTarget("file", logFile),
-                    1000,
-                    AsyncLogTargetOverflowAction.Block
-                ));
-            }
-            else
-            {
-                Logger.RemoveTarget("file");
-            }
         }
     }
 }

src/Ryujinx.UI.Common/DiscordIntegrationModule.cs

@@ -15,9 +15,13 @@ namespace Ryujinx.UI.Common
     {
         public static Timestamps StartedAt { get; set; }
 
-        private static readonly string _description = ReleaseInformation.IsValid
+        private static string VersionString
-                ? $"v{ReleaseInformation.Version} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}@{ReleaseInformation.BuildGitHash}"
+            => (ReleaseInformation.IsCanaryBuild ? "Canary " : string.Empty) + $"v{ReleaseInformation.Version}"; 
-                : "dev build";
+
+        private static readonly string _description = 
+            ReleaseInformation.IsValid 
+                    ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}@{ReleaseInformation.BuildGitHash}" 
+                    : "dev build";
 
         private const string ApplicationId = "1293250299716173864";