test new canary release channel repo

This reverts commit 1156307ef9

.github/workflows/canary.yml

@@ -56,24 +56,24 @@ jobs:
         with:
           name: "Canary ${{ steps.version_info.outputs.build_version }}"
           tag: ${{ steps.version_info.outputs.build_version }}
-          body: |            
+          body: |
             # Canary builds:
             
             These builds are experimental and may sometimes not work, use [regular builds](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/Stable-Releases/releases/latest) instead if that sounds like something you don't want to deal with.
             
             | Platform | Artifact |
             |--|--|
-            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Windows ARM 64-bit | [Canary Windows ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
-            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Windows ARM 64-bit | [Canary Windows ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
+            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Canary macOS Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
             
             **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})**
           omitBodyDuringUpdate: true
-          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
-          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
-          token: ${{ secrets.RELEASE_TOKEN }}
+          owner: ${{ secrets.RC_OWNER }}
+          repo: ${{ secrets.RC_CANARY_NAME }}
+          token: ${{ secrets.ALT_RELEASE_TOKEN }}
 
   release:
     name: Release for ${{ matrix.platform.name }}
@@ -110,7 +110,6 @@ jobs:
           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_SOURCE_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
           sed -r --in-place '/^Name=Ryujinx$/s/Name=Ryujinx/Name=Ryujinx-Canary/' distribution/linux/Ryujinx.desktop          
         shell: bash
@@ -169,7 +168,7 @@ jobs:
             exit 1
           fi
 
-          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|Canary-Releases|latest|*-$ARCH_NAME.AppImage.zsync"
+          export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync"
           BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
 
           pushd publish_appimage
@@ -187,23 +186,23 @@ jobs:
           body: |
             # Canary builds:
             
-            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/latest) instead if that sounds like something you don't want to deal with.
+            These builds are experimental and may sometimes not work, use [regular builds](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/Stable-Releases/releases/latest) instead if that sounds like something you don't want to deal with.
             
             | Platform | Artifact |
             |--|--|
-            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Windows ARM 64-bit | [Canary Windows ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
-            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
-            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
-            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Windows ARM 64-bit | [Canary Windows ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
+            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
+            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
+            | macOS | [Canary macOS Artifact](https://github.com/${{ secrets.RC_OWNER }}/${{ secrets.RC_CANARY_NAME }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
             
             **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})**
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
-          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
-          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
-          token: ${{ secrets.RELEASE_TOKEN }}
+          owner: ${{ secrets.RC_OWNER }}
+          repo: ${{ secrets.RC_CANARY_NAME }}
+          token: ${{ secrets.ALT_RELEASE_TOKEN }}
 
   macos_release:
     name: Release MacOS universal
@@ -246,7 +245,6 @@ jobs:
           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_SOURCE_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
 
@@ -264,6 +262,6 @@ jobs:
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
-          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
-          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
-          token: ${{ secrets.RELEASE_TOKEN }}
+          owner: ${{ secrets.RC_OWNER }}
+          repo: ${{ secrets.RC_CANARY_NAME }}
+          token: ${{ secrets.ALT_RELEASE_TOKEN }}

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -193,7 +193,7 @@ namespace ARMeilleure.Translation.PTC
             _infosStream.Seek(0L, SeekOrigin.Begin);
             bool foundBadFunction = false;
 
-            for (int index = 0; index < _infosStream.Length; index++)
+            for (int index = 0; index < GetEntriesCount(); index++)
             {
                 InfoEntry infoEntry = DeserializeStructure<InfoEntry>(_infosStream);
                 foreach (ulong address in blacklist)
@@ -201,7 +201,7 @@ namespace ARMeilleure.Translation.PTC
                     if (infoEntry.Address == address)
                     {
                         containsBlacklistedFunctions = true;
-                        Logger.Warning?.Print(LogClass.Ptc, "Translation cache invalidated: Found blacklisted functions");
+                        Logger.Warning?.Print(LogClass.Ptc, "PPTC cache invalidated: Found blacklisted functions in PPTC cache");
                         foundBadFunction = true;
                         break;
                     }

src/Ryujinx.HLE/HOS/Services/Account/Acc/Types/UserId.cs

@@ -51,14 +51,8 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
             return High.ToString("x16") + Low.ToString("x16");
         }
 
-        public Uid ToLibHacUid()
-        {
-            return new Uid((ulong)High, (ulong)Low);
-        }
-
-        public UInt128 ToUInt128()
-        {
-            return new UInt128((ulong)High, (ulong)Low);
-        }
+        public Uid ToLibHacUid() => new((ulong)High, (ulong)Low);
+        public LibHac.Fs.UserId ToLibHac() => new((ulong)High, (ulong)Low);
+        public UInt128 ToUInt128() => new((ulong)High, (ulong)Low);
     }
 }

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -35,369 +35,5 @@ namespace Ryujinx.Ava.UI.Controls
         {
             AvaloniaXamlLoader.Load(this);
         }
