Merge branch 'fr-locale-update' into 'master'

Update French Translation

See merge request [ryubing/ryujinx!67](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/67)

Directory.Packages.props

@@ -42,6 +42,8 @@
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
+    <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.29" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.29" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />

assets/locales.json

@@ -16905,7 +16905,7 @@
         "el_GR": "Αλλάξτε τον τρόπο αντιστοίχισης και πρόσβασης στη μνήμη επισκέπτη. Επηρεάζει σε μεγάλο βαθμό την απόδοση της προσομοίωσης της CPU.",
         "en_US": "Change how guest memory is mapped and accessed. Greatly affects emulated CPU performance.\n\nSet to HOST UNCHECKED if unsure.",
         "es_ES": "Cambia la forma de mapear y acceder a la memoria del guest. Afecta en gran medida al rendimiento de la CPU emulada.\n\nSelecciona \"Host sin verificación\" si no sabes qué hacer.",
-        "fr_FR": "Modifie la manière dont la mémoire émulée est mappée et utilisée. Impacte fortement les performances du processeur émulé.\n\nLaissez sur HÔTE NON VERIFIÉ si vous n'êtes pas sûr.",
+        "fr_FR": "Modifie la manière dont la mémoire émulée est mappée et accédée. Impacte fortement les performances du processeur émulé.\n\nLaissez sur HÔTE NON VÉRIFIÉ si vous n'êtes pas sûr.",
         "he_IL": "שנה איך שזיכרון מארח מיוחד ומונגד. משפיע מאוד על ביצועי המעבד המדומה.\n\nמוטב להשאיר על מארח לא מבוקר אם לא בטוחים.",
         "it_IT": "Cambia il modo in cui la memoria guest è mappata e vi si accede. Influisce notevolmente sulle prestazioni della CPU emulata.\n\nNel dubbio, imposta l'opzione su Host Unchecked.",
         "ja_JP": "ゲストメモリのマップ/アクセス方式を変更します. エミュレートされるCPUのパフォーマンスに大きな影響を与えます.\n\nよくわからない場合は｢ホスト,チェックなし｣を設定してください.",
@@ -23355,7 +23355,7 @@
         "el_GR": "",
         "en_US": "The network interface used for LAN/LDN features.\n\nIn conjunction with a VPN or XLink Kai and a game with LAN support, can be used to spoof a same-network connection over the Internet.\n\nLeave on DEFAULT if unsure.",
         "es_ES": "Interfaz de red usada para características LAN/LDN.\n\njunto con una VPN o XLink Kai y un juego con soporte LAN, puede usarse para suplantar una conexión de la misma red a través de Internet.\n\nDeje en DEFAULT si no está seguro.",
-        "fr_FR": "L'interface réseau utilisée pour les fonctionnalités LAN/LDN.\n\nEn conjonction avec un VPN ou XLink Kai et un jeu prenant en charge le LAN, peut être utilisée pour simuler une connexion sur le même réseau via Internet.\n\nLaissez sur PAR DÉFAUT si vous n'êtes pas sûr.",
+        "fr_FR": "L'interface réseau utilisée pour les fonctionnalités LAN/LDN.\n\nEn conjonction avec un VPN ou XLink Kai et un jeu prenant en charge le LAN, peut être utilisée pour simuler une connexion sur le même réseau via Internet.\n\nLaissez sur DÉFAUT si vous n'êtes pas sûr.",
         "he_IL": "",
         "it_IT": "L'interfaccia di rete utilizzata per le funzionalità LAN/LDN.\n\nIn combinazione con una VPN o XLink Kai e un gioco che supporta la modalità LAN, questa opzione può essere usata per simulare la connessione alla stessa rete attraverso Internet.\n\nNel dubbio, lascia l'opzione su Predefinito.",
         "ja_JP": "LAN/LDN機能に使用されるネットワークインタフェースです.\n\nVPNやXLink Kai、LAN対応のゲームと併用することで, インターネット上の同一ネットワーク接続になりすますことができます.\n\n不明な場合はデフォルトのままにしてください.",
@@ -23380,7 +23380,7 @@
         "el_GR": "Προεπιλογή",
         "en_US": "Default",
         "es_ES": "Predeterminado",
-        "fr_FR": "Par défaut",
+        "fr_FR": "Défaut",
         "he_IL": "ברירת המחדל",
         "it_IT": "Predefinito",
         "ja_JP": "デフォルト",

nuget.config

