Revert "Add support for multi game XCIs (#5638 )" (#5914 )

This reverts commit 5c3cfb84c0.
infra: switch back to ubuntu 20.04 LTS for macOS release
2023-11-11 23:35:30 -03:00 · 2023-11-11 22:38:54 +01:00 · 2023-11-11 22:35:58 +01:00 · 2023-11-11 21:56:57 +01:00 · 2023-11-11 16:08:42 +01:00 · 2023-11-11 15:57:15 +01:00
5 changed files with 20 additions and 23 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ env:
 jobs:
  tag:
    name: Create tag
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - name: Get version info
        id: version_info
@@ -156,11 +156,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 14
+      - name: Setup LLVM 15
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 15

      - name: Install rcodesign
        run: |
@@ -215,4 +215,4 @@ jobs:
    needs: release
    with:
      ryujinx_version: "1.1.${{ github.run_number }}"
-    secrets: inherit
+    secrets: inherit
--- a/src/Ryujinx.Ava/Assets/Locales/en_US.json
+++ b/src/Ryujinx.Ava/Assets/Locales/en_US.json
@@ -14,7 +14,7 @@
  "MenuBarFileOpenEmuFolder": "Open Ryujinx Folder",
  "MenuBarFileOpenLogsFolder": "Open Logs Folder",
  "MenuBarFileExit": "_Exit",
-  "MenuBarOptions": "Options",
+  "MenuBarOptions": "_Options",
  "MenuBarOptionsToggleFullscreen": "Toggle Fullscreen",
  "MenuBarOptionsStartGamesInFullscreen": "Start Games in Fullscreen Mode",
  "MenuBarOptionsStopEmulation": "Stop Emulation",
@@ -30,7 +30,7 @@
  "MenuBarToolsManageFileTypes": "Manage file types",
  "MenuBarToolsInstallFileTypes": "Install file types",
  "MenuBarToolsUninstallFileTypes": "Uninstall file types",
-  "MenuBarHelp": "Help",
+  "MenuBarHelp": "_Help",
  "MenuBarHelpCheckForUpdates": "Check for Updates",
  "MenuBarHelpAbout": "About",
  "MenuSearch": "Search...",
--- a/src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml
@@ -12,6 +12,11 @@
        Click="ToggleFavorite_Click"
        Header="{locale:Locale GameListContextMenuToggleFavorite}"
        ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
+	<MenuItem
+		Click="CreateApplicationShortcut_Click"
+		Header="{locale:Locale GameListContextMenuCreateShortcut}"
+        IsEnabled="{Binding CreateShortcutEnabled}"
+		ToolTip.Tip="{locale:Locale GameListContextMenuCreateShortcutToolTip}" />
    <Separator />
    <MenuItem
        Click="OpenUserSaveDirectory_Click"
@@ -82,9 +87,4 @@
            Header="{locale:Locale GameListContextMenuExtractDataLogo}"
            ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
    </MenuItem>
-	<MenuItem
-		Click="CreateApplicationShortcut_Click"
-		Header="{locale:Locale GameListContextMenuCreateShortcut}"
-        IsEnabled="{Binding CreateShortcutEnabled}"
-		ToolTip.Tip="{locale:Locale GameListContextMenuCreateShortcutToolTip}" />
 </MenuFlyout>
--- a/src/Ryujinx.Ui.Common/Helper/ShortcutHelper.cs
+++ b/src/Ryujinx.Ui.Common/Helper/ShortcutHelper.cs
@@ -30,7 +30,7 @@ namespace Ryujinx.Ui.Common.Helper
            graphic.DrawImage(image, 0, 0, 128, 128);
            SaveBitmapAsIcon(bitmap, iconPath);

-            var shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(basePath, applicationFilePath), iconPath, 0);
+            var shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath), iconPath, 0);
            shortcut.StringData.NameString = cleanedAppName;
            shortcut.WriteToFile(Path.Combine(desktopPath, cleanedAppName + ".lnk"));
        }
@@ -46,16 +46,16 @@ namespace Ryujinx.Ui.Common.Helper
            image.SaveAsPng(iconPath);

            using StreamWriter outputFile = new(Path.Combine(desktopPath, cleanedAppName + ".desktop"));
-            outputFile.Write(desktopFile, cleanedAppName, iconPath, GetArgsString(basePath, applicationFilePath));
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath)}");
        }

        [SupportedOSPlatform("macos")]
        private static void CreateShortcutMacos(string appFilePath, byte[] iconData, string desktopPath, string cleanedAppName)
        {
-            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppDomain.CurrentDomain.FriendlyName);
+            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx");
            var plistFile = EmbeddedResources.ReadAllText("Ryujinx.Ui.Common/shortcut-template.plist");
            // Macos .App folder
-            string contentFolderPath = Path.Combine(desktopPath, cleanedAppName + ".app", "Contents");
+            string contentFolderPath = Path.Combine("/Applications", cleanedAppName + ".app", "Contents");
            string scriptFolderPath = Path.Combine(contentFolderPath, "MacOS");

            if (!Directory.Exists(scriptFolderPath))