-        
-        public static RelayCommand<MainWindowViewModel> ToggleFavorite { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
-                viewModel =>
-                {
-                    viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
-
-                    ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
-                    {
-                        appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
-                    });
-
-                    viewModel.RefreshView();
-                }
-            );
-        
-        public static RelayCommand<MainWindowViewModel> OpenUserSaveDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel =>
-                    OpenSaveDirectory(viewModel, SaveDataType.Account, new UserId((ulong)viewModel.AccountManager.LastOpenedUser.UserId.High, (ulong)viewModel.AccountManager.LastOpenedUser.UserId.Low))
-                );
-        
-        public static RelayCommand<MainWindowViewModel> OpenDeviceSaveDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
-                viewModel => OpenSaveDirectory(viewModel, SaveDataType.Device, default));
-        
-        public static RelayCommand<MainWindowViewModel> OpenBcatSaveDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => OpenSaveDirectory(viewModel, SaveDataType.Bcat, default));
-
-        private static void OpenSaveDirectory(MainWindowViewModel viewModel, SaveDataType saveDataType, UserId userId)
-        {
-            SaveDataFilter saveDataFilter = SaveDataFilter.Make(viewModel.SelectedApplication.Id, saveDataType, userId, saveDataId: default, index: default);
-
-            ApplicationHelper.OpenSaveDir(in saveDataFilter, viewModel.SelectedApplication.Id, viewModel.SelectedApplication.ControlHolder, viewModel.SelectedApplication.Name);
-        }
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenTitleUpdateManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication)
-            );
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenDownloadableContentManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication)
-            );
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenCheatManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => StyleableAppWindow.ShowAsync(
-                    new CheatWindow(
-                        viewModel.VirtualFileSystem,
-                        viewModel.SelectedApplication.IdString,
-                        viewModel.SelectedApplication.Name,
-                        viewModel.SelectedApplication.Path
-                    )
-                ));
-        
-        public static RelayCommand<MainWindowViewModel> OpenModsDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel =>
-                {
-                    string modsBasePath = ModLoader.GetModsBasePath();
-                    string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, viewModel.SelectedApplication.IdString);
-
-                    OpenHelper.OpenFolder(titleModsPath);
-                });
-        
-        public static RelayCommand<MainWindowViewModel> OpenSdModsDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel =>
-            {
-                string sdModsBasePath = ModLoader.GetSdModsBasePath();
-                string titleModsPath = ModLoader.GetApplicationDir(sdModsBasePath, viewModel.SelectedApplication.IdString);
-
-                OpenHelper.OpenFolder(titleModsPath);
-            });
-
-        public static AsyncRelayCommand<MainWindowViewModel> OpenModManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-            {
-                await ModManagerView.Show(
-                    viewModel.SelectedApplication.Id,
-                    viewModel.SelectedApplication.IdBase,
-                    viewModel.ApplicationLibrary,
-                    viewModel.SelectedApplication.Name);
-            });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> PurgePtcCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-            {
-                UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogWarning],
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage, viewModel.SelectedApplication.Name)
-                );
-
-                if (result == UserResult.Yes)
-                {
-                    DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
-                    DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
-
-                    List<FileInfo> cacheFiles = [];
-
-                    if (mainDir.Exists)
-                    {
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
-                    }
-
-                    if (backupDir.Exists)
-                    {
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                    }
-
-                    if (cacheFiles.Count > 0)
-                    {
-                        foreach (FileInfo file in cacheFiles)
-                        {
-                            try
-                            {
-                                file.Delete();
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
-                            }
-                        }
-                    }
-                }
-            });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> NukePtcCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-            {
-                UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogWarning],
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCNukeMessage, viewModel.SelectedApplication.Name)
-                );
-
-                if (result == UserResult.Yes)
-                {
-                    DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
-                    DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
-
-                    List<FileInfo> cacheFiles = [];
-
-                    if (mainDir.Exists)
-                    {
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
-                    }
-
-                    if (backupDir.Exists)
-                    {
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.info"));
-                    }
-
-                    if (cacheFiles.Count > 0)
-                    {
-                        foreach (FileInfo file in cacheFiles)
-                        {
-                            try
-                            {
-                                file.Delete();
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
-                            }
-                        }
-                    }
-                }
-            });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> PurgeShaderCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-            {
-            UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
-                LocaleManager.Instance[LocaleKeys.DialogWarning],
-                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage, viewModel.SelectedApplication.Name)
-            );
-
-            if (result == UserResult.Yes)
-            {
-                DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader"));
-
-                List<DirectoryInfo> oldCacheDirectories = [];
-                List<FileInfo> newCacheFiles = [];
-
-                if (shaderCacheDir.Exists)
-                {
-                    oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
-                    newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
-                    newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
-                }
-
-                if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0))
-                {
-                    foreach (DirectoryInfo directory in oldCacheDirectories)
-                    {
-                        try
-                        {
-                            directory.Delete(true);
-                        }
-                        catch (Exception ex)
-                        {
-                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, ex));
-                        }
-                    }
-
-                    foreach (FileInfo file in newCacheFiles)
-                    {
-                        try
-                        {
-                            file.Delete();
-                        }
-                        catch (Exception ex)
-                        {
-                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.ShaderCachePurgeError, file.Name, ex));
-                        }
-                    }
-                }
-            } 
-            });
-        
-        public static RelayCommand<MainWindowViewModel> OpenPtcDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel =>
-            {
-                string ptcDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu");
-                string mainDir = Path.Combine(ptcDir, "0");
-                string backupDir = Path.Combine(ptcDir, "1");
-
-                if (!Directory.Exists(ptcDir))
-                {
-                    Directory.CreateDirectory(ptcDir);
-                    Directory.CreateDirectory(mainDir);
-                    Directory.CreateDirectory(backupDir);
-                }
-
-                OpenHelper.OpenFolder(ptcDir);
-            });
-        
-        public static RelayCommand<MainWindowViewModel> OpenShaderCacheDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel =>
-                {
-                    string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString.ToLower(), "cache", "shader");
-
-                    if (!Directory.Exists(shaderCacheDir))
-                    {
-                        Directory.CreateDirectory(shaderCacheDir);
-                    }
-
-                    OpenHelper.OpenFolder(shaderCacheDir);
-                });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationExeFs { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-                {
-                    await ApplicationHelper.ExtractSection(
-                        viewModel.StorageProvider,
-                        NcaSectionType.Code,
-                        viewModel.SelectedApplication.Path,
-                        viewModel.SelectedApplication.Name);
-                });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationRomFs { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-                {
-                    await ApplicationHelper.ExtractSection(
-                        viewModel.StorageProvider,
-                        NcaSectionType.Data,
-                        viewModel.SelectedApplication.Path,
-                        viewModel.SelectedApplication.Name);
-                });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationAocRomFs { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-                {
-                    DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.Id, viewModel.ApplicationLibrary);
-            
-                    if (selectedDlc is not null)
-                    {
-                        await ApplicationHelper.ExtractAoc(
-                            viewModel.StorageProvider,
-                            selectedDlc.ContainerPath,
-                            selectedDlc.FileName);
-                    }
-                });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationLogo { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-                {
-                    IReadOnlyList<IStorageFolder> result = await viewModel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                    {
-                        Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
-                        AllowMultiple = false,
-                    });
-
-                    if (result.Count == 0)
-                        return;
-
-                    ApplicationHelper.ExtractSection(
-                        result[0].Path.LocalPath,
-                        NcaSectionType.Logo,
-                        viewModel.SelectedApplication.Path,
-                        viewModel.SelectedApplication.Name);
-
-                    IStorageFile iconFile = await result[0].CreateFileAsync($"{viewModel.SelectedApplication.IdString}.png");
-                    await using Stream fileStream = await iconFile.OpenWriteAsync();
-
-                    using SKBitmap bitmap = SKBitmap.Decode(viewModel.SelectedApplication.Icon)
-                        .Resize(new SKSizeI(512, 512), SKFilterQuality.High);
-
-                    using SKData png = bitmap.Encode(SKEncodedImageFormat.Png, 100);
-
-                    png.SaveTo(fileStream);
-                });
-        
-        public static RelayCommand<MainWindowViewModel> CreateApplicationShortcut { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => ShortcutHelper.CreateAppShortcut(
-                    viewModel.SelectedApplication.Path,
-                    viewModel.SelectedApplication.Name,
-                    viewModel.SelectedApplication.IdString,
-                    viewModel.SelectedApplication.Icon
-                ));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> EditGameConfiguration { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-                {
-                    await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(viewModel));
-
-                    // just checking for file presence
-                    viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
-
-                    viewModel.RefreshView();
-                });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenApplicationCompatibility { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenApplicationData { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => ApplicationDataView.Show(viewModel.SelectedApplication));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> RunApplication { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => viewModel.LoadApplication(viewModel.SelectedApplication));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> TrimXci { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => viewModel.TrimXCIFile(viewModel.SelectedApplication.Path));
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1963,8 +1963,12 @@ namespace Ryujinx.Ava.UI.ViewModels
         #endregion
 
         #region Context Menu commands
+        
+        public static AsyncRelayCommand<MainWindowViewModel> RunApplication { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel => viewModel.LoadApplication(viewModel.SelectedApplication));
 
-                public static RelayCommand<MainWindowViewModel> ToggleFavorite { get; } =
+        public static RelayCommand<MainWindowViewModel> ToggleFavorite { get; } =
             Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel =>
                 {
@@ -1979,39 +1983,73 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
             );
         
-        public static RelayCommand<MainWindowViewModel> OpenUserSaveDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel =>
-                    OpenSaveDirectory(viewModel, SaveDataType.Account, new LibHac.Fs.UserId((ulong)viewModel.AccountManager.LastOpenedUser.UserId.High, (ulong)viewModel.AccountManager.LastOpenedUser.UserId.Low))
-                );
+        public static RelayCommand<MainWindowViewModel> CreateApplicationShortcut { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel => ShortcutHelper.CreateAppShortcut(
+                    viewModel.SelectedApplication.Path,
+                    viewModel.SelectedApplication.Name,
+                    viewModel.SelectedApplication.IdString,
+                    viewModel.SelectedApplication.Icon
+                ));
         
