Merge branch 'ExcludePausedTime' into 'master'

Exclude time spent with emulator paused from play time See merge request [ryubing/ryujinx!55](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/55)
Update Korean translation (ryubing/ryujinx!64 )
2025-07-19 07:36:30 +02:00 · 2025-06-17 03:30:04 -05:00 · 2025-06-17 03:21:30 -05:00 · 2025-06-16 02:06:45 -05:00 · 2025-06-16 02:05:11 -05:00 · 2025-06-16 02:04:48 -05:00
8 changed files with 31 additions and 17 deletions
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@ -77,6 +77,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Gene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@ -84,10 +86,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\canary.yml = .github\workflows\canary.yml
 		Directory.Packages.props = Directory.Packages.props
 		.github\workflows\release.yml = .github\workflows\release.yml
+		nuget.config = nuget.config
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
--- a/assets/locales.json
+++ b/assets/locales.json
@ -4009,7 +4009,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "Ryujinx 1.1.1403을 연상시키는 이전 Avalonia Ryujinx UI를 표시합니다. 이 기능은 Windows가 아닌 플랫폼에서는 기본적으로 활성화됩니다.\n 클래식 스타일의 타이틀 바가 돌아왔고 주요 창 레이아웃 재작업이 역전되었습니다. 이 툴팁 위의 설정 탐색 배치와 같은 작업입니다.",
+        "ko_KR": "Ryujinx 1.1.1403을 연상시키는 이전 Avalonia Ryujinx UI를 표시합니다. 이 기능은 윈도가 아닌 플랫폼에서는 기본적으로 활성화됩니다.\n 클래식 스타일의 타이틀 바가 돌아왔고 주요 창 레이아웃 변경 사항이 원래대로 적용됩니다. 이 툴팁 위의 설정 탐색 배치와 같은 경우입니다.",
        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
        "pl_PL": "",
        "pt_BR": "Mostrar a Interface Avalonia antiga do Ryujinx 1.1.1403. Esta versão é ativada por padrão nas plataformas que não sejam Windows. \nO estilo clássico da Barra de Título retorna e grande parte das mudanças do Layout de janela são revertidas; assim como as configurações de posicionamento da navegação acima dessa descrição.",
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@ -2746,6 +2746,7 @@
 01005D701264A000,"SpyHack",,playable,2021-04-15 10:53:51
 010077B00E046000,"Spyro™ Reignited Trilogy",nvdec;UE4,playable,2022-09-11 18:38:33
 0100085012A0E000,"Squeakers",,playable,2020-12-13 12:13:05
+0100E1D01EB2E000,"Squeakross: Home Squeak Home",,playable,2025-06-16 02:02:00
 010009300D31C000,"Squidgies Takeover",,playable,2020-07-20 22:28:08
 0100FCD0102EC000,"Squidlit",,playable,2020-08-06 12:38:32
 0100EBF00E702000,"STAR OCEAN First Departure R",nvdec,playable,2021-07-05 19:29:16
--- a/nuget.config
+++ b/nuget.config
@ -8,4 +8,16 @@
        <!--<add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />-->
        <add key="Ryujinx.UpdateClient" value="https://git.ryujinx.app/api/v4/projects/71/packages/nuget/index.json" />
    </packageSources>
+    <packageSourceMapping>
+        <!-- key value for <packageSource> should match key values from <packageSources> element -->
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+        <packageSource key="Ryujinx.UpdateClient">
+            <package pattern="Ryujinx.UpdateClient" />
+        </packageSource>
+        <!--<packageSource key="LibHacAlpha">
+            <package pattern="Ryujinx.LibHac" />
+        </packageSource>-->
+    </packageSourceMapping>
 </configuration>
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@ -195,6 +195,7 @@ namespace Ryujinx.Common
            "01008d100d43e000", // Saints Row IV
            "0100de600beee000", // Saints Row: The Third - The Full Package
            "01001180021fa000", // Shovel Knight: Specter of Torment
+            "0100e1D01eb2e000", // Squeakross: Home Squeak Home
            "0100e65002bb8000", // Stardew Valley
            "0100d7a01b7a2000", // Star Wars: Bounty Hunter
            "0100800015926000", // Suika Game
--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/src/Ryujinx/Systems/AppHost.cs
@ -75,6 +75,7 @@ namespace Ryujinx.Ava.Systems

        private readonly long _ticksPerFrame;
        private readonly Stopwatch _chrono;
+        private readonly Stopwatch _playTimer;
        private long _ticks;

        private readonly AccountManager _accountManager;