@@ -69,7 +69,7 @@ namespace Ryujinx.Ui.Common.Helper
            using StreamWriter scriptFile = new(scriptPath);

            scriptFile.WriteLine("#!/bin/sh");
-            scriptFile.WriteLine(GetArgsString(basePath, appFilePath));
+            scriptFile.WriteLine($"{basePath} {GetArgsString(appFilePath)}");

            // Set execute permission
            FileInfo fileInfo = new(scriptPath);
@@ -125,13 +125,10 @@ namespace Ryujinx.Ui.Common.Helper
            throw new NotImplementedException("Shortcut support has not been implemented yet for this OS.");
        }

-        private static string GetArgsString(string basePath, string appFilePath)
+        private static string GetArgsString(string appFilePath)
        {
            // args are first defined as a list, for easier adjustments in the future
-            var argsList = new List<string>
-            {
-                basePath,
-            };
+            var argsList = new List<string>();

            if (!string.IsNullOrEmpty(CommandLineState.BaseDirPathArg))
            {
@@ -141,7 +138,6 @@ namespace Ryujinx.Ui.Common.Helper

            argsList.Add($"\"{appFilePath}\"");

-
            return String.Join(" ", argsList);
        }

--- a/src/Ryujinx/Ui/Widgets/GameTableContextMenu.Designer.cs
+++ b/src/Ryujinx/Ui/Widgets/GameTableContextMenu.Designer.cs
@@ -211,6 +211,8 @@ namespace Ryujinx.Ui.Widgets
            _manageSubMenu.Append(_openPtcDirMenuItem);
            _manageSubMenu.Append(_openShaderCacheDirMenuItem);

+            Add(_createShortcutMenuItem);
+            Add(new SeparatorMenuItem());
            Add(_openSaveUserDirMenuItem);
            Add(_openSaveDeviceDirMenuItem);
            Add(_openSaveBcatDirMenuItem);
@@ -223,7 +225,6 @@ namespace Ryujinx.Ui.Widgets
            Add(new SeparatorMenuItem());
            Add(_manageCacheMenuItem);
            Add(_extractMenuItem);
-            Add(_createShortcutMenuItem);

            ShowAll();
        }
Author	SHA1	Message	Date
gdkchan	51065d9129	Revert "Add support for multi game XCIs (#5638 )" (#5914 ) This reverts commit `5c3cfb84c0`.	2023-11-11 23:35:30 -03:00
Mary Guillemard	6228331fd1	infra: switch back to ubuntu 20.04 LTS for macOS release	2023-11-11 22:38:54 +01:00
Mary Guillemard	98e7c33630	infra: Update to LLVM 15 for macOS release	2023-11-11 22:35:58 +01:00
TSRBerry	5c3cfb84c0	Add support for multi game XCIs (#5638 ) * Add default values to ApplicationData directly * Refactor application loading It should now be possible to load multi game XCIs. Included updates won't be detected for now. Opening a game from the command line currently only opens the first one. * Only include program NCAs where at least one tuple item is not null * Get application data by title id and add programIndex check back * Refactor application loading again and remove duplicate code * Actually use patch ncas for updates * Fix number of applications found with multi game xcis * Don't load bundled updates from multi game xcis * Change ApplicationData.TitleId type to ulong & Add TitleIdString property * Use cnmt files and ContentCollection to load programs * Ava: Add updates and DLCs from gamecarts * Get the cnmt file from its NCA * Ava: Identify bundled updates in updater window * Fix the (hopefully) last few bugs * Add idOffset parameter to GetNcaByType * Handle missing file for dlc.json * Ava: Shorten error message for invalid files * Gtk: Add additional string for bundled updates in TitleUpdateWindow * Hopefully fix DLC issues * Apply formatting * Finally fix DLC issues * Adjust property names and fileSize field * Read the correct update file * Fix wrong casing for application id strings * Rename TitleId to ApplicationId * Address review comments * Fix formatting issues * Apply suggestions from code review Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Gracefully fail when loading pfs for update and dlc window * Fix applications with multiple programs * Fix DLCWindow crash on GTK * Fix some GUI issues * Remove IsXci again --------- Co-authored-by: gdkchan <gab.dark.100@gmail.com>	2023-11-11 21:56:57 +01:00
NitroTears	55557525b1	Create Desktop Shortcut fixes (#5852 ) * remove duplicate basePath arg, add --fullscreen arg * Changing FriendlyName to set "Ryujinx" text * Fix GetArgsString using the base path * Change desktop path to the Applications folder when creating shortcut on Mac Co-authored-by: Nicko Anastassiu <134955950+nickoanastassiu@users.noreply.github.com> * Move Create Shortcut button to top of context menu --------- Co-authored-by: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Co-authored-by: Nicko Anastassiu <134955950+nickoanastassiu@users.noreply.github.com>	2023-11-11 16:08:42 +01:00
Isaac Marovitz	7e6342e44d	Add accelerator keys for Options and Help (#5884 )	2023-11-11 15:57:15 +01:00