+        public static AsyncRelayCommand<MainWindowViewModel> EditGameConfiguration { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                async viewModel =>
+                {
+                    await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(viewModel));
+
+                    // just checking for file presence
+                    viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(
+                        Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString, false, false));
+
+                    viewModel.RefreshView();
+                });
+
+        public static AsyncRelayCommand<MainWindowViewModel> OpenApplicationCompatibility { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel => CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString));
+
+        public static AsyncRelayCommand<MainWindowViewModel> OpenApplicationData { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel => ApplicationDataView.Show(viewModel.SelectedApplication));
+
+        public static RelayCommand<MainWindowViewModel> OpenUserSaveDirectory { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel =>
+                    OpenSaveDirectory(viewModel, SaveDataType.Account, viewModel.AccountManager.LastOpenedUser.UserId.ToLibHac())
+            );
+
         public static RelayCommand<MainWindowViewModel> OpenDeviceSaveDirectory { get; } =
             Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel => OpenSaveDirectory(viewModel, SaveDataType.Device, default));
-        
+
         public static RelayCommand<MainWindowViewModel> OpenBcatSaveDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel => OpenSaveDirectory(viewModel, SaveDataType.Bcat, default));
 
-        private static void OpenSaveDirectory(MainWindowViewModel viewModel, SaveDataType saveDataType, LibHac.Fs.UserId userId)
+        private static void OpenSaveDirectory(MainWindowViewModel viewModel, SaveDataType saveDataType,
+            LibHac.Fs.UserId userId)
         {
-            SaveDataFilter saveDataFilter = SaveDataFilter.Make(viewModel.SelectedApplication.Id, saveDataType, userId, saveDataId: default, index: default);
+            SaveDataFilter saveDataFilter = SaveDataFilter.Make(viewModel.SelectedApplication.Id, saveDataType, userId,
+                saveDataId: default, index: default);
 
-            ApplicationHelper.OpenSaveDir(in saveDataFilter, viewModel.SelectedApplication.Id, viewModel.SelectedApplication.ControlHolder, viewModel.SelectedApplication.Name);
+            ApplicationHelper.OpenSaveDir(in saveDataFilter, viewModel.SelectedApplication.Id,
+                viewModel.SelectedApplication.ControlHolder, viewModel.SelectedApplication.Name);
         }