@ -175,6 +176,7 @@ namespace Ryujinx.Ava.Systems

            _chrono = new Stopwatch();
            _ticksPerFrame = Stopwatch.Frequency / TargetFps;
+            _playTimer = new Stopwatch();

            if (ApplicationPath.StartsWith("@SystemContent"))
            {
@ -565,6 +567,7 @@ namespace Ryujinx.Ava.Systems
        public void Stop()
        {
            _isActive = false;
+            _playTimer.Stop();
        }

        private void Exit()
@ -616,7 +619,7 @@ namespace Ryujinx.Ava.Systems
        private void Dispose()
        {
            if (Device.Processes != null)
-                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText);
+                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText, _playTimer.Elapsed);

            ConfigurationState.Instance.System.IgnoreMissingServices.Event -= UpdateIgnoreMissingServicesState;
            ConfigurationState.Instance.Graphics.AspectRatio.Event -= UpdateAspectRatioState;
@ -635,6 +638,7 @@ namespace Ryujinx.Ava.Systems
            _gpuCancellationTokenSource.Dispose();

            _chrono.Stop();
+            _playTimer.Stop();
        }

        public void DisposeGpu()
@ -868,6 +872,7 @@ namespace Ryujinx.Ava.Systems
            ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText,
                appMetadata => appMetadata.UpdatePreGame()
            );
+            _playTimer.Start();

            return true;
        }
@ -877,6 +882,7 @@ namespace Ryujinx.Ava.Systems
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
+            _playTimer.Start();
            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }
@ -886,6 +892,7 @@ namespace Ryujinx.Ava.Systems
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
+            _playTimer.Stop();
            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
        }
--- a/src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs
@ -33,19 +33,11 @@ namespace Ryujinx.Ava.Systems.AppLibrary
        /// <summary>
        /// Updates <see cref="LastPlayed"/> and <see cref="TimePlayed"/>. Call this after a game ends.
        /// </summary>
-        public void UpdatePostGame()
+        /// <param name="playTime">The active gameplay time this past session.</param>
+        public void UpdatePostGame(TimeSpan playTime)
        {
-            DateTime? prevLastPlayed = LastPlayed;
            UpdatePreGame();
-
-            if (!prevLastPlayed.HasValue)
-            {
-                return;
-            }
-
-            TimeSpan diff = DateTime.UtcNow - prevLastPlayed.Value;
-            double newTotalSeconds = TimePlayed.Add(diff).TotalSeconds;
-            TimePlayed = TimeSpan.FromSeconds(Math.Round(newTotalSeconds, MidpointRounding.AwayFromZero));
+            TimePlayed += playTime;
        }
    }
 }
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@ -1688,8 +1688,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                RendererHostControl.Focus();
            });

-        public static void UpdateGameMetadata(string titleId)
-            => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame());
+        public static void UpdateGameMetadata(string titleId, TimeSpan playTime)
+            => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame(playTime));

        public void RefreshFirmwareStatus()
        {
Author	SHA1	Message	Date
mqudsi	7d4cddc335	Merge branch 'ExcludePausedTime' into 'master' Exclude time spent with emulator paused from play time See merge request [ryubing/ryujinx!55](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/55)	2025-06-17 03:30:04 -05:00
Hack茶ん	39944b2063	Update Korean translation (ryubing/ryujinx!64 ) See merge request ryubing/ryujinx!64	2025-06-17 03:21:30 -05:00
GreemDev	973c6ba5df	UI: RPC: Squeakross: Home Squeak Home image docs: compat: Squeakross: Home Squeak Home: Playable	2025-06-16 02:06:45 -05:00
GreemDev	6803c91da8	infra: Add package source mappings for Ryujinx.UpdateClient to silence compile warnings	2025-06-16 02:05:11 -05:00
GreemDev	557c2a50b2	infra: Add NuGet config to solution items	2025-06-16 02:04:48 -05:00
Mahmoud Al-Qudsi	32ae313d77	Rework updates of application metadata gameplay hours Rely on `AppHost` to more accurately track active gameplay time instead of doing naive DateTime.UtcNow subtraction in UpdatePre/UpdatePostGame() calls.	2025-06-11 15:52:28 -05:00
Mahmoud Al-Qudsi	b5c82f8a5b	Exclude time spent with emulator paused from play time With this change, the play time reported internally by a game's gameplay timer should match (or be much closer to matching) what Ryujinx displays in the application library. Aside from this being closer to the natural expectation of what "hours played" would take into account (as by definition time spent paused is time spent not playing), this also brings us closer to the behavior of other emulators and game libraries.	2025-06-11 15:22:05 -05:00