@@ -10,11 +10,13 @@
     </packageSources>
     <packageSourceMapping>
         <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <!-- These are defined and .NET still yells about multiple package sources with no mappings. Not sure what to do, this is in the docs lol -->
         <packageSource key="nuget.org">
             <package pattern="*" />
         </packageSource>
         <packageSource key="Ryujinx.UpdateClient">
             <package pattern="Ryujinx.UpdateClient" />
+            <package pattern="Ryujinx.Systems.Update.Common" />
         </packageSource>
         <!--<packageSource key="LibHacAlpha">
             <package pattern="Ryujinx.LibHac" />

src/Ryujinx/Common/Models/Github/GithubReleaseAssetJsonResponse.cs

@@ -1,9 +0,0 @@
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    public class GithubReleaseAssetJsonResponse
-    {
-        public string Name { get; set; }
-        public string State { get; set; }
-        public string BrowserDownloadUrl { get; set; }
-    }
-}

src/Ryujinx/Common/Models/Github/GithubReleasesJsonResponse.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    public class GithubReleasesJsonResponse
-    {
-        public string Name { get; set; }
-
-        public string TagName { get; set; }
-        public List<GithubReleaseAssetJsonResponse> Assets { get; set; }
-    }
-}

src/Ryujinx/Common/Models/Github/GithubReleasesJsonSerializerContext.cs

@@ -1,7 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.Common.Models.Github
-{
-    [JsonSerializable(typeof(GithubReleasesJsonResponse), GenerationMode = JsonSourceGenerationMode.Metadata)]
-    public partial class GithubReleasesJsonSerializerContext : JsonSerializerContext;
-}

src/Ryujinx/Ryujinx.csproj

@@ -65,6 +65,8 @@
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" />
     <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
+    <PackageReference Include="Ryujinx.UpdateClient" />
+    <PackageReference Include="Ryujinx.Systems.Update.Common" />
     <PackageReference Include="securifybv.ShellLink" />
     <PackageReference Include="Sep" />
     <PackageReference Include="Silk.NET.Vulkan" />

src/Ryujinx/Systems/Updater/Updater.GitLab.cs