-        
+
         public static AsyncRelayCommand<MainWindowViewModel> OpenTitleUpdateManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel => TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication)
             );
-        
+
         public static AsyncRelayCommand<MainWindowViewModel> OpenDownloadableContentManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication)
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel =>
+                    DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication)
             );
-        
+
         public static AsyncRelayCommand<MainWindowViewModel> OpenCheatManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel => StyleableAppWindow.ShowAsync(
                     new CheatWindow(
                         viewModel.VirtualFileSystem,
@@ -2021,8 +2059,16 @@ namespace Ryujinx.Ava.UI.ViewModels
                     )
                 ));
         
+        public static AsyncRelayCommand<MainWindowViewModel> OpenModManager { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel => ModManagerView.Show(
+                    viewModel.SelectedApplication.Id,
+                    viewModel.SelectedApplication.IdBase,
+                    viewModel.ApplicationLibrary,
+                    viewModel.SelectedApplication.Name));
+
         public static RelayCommand<MainWindowViewModel> OpenModsDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel =>
                 {
                     string modsBasePath = ModLoader.GetModsBasePath();
@@ -2030,191 +2076,202 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                     OpenHelper.OpenFolder(titleModsPath);
                 });
-        
+
         public static RelayCommand<MainWindowViewModel> OpenSdModsDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel =>
-            {
-                string sdModsBasePath = ModLoader.GetSdModsBasePath();
-                string titleModsPath = ModLoader.GetApplicationDir(sdModsBasePath, viewModel.SelectedApplication.IdString);
+                {
+                    string sdModsBasePath = ModLoader.GetSdModsBasePath();
+                    string titleModsPath = ModLoader.GetApplicationDir(sdModsBasePath, viewModel.SelectedApplication.IdString);
 
-                OpenHelper.OpenFolder(titleModsPath);
-            });
-
-        public static AsyncRelayCommand<MainWindowViewModel> OpenModManager { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-            {
-                await ModManagerView.Show(
-                    viewModel.SelectedApplication.Id,
-                    viewModel.SelectedApplication.IdBase,
-                    viewModel.ApplicationLibrary,
-                    viewModel.SelectedApplication.Name);
-            });
+                    OpenHelper.OpenFolder(titleModsPath);
+                });
+        
+        public static AsyncRelayCommand<MainWindowViewModel> TrimXci { get; } =
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
+                viewModel => viewModel.TrimXCIFile(viewModel.SelectedApplication.Path));
         
         public static AsyncRelayCommand<MainWindowViewModel> PurgePtcCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
-            {
-                UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogWarning],
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage, viewModel.SelectedApplication.Name)
-                );
-
-                if (result == UserResult.Yes)
                 {
-                    DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
-                    DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
+                    UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
+                        LocaleManager.Instance[LocaleKeys.DialogWarning],
+                        LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionMessage,
+                            viewModel.SelectedApplication.Name)
+                    );
 
-                    List<FileInfo> cacheFiles = [];
-
-                    if (mainDir.Exists)
+                    if (result == UserResult.Yes)
                     {
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
-                    }
+                        DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath,
+                            viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
+                        DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath,
+                            viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
 
-                    if (backupDir.Exists)
-                    {
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                    }
+                        List<FileInfo> cacheFiles = [];
 
-                    if (cacheFiles.Count > 0)
-                    {
-                        foreach (FileInfo file in cacheFiles)
+                        if (mainDir.Exists)
                         {
-                            try
+                            cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
+                        }
+
+                        if (backupDir.Exists)
+                        {
+                            cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
+                        }
+
+                        if (cacheFiles.Count > 0)
+                        {
+                            foreach (FileInfo file in cacheFiles)
                             {
-                                file.Delete();
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
+                                try
+                                {
+                                    file.Delete();
+                                }
+                                catch (Exception ex)
+                                {
+                                    await ContentDialogHelper.CreateErrorDialog(
+                                        LocaleManager.Instance.UpdateAndGetDynamicValue(
+                                            LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
+                                }
                             }
                         }
                     }
-                }
-            });
-        
+                });
+
         public static AsyncRelayCommand<MainWindowViewModel> NukePtcCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
-            {
-                UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogWarning],
-                    LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCNukeMessage, viewModel.SelectedApplication.Name)
-                );
-
-                if (result == UserResult.Yes)
                 {
-                    DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
-                    DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
+                    UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
+                        LocaleManager.Instance[LocaleKeys.DialogWarning],
+                        LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCNukeMessage,
+                            viewModel.SelectedApplication.Name)
+                    );
 
-                    List<FileInfo> cacheFiles = [];
-
-                    if (mainDir.Exists)
+                    if (result == UserResult.Yes)
                     {
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
-                        cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
-                    }
+                        DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath,
+                            viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
+                        DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath,
+                            viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
 
-                    if (backupDir.Exists)
-                    {
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                        cacheFiles.AddRange(backupDir.EnumerateFiles("*.info"));
-                    }
+                        List<FileInfo> cacheFiles = [];
 
-                    if (cacheFiles.Count > 0)
-                    {
-                        foreach (FileInfo file in cacheFiles)
+                        if (mainDir.Exists)
                         {
-                            try
+                            cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
+                            cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
+                        }
+
+                        if (backupDir.Exists)
+                        {
+                            cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
+                            cacheFiles.AddRange(backupDir.EnumerateFiles("*.info"));
+                        }
+
+                        if (cacheFiles.Count > 0)
+                        {
+                            foreach (FileInfo file in cacheFiles)
                             {
-                                file.Delete();
-                            }
-                            catch (Exception ex)
-                            {
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
+                                try
+                                {
+                                    file.Delete();
+                                }
+                                catch (Exception ex)
+                                {
+                                    await ContentDialogHelper.CreateErrorDialog(
+                                        LocaleManager.Instance.UpdateAndGetDynamicValue(
+                                            LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
+                                }
                             }
                         }
                     }
-                }
-            });
-        
+                });
+
         public static AsyncRelayCommand<MainWindowViewModel> PurgeShaderCache { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
-            {
-            UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
-                LocaleManager.Instance[LocaleKeys.DialogWarning],
-                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage, viewModel.SelectedApplication.Name)
-            );
-
-            if (result == UserResult.Yes)
-            {
-                DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader"));
-
-                List<DirectoryInfo> oldCacheDirectories = [];
-                List<FileInfo> newCacheFiles = [];
-
-                if (shaderCacheDir.Exists)
                 {
-                    oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
-                    newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
-                    newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
-                }
+                    UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
+                        LocaleManager.Instance[LocaleKeys.DialogWarning],
+                        LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogShaderDeletionMessage,
+                            viewModel.SelectedApplication.Name)
+                    );
 
-                if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0))
-                {
-                    foreach (DirectoryInfo directory in oldCacheDirectories)
+                    if (result == UserResult.Yes)
                     {
-                        try
+                        DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath,
+                            viewModel.SelectedApplication.IdString, "cache", "shader"));
+
+                        List<DirectoryInfo> oldCacheDirectories = [];
+                        List<FileInfo> newCacheFiles = [];
+
+                        if (shaderCacheDir.Exists)
                         {
-                            directory.Delete(true);
+                            oldCacheDirectories.AddRange(shaderCacheDir.EnumerateDirectories("*"));
+                            newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.toc"));
+                            newCacheFiles.AddRange(shaderCacheDir.GetFiles("*.data"));
                         }
-                        catch (Exception ex)
+
+                        if ((oldCacheDirectories.Count > 0 || newCacheFiles.Count > 0))
                         {
-                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, ex));
+                            foreach (DirectoryInfo directory in oldCacheDirectories)
+                            {
+                                try
+                                {
+                                    directory.Delete(true);
+                                }
+                                catch (Exception ex)
+                                {
+                                    await ContentDialogHelper.CreateErrorDialog(
+                                        LocaleManager.Instance.UpdateAndGetDynamicValue(
+                                            LocaleKeys.DialogPPTCDeletionErrorMessage, directory.Name, ex));
+                                }
+                            }
+
+                            foreach (FileInfo file in newCacheFiles)
+                            {
+                                try
+                                {
+                                    file.Delete();
+                                }
+                                catch (Exception ex)
+                                {
+                                    await ContentDialogHelper.CreateErrorDialog(
+                                        LocaleManager.Instance.UpdateAndGetDynamicValue(
+                                            LocaleKeys.ShaderCachePurgeError, file.Name, ex));
+                                }
+                            }
                         }
                     }
+                });
 
-                    foreach (FileInfo file in newCacheFiles)
-                    {
-                        try
-                        {
-                            file.Delete();
-                        }
-                        catch (Exception ex)
-                        {
-                            await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.ShaderCachePurgeError, file.Name, ex));
-                        }
-                    }
-                }
-            } 
-            });
-        
         public static RelayCommand<MainWindowViewModel> OpenPtcDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel =>
-            {
-                string ptcDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu");
-                string mainDir = Path.Combine(ptcDir, "0");
-                string backupDir = Path.Combine(ptcDir, "1");
-
-                if (!Directory.Exists(ptcDir))
                 {
-                    Directory.CreateDirectory(ptcDir);
-                    Directory.CreateDirectory(mainDir);
-                    Directory.CreateDirectory(backupDir);
-                }
+                    string ptcDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString,
+                        "cache", "cpu");
+                    string mainDir = Path.Combine(ptcDir, "0");
+                    string backupDir = Path.Combine(ptcDir, "1");
+
+                    if (!Directory.Exists(ptcDir))
+                    {
+                        Directory.CreateDirectory(ptcDir);
+                        Directory.CreateDirectory(mainDir);
+                        Directory.CreateDirectory(backupDir);
+                    }
+
+                    OpenHelper.OpenFolder(ptcDir);
+                });
 
-                OpenHelper.OpenFolder(ptcDir);
-            });
-        
         public static RelayCommand<MainWindowViewModel> OpenShaderCacheDirectory { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 viewModel =>
                 {
-                    string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString.ToLower(), "cache", "shader");
+                    string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath,
+                        viewModel.SelectedApplication.IdString.ToLower(), "cache", "shader");
 
                     if (!Directory.Exists(shaderCacheDir))
                     {
@@ -2225,7 +2282,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 });
         
         public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationExeFs { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
                 {
                     await ApplicationHelper.ExtractSection(
@@ -2234,9 +2291,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                         viewModel.SelectedApplication.Path,
                         viewModel.SelectedApplication.Name);
                 });
-        
+
         public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationRomFs { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
                 {
                     await ApplicationHelper.ExtractSection(
@@ -2245,13 +2302,14 @@ namespace Ryujinx.Ava.UI.ViewModels
                         viewModel.SelectedApplication.Path,
                         viewModel.SelectedApplication.Name);
                 });
-        
+
         public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationAocRomFs { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
                 {
-                    DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.Id, viewModel.ApplicationLibrary);
-            
+                    DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.Id,
+                        viewModel.ApplicationLibrary);
+
                     if (selectedDlc is not null)
                     {
                         await ApplicationHelper.ExtractAoc(
@@ -2260,16 +2318,17 @@ namespace Ryujinx.Ava.UI.ViewModels
                             selectedDlc.FileName);
                     }
                 });
-        
+
         public static AsyncRelayCommand<MainWindowViewModel> ExtractApplicationLogo { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
+            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null,
                 async viewModel =>
                 {
-                    IReadOnlyList<IStorageFolder> result = await viewModel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                    {
-                        Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
-                        AllowMultiple = false,
-                    });
+                    IReadOnlyList<IStorageFolder> result = await viewModel.StorageProvider.OpenFolderPickerAsync(
+                        new FolderPickerOpenOptions
+                        {
+                            Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
+                            AllowMultiple = false,
+                        });
 
                     if (result.Count == 0)
                         return;
@@ -2280,7 +2339,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                         viewModel.SelectedApplication.Path,
                         viewModel.SelectedApplication.Name);
 
-                    IStorageFile iconFile = await result[0].CreateFileAsync($"{viewModel.SelectedApplication.IdString}.png");
+                    IStorageFile iconFile =
+                        await result[0].CreateFileAsync($"{viewModel.SelectedApplication.IdString}.png");
                     await using Stream fileStream = await iconFile.OpenWriteAsync();
 
                     using SKBitmap bitmap = SKBitmap.Decode(viewModel.SelectedApplication.Icon)
@@ -2291,43 +2351,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                     png.SaveTo(fileStream);
                 });
         
-        public static RelayCommand<MainWindowViewModel> CreateApplicationShortcut { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => ShortcutHelper.CreateAppShortcut(
-                    viewModel.SelectedApplication.Path,
-                    viewModel.SelectedApplication.Name,
-                    viewModel.SelectedApplication.IdString,
-                    viewModel.SelectedApplication.Icon
-                ));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> EditGameConfiguration { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                async viewModel =>
-                {
-                    await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(viewModel));
-
-                    // just checking for file presence
-                    viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
-
-                    viewModel.RefreshView();
-                });
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenApplicationCompatibility { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> OpenApplicationData { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => ApplicationDataView.Show(viewModel.SelectedApplication));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> RunApplication { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => viewModel.LoadApplication(viewModel.SelectedApplication));
-        
-        public static AsyncRelayCommand<MainWindowViewModel> TrimXci { get; } =
-            Commands.CreateConditional<MainWindowViewModel>(vm => vm?.SelectedApplication != null, 
-                viewModel => viewModel.TrimXCIFile(viewModel.SelectedApplication.Path));
-
         #endregion
     }
 }