@@ -4,42 +4,26 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
+using Ryujinx.Systems.Update.Client;
+using Ryujinx.Systems.Update.Common;
 using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Runtime.InteropServices;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Systems
 {
     internal static partial class Updater
     {
-        private static string CreateUpdateQueryUrl()
+        private static VersionResponse _versionResponse;
-        {
-#pragma warning disable CS8524
-            var os = RunningPlatform.CurrentOS switch
-#pragma warning restore CS8524
-            {
-                OperatingSystemType.MacOS => "mac",
-                OperatingSystemType.Linux => "linux",
-                OperatingSystemType.Windows => "win"
-            };
 
-            var arch = RunningPlatform.Architecture switch
+        private static UpdateClient CreateUpdateClient()
-            {
+            => UpdateClient.Builder()
-                Architecture.Arm64 => "arm",
+                .WithServerEndpoint("https://update.ryujinx.app") // This is the default, and doesn't need to be provided; it's here for transparency.
-                Architecture.X64 => "amd64",
+                .WithLogger((format, args, caller) => 
-                _ => null
+                    Logger.Info?.Print(
-            };
+                        LogClass.Application, 
-
+                        args.Length is 0 ? format : format.Format(args), 
-            if (arch is null)
+                        caller: caller)
-                return null;
+                    );
-
-            var rc = ReleaseInformation.IsCanaryBuild ? "canary" : "stable";
-
-            return $"https://update.ryujinx.app/latest/query?os={os}&arch={arch}&rc={rc}";
-        }
 
         public static async Task<Optional<(Version Current, Version Incoming)>> CheckVersionAsync(bool showVersionUpToDate = false)
         {
@@ -57,39 +41,31 @@ namespace Ryujinx.Ava.Systems
                 return default;
             }
 
-            if (CreateUpdateQueryUrl() is not {} updateUrl)
+            using UpdateClient updateClient = CreateUpdateClient();
-            {
-                Logger.Error?.Print(LogClass.Application, "Could not determine URL for updates.");
-                
-                _running = false;
-
-                return default;
-            }
-
-            Logger.Info?.Print(LogClass.Application, $"Checking for updates from {updateUrl}.");
-
-            // Get latest version number from update.ryujinx.app API
-            using HttpClient jsonClient = ConstructHttpClient();
 
             try
             {
-                UpdaterResponse response =
+                _versionResponse = await updateClient.QueryLatestAsync(ReleaseInformation.IsCanaryBuild
-                    await jsonClient.GetFromJsonAsync(updateUrl, UpdaterResponseJsonContext.Default.UpdaterResponse);
+                    ? ReleaseChannel.Canary
-
+                    : ReleaseChannel.Stable);
-                _buildVer = response.Tag;
-                _buildUrl = response.DownloadUrl;
-                _changelogUrlFormat = response.ReleaseUrlFormat;
             }
             catch (Exception e)
             {
-                Logger.Error?.Print(LogClass.Application, $"An error occurred when parsing JSON response from API ({e.GetType().AsFullNamePrettyString()}): {e.Message}");
+                Logger.Error?.Print(LogClass.Application, $"An error occurred when requesting for updates ({e.GetType().AsFullNamePrettyString()}): {e.Message}");
 
                 _running = false;
                 return default;
             }
+            
+            if (_versionResponse == null)
+            {
+                // logging is done via the UpdateClient library
+                _running = false;
+                return default;
+            }
 
             // If build URL not found, assume no new update is available.
-            if (_buildUrl is null or "")
+            if (_versionResponse.ArtifactUrl is null or "")
             {
                 if (showVersionUpToDate)
                 {
@@ -99,7 +75,7 @@ namespace Ryujinx.Ava.Systems
 
                     if (userResult is UserResult.Ok)
                     {
-                        OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
                     }
                 }
 
@@ -111,7 +87,7 @@ namespace Ryujinx.Ava.Systems
             }
 
 
-            if (!Version.TryParse(_buildVer, out Version newVersion))
+            if (!Version.TryParse(_versionResponse.Version, out Version newVersion))
             {
                 Logger.Error?.Print(LogClass.Application,
                     $"Failed to convert the received {RyujinxApp.FullAppName} version from the update server!");
@@ -127,17 +103,5 @@ namespace Ryujinx.Ava.Systems
 
             return (currentVersion, newVersion);
         }
-        
-        [JsonSerializable(typeof(UpdaterResponse))]
-        partial class UpdaterResponseJsonContext : JsonSerializerContext;
-
-        public class UpdaterResponse
-        {
-            [JsonPropertyName("tag")] public string Tag { get; set; }
-            [JsonPropertyName("download_url")] public string DownloadUrl { get; set; }
-            [JsonPropertyName("web_url")] public string ReleaseUrl { get; set; }
-
-            [JsonIgnore] public string ReleaseUrlFormat => ReleaseUrl.Replace(Tag, "{0}");
-        }
     }
 }

src/Ryujinx/Systems/Updater/Updater.cs

@@ -5,13 +5,11 @@ using ICSharpCode.SharpZipLib.GZip;
 using ICSharpCode.SharpZipLib.Tar;
 using ICSharpCode.SharpZipLib.Zip;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Common.Models.Github;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -35,17 +33,13 @@ namespace Ryujinx.Ava.Systems
         private static readonly string _updateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
         private static readonly string _updatePublishDir = Path.Combine(_updateDir, "publish");
         private const int ConnectionCount = 4;
-
+        
-        private static string _buildVer;
-        private static string _buildUrl;
         private static long _buildSize;
         private static bool _updateSuccessful;
         private static bool _running;
 
         private static readonly string[] _windowsDependencyDirs = [];
         
-        private static string _changelogUrlFormat = null;
-        
         public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
         {
             if (_running)
@@ -72,7 +66,7 @@ namespace Ryujinx.Ava.Systems
 
                     if (userResult is UserResult.Ok)
                     {
-                        OpenHelper.OpenUrl(_changelogUrlFormat.Format(currentVersion));
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
                     }
                 }
 
@@ -92,7 +86,7 @@ namespace Ryujinx.Ava.Systems
                 // GitLab instance is located in Ukraine. Connection times will vary across the world.
                 buildSizeClient.Timeout = TimeSpan.FromSeconds(10);
 
-                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_buildUrl), HttpCompletionOption.ResponseHeadersRead);
+                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead);
 
                 _buildSize = message.Content.Headers.ContentRange.Length.Value;
             }
@@ -122,7 +116,7 @@ namespace Ryujinx.Ava.Systems
                 switch (shouldUpdate)
                 {
                     case UserResult.Yes:
-                        await UpdateRyujinx(_buildUrl);
+                        await UpdateRyujinx(_versionResponse.ArtifactUrl);
                         break;
                     // Secondary button maps to no, which in this case is the show changelog button.
                     case UserResult.No: