Recents fix + UI enhancements

Reviewed-on: MeloNX/MeloNX#6

Compile.md

@@ -5,6 +5,7 @@
 Before you begin, ensure you have the following installed:
 
 - [**.NET 8.0**](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- [**Xcode**](https://apps.apple.com/de/app/xcode/id497799835?l=en-GB&mt=12$0)
 - A Mac running **macOS**
 
 ## Compilation Steps

README.md

@@ -19,7 +19,7 @@
 
 # Compatibility
 
-MeloNX works on iPhone X and later and iPad 7th Gen and later. Check out the Compatibility on the <a href="https://melonx.org/compatibility/" target="_blank">website</a>.
+MeloNX works on iPhone XS/XR and later and iPad 8th Gen and later. Check out the Compatibility on the <a href="https://melonx.org/compatibility/" target="_blank">website</a>.
 
 # Usage
 

src/MeloNX/MeloNX.xcodeproj/project.pbxproj

@@ -738,7 +738,7 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -862,7 +862,7 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

src/MeloNX/MeloNX/App/Core/Headers/Ryujinx-Header.h

@@ -31,8 +31,21 @@ struct GameInfo {
     unsigned int ImageSize;
 };
 
+struct DlcNcaListItem {
+    char Path[256];
+    unsigned long TitleId;
+};
+
+struct DlcNcaList {
+    bool success;
+    unsigned int size;
+    struct DlcNcaListItem* items;
+};
+
 extern struct GameInfo get_game_info(int, char*);
 
+extern struct DlcNcaList get_dlc_nca_list(const char* titleIdPtr, const char* pathPtr);
+
 void install_firmware(const char* inputPtr);
 
 char* installed_firmware_version();
@@ -43,8 +56,6 @@ int main_ryujinx_sdl(int argc, char **argv);
 
 int get_current_fps();
 
-void set_title_update(const char* titleIdPtr, const char* updatePathPtr);
-
 void initialize();
 
 #ifdef __cplusplus

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift

@@ -0,0 +1,237 @@
+//
+//  NativeController.swift
+//  MeloNX
+//
+//  Created by XITRIX on 15/02/2025.
+//
+
+import CoreHaptics
+import GameController
+
+class NativeController: Hashable {
+    private var instanceID: SDL_JoystickID = -1
+    private var controller: OpaquePointer?
+    private var nativeController: GCController
+    private let controllerHaptics: CHHapticEngine?
+
+    public var controllername: String { "GC - \(nativeController.vendorName ?? "Unknown")" }
+
+    init(_ controller: GCController) {
+        nativeController = controller
+        controllerHaptics = nativeController.haptics?.createEngine(withLocality: .default)
+        try? controllerHaptics?.start()
+        setupHandheldController()
+    }
+
+    deinit {
+        cleanup()
+    }
+
+    private func setupHandheldController() {
+        if SDL_WasInit(Uint32(SDL_INIT_GAMECONTROLLER)) == 0 {
+            SDL_InitSubSystem(Uint32(SDL_INIT_GAMECONTROLLER))
+        }
+
+        var joystickDesc = SDL_VirtualJoystickDesc(
+            version: UInt16(SDL_VIRTUAL_JOYSTICK_DESC_VERSION),
+            type: Uint16(SDL_JOYSTICK_TYPE_GAMECONTROLLER.rawValue),
+                naxes: 6,
+                nbuttons: 15,
+                nhats: 1,
+                vendor_id: 0,
+                product_id: 0,
+                padding: 0,
+                button_mask: 0,
+                axis_mask: 0,
+                name: (controllername as NSString).utf8String,
+                userdata: Unmanaged.passUnretained(self).toOpaque(),
+                Update: { userdata in
+                    // Update joystick state here
+                },
+                SetPlayerIndex: { userdata, playerIndex in
+                    print("Player index set to \(playerIndex)")
+                },
+                Rumble: { userdata, lowFreq, highFreq in
+                    print("Rumble with \(lowFreq), \(highFreq)")
+                    guard let userdata else { return 0 }
+                    let _self = Unmanaged<NativeController>.fromOpaque(userdata).takeUnretainedValue()
+                    VirtualController.rumble(lowFreq: Float(lowFreq), highFreq: Float(highFreq), engine: _self.controllerHaptics)
+                    return 0
+                },
+                RumbleTriggers: { userdata, leftRumble, rightRumble in
+                    print("Trigger rumble with \(leftRumble), \(rightRumble)")
+                    return 0
+                },
+                SetLED: { userdata, red, green, blue in
+                    print("Set LED to RGB(\(red), \(green), \(blue))")
+                    return 0
+                },
+                SendEffect: { userdata, data, size in
+                    print("Effect sent with size \(size)")
+                    return 0
+                }
+            )
+
+        instanceID = SDL_JoystickAttachVirtualEx(&joystickDesc)// SDL_JoystickAttachVirtual(SDL_JoystickType(SDL_JOYSTICK_TYPE_GAMECONTROLLER.rawValue), 6, 15, 1)
+        if instanceID < 0 {
+            print("Failed to create virtual joystick: \(String(cString: SDL_GetError()))")
+            return
+        }
+
+        // Open a game controller for the virtual joystick
+        let joystick = SDL_JoystickFromInstanceID(instanceID)
+        controller = SDL_GameControllerOpen(Int32(instanceID))
+
+        if controller == nil {
+            print("Failed to create virtual controller: \(String(cString: SDL_GetError()))")
+            return
+        }
+
+        if #available(iOS 16, *) {
+            guard let gamepad = nativeController.extendedGamepad
+            else { return }
+
+            setupButtonChangeListener(gamepad.buttonA, for: .B)
+            setupButtonChangeListener(gamepad.buttonB, for: .A)
+            setupButtonChangeListener(gamepad.buttonX, for: .Y)
+            setupButtonChangeListener(gamepad.buttonY, for: .X)
+
+            setupButtonChangeListener(gamepad.dpad.up, for: .dPadUp)
+            setupButtonChangeListener(gamepad.dpad.down, for: .dPadDown)
+            setupButtonChangeListener(gamepad.dpad.left, for: .dPadLeft)
+            setupButtonChangeListener(gamepad.dpad.right, for: .dPadRight)
+
+            setupButtonChangeListener(gamepad.leftShoulder, for: .leftShoulder)
+            setupButtonChangeListener(gamepad.rightShoulder, for: .rightShoulder)
+            gamepad.leftThumbstickButton.map { setupButtonChangeListener($0, for: .leftStick) }
+            gamepad.rightThumbstickButton.map { setupButtonChangeListener($0, for: .rightStick) }
+
+            setupButtonChangeListener(gamepad.buttonMenu, for: .start)
+            gamepad.buttonOptions.map { setupButtonChangeListener($0, for: .back) }
+
+            setupStickChangeListener(gamepad.leftThumbstick, for: .left)
+            setupStickChangeListener(gamepad.rightThumbstick, for: .right)
+
+            setupTriggerChangeListener(gamepad.leftTrigger, for: .left)
+            setupTriggerChangeListener(gamepad.rightTrigger, for: .right)
+        }
+    }
+
+    func setupButtonChangeListener(_ button: GCControllerButtonInput, for key: VirtualControllerButton) {
+        button.valueChangedHandler = { [unowned self] _, _, pressed in
+            setButtonState(pressed ? 1 : 0, for: key)
+        }
+    }
+
+    func setupStickChangeListener(_ button: GCControllerDirectionPad, for key: ThumbstickType) {
+        button.valueChangedHandler = { [unowned self] _, xValue, yValue in
+            let scaledX = Sint16(xValue * 32767.0)
+            let scaledY = -Sint16(yValue * 32767.0)
+
+            switch key {
+            case .left:
+                updateAxisValue(value: scaledX, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_LEFTX.rawValue))
+                updateAxisValue(value: scaledY, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_LEFTY.rawValue))
+            case .right:
+                updateAxisValue(value: scaledX, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_RIGHTX.rawValue))
+                updateAxisValue(value: scaledY, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_RIGHTY.rawValue))
+            }
+        }
+    }
+
+    func setupTriggerChangeListener(_ button: GCControllerButtonInput, for key: ThumbstickType) {
+        button.valueChangedHandler = { [unowned self] _, value, pressed in
+//            print("Value: \(value), Is pressed: \(pressed)")
+            let axis: SDL_GameControllerAxis = (key == .left) ? SDL_CONTROLLER_AXIS_TRIGGERLEFT : SDL_CONTROLLER_AXIS_TRIGGERRIGHT
+            let scaledValue = Sint16(value * 32767.0)
+            updateAxisValue(value: scaledValue, forAxis: axis)
+        }
+    }
+
+    static func rumble(lowFreq: Float, highFreq: Float) {
+        do {
+            // Low-frequency haptic pattern
+            let lowFreqPattern = try CHHapticPattern(events: [
+                CHHapticEvent(eventType: .hapticTransient, parameters: [
+                    CHHapticEventParameter(parameterID: .hapticIntensity, value: lowFreq),
+                    CHHapticEventParameter(parameterID: .hapticSharpness, value: 0.5)
+                ], relativeTime: 0, duration: 0.2)
+            ], parameters: [])
+
+            // High-frequency haptic pattern
+            let highFreqPattern = try CHHapticPattern(events: [
+                CHHapticEvent(eventType: .hapticTransient, parameters: [
+                    CHHapticEventParameter(parameterID: .hapticIntensity, value: highFreq),
+                    CHHapticEventParameter(parameterID: .hapticSharpness, value: 1.0)
+                ], relativeTime: 0.2, duration: 0.2)
+            ], parameters: [])
+
+            // Create and start the haptic engine
+            let engine = try CHHapticEngine()
+            try engine.start()
+
+            // Create and play the low-frequency player
+            let lowFreqPlayer = try engine.makePlayer(with: lowFreqPattern)
+            try lowFreqPlayer.start(atTime: 0)
+
+            // Create and play the high-frequency player after a short delay
+            let highFreqPlayer = try engine.makePlayer(with: highFreqPattern)
+            try highFreqPlayer.start(atTime: 0.2)
+
+        } catch {
+            print("Error creating haptic patterns: \(error)")
+        }
+    }
+
+
+    func updateAxisValue(value: Sint16, forAxis axis: SDL_GameControllerAxis) {
+        guard controller != nil else { return }
+        let joystick = SDL_JoystickFromInstanceID(instanceID)
+        SDL_JoystickSetVirtualAxis(joystick, axis.rawValue, value)
+    }
+
+    func thumbstickMoved(_ stick: ThumbstickType, x: Double, y: Double) {
+        let scaleFactor = 32767.0 / 160
+
+        let scaledX = Int16(min(32767.0, max(-32768.0, x * scaleFactor)))
+        let scaledY = Int16(min(32767.0, max(-32768.0, y * scaleFactor)))
+
+        if stick == .right {
+            updateAxisValue(value: scaledX, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_RIGHTX.rawValue))
+            updateAxisValue(value: scaledY, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_RIGHTY.rawValue))
+        } else {  // ThumbstickType.left
+            updateAxisValue(value: scaledX, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_LEFTX.rawValue))
+            updateAxisValue(value: scaledY, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_LEFTY.rawValue))
+        }
+    }
+
+    func setButtonState(_ state: Uint8, for button: VirtualControllerButton) {
+        guard controller != nil else { return }
+
+//        print("Button: \(button.rawValue) {state: \(state)}")
+        if (button == .leftTrigger || button == .rightTrigger) && (state == 1 || state == 0) {
+            let axis: SDL_GameControllerAxis = (button == .leftTrigger) ? SDL_CONTROLLER_AXIS_TRIGGERLEFT : SDL_CONTROLLER_AXIS_TRIGGERRIGHT
+            let value: Int = (state == 1) ? 32767 : 0
+            updateAxisValue(value: Sint16(value), forAxis: axis)
+        } else {
+            let joystick = SDL_JoystickFromInstanceID(instanceID)
+            SDL_JoystickSetVirtualButton(joystick, Int32(button.rawValue), state)
+        }
+    }
+
+    func cleanup() {
+        if let controller {
+            SDL_JoystickDetachVirtual(instanceID)
+            SDL_GameControllerClose(controller)
+            self.controller = nil
+        }
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(nativeController)
+    }
+
+    static func == (lhs: NativeController, rhs: NativeController) -> Bool {
+        lhs.nativeController == rhs.nativeController
+    }
+}

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/VirtualController.swift

@@ -78,7 +78,7 @@ class VirtualController {
         }
     }
     
-    static func rumble(lowFreq: Float, highFreq: Float) {
+    static func rumble(lowFreq: Float, highFreq: Float, engine: CHHapticEngine? = nil) {
         do {
             // Low-frequency haptic pattern
             let lowFreqPattern = try CHHapticPattern(events: [
@@ -96,9 +96,23 @@ class VirtualController {
                 ], relativeTime: 0.2, duration: 0.2)
             ], parameters: [])
 
-            // Create and start the haptic engine
-            let engine = try CHHapticEngine()
-            try engine.start()
+            // Mutable engine
+            var engine = engine
+
+            // If no engine passed, use device engine
+            if engine == nil {
+                // Create and start the haptic engine
+                if hapticEngine == nil {
+                    hapticEngine = try CHHapticEngine()
+                    try hapticEngine?.start()
+                }
+
+                engine = hapticEngine
+            }
+
+            guard let engine else {
+                return print("Error creating haptic patterns: hapticEngine is nil")
+            }
 
             // Create and play the low-frequency player
             let lowFreqPlayer = try engine.makePlayer(with: lowFreqPattern)
@@ -113,6 +127,8 @@ class VirtualController {
         }
     }
 
+    private static var hapticEngine: CHHapticEngine?
+
     
     func updateAxisValue(value: Sint16, forAxis axis: SDL_GameControllerAxis) {
         guard controller != nil else { return }

src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift

@@ -222,7 +222,7 @@ class Ryujinx {
                     print(error)
                 }
             }
-            
+
             return games
         } catch {
             print("Error loading games from roms folder: \(error)")
@@ -365,19 +365,30 @@ class Ryujinx {
             self.firmwareversion = version
         }
     }
-    
-    
-    func setTitleUpdate(titleId: String, updatePath: String) {
-        guard let titleIdPtr = titleId.cString(using: .utf8),
-              let updatePathPtr = updatePath.cString(using: .utf8)
+
+    func getDlcNcaList(titleId: String, path: String) -> [DownloadableContentNca] {
+        guard let titleIdCString = titleId.cString(using: .utf8),
+            let pathCString = path.cString(using: .utf8)
         else {
-            print("Invalid firmware path")
-            return
+            print("Invalid path")
+            return []
         }
 
-        set_title_update(titleIdPtr, updatePathPtr)
+        let listPointer = get_dlc_nca_list(titleIdCString, pathCString)
+        print("DLC parcing success: \(listPointer.success)")
+        guard listPointer.success else { return [] }
+
+        let list = Array(UnsafeBufferPointer(start: listPointer.items, count: Int(listPointer.size)))
+
+        return list.map { item in
+                .init(fullPath: withUnsafePointer(to: item.Path) {
+                    $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
+                        String(cString: $0)
+                    }
+                }, titleId: item.TitleId, enabled: true)
+        }
     }
-    
+
     private func generateGamepadId(joystickIndex: Int32) -> String? {
         let guid = SDL_JoystickGetDeviceGUID(joystickIndex)
 

src/MeloNX/MeloNX/App/Models/Game.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import UniformTypeIdentifiers
 
 public struct Game: Identifiable, Equatable, Hashable {
-    public var id = UUID()
+    public var id: String { titleId }
 
     var containerFolder: URL
     var fileType: UTType
@@ -21,7 +21,6 @@ public struct Game: Identifiable, Equatable, Hashable {
     var version: String
     var icon: UIImage?
     
-    
     static func convertGameInfoToGame(gameInfo: GameInfo, url: URL) -> Game {
         var gameInfo = gameInfo
         var gameTemp = Game(containerFolder: url.deletingLastPathComponent(), fileType: .item, fileURL: url, titleName: "", titleId: "", developer: "", version: "")

src/MeloNX/MeloNX/App/Views/ContentView.swift

@@ -26,6 +26,7 @@ struct ContentView: View {
     @State private var controllersList: [Controller] = []
     @State private var currentControllers: [Controller] = []
     @State var onscreencontroller: Controller = Controller(id: "", name: "")
+    @State var nativeControllers: [GCController: NativeController] = [:]
     @State private var isVirtualControllerActive: Bool = false
     @AppStorage("isVirtualController") var isVCA: Bool = true
     
@@ -50,7 +51,7 @@ struct ContentView: View {
     private let animationDuration: Double = 1.0
     @State private var isAnimating = false
     @State var isLoading = true
-    
+
     // MARK: - Initialization
     init() {
         let defaultConfig = loadSettings() ?? Ryujinx.Configuration(gamepath: "")
@@ -152,6 +153,7 @@ struct ContentView: View {
             queue: .main) { notification in
                 if let controller = notification.object as? GCController {
                     print("Controller connected: \(controller.productCategory)")
+                    nativeControllers[controller] = .init(controller)
                     refreshControllersList()
                 }
         }
@@ -163,6 +165,8 @@ struct ContentView: View {
             queue: .main) { notification in
                 if let controller = notification.object as? GCController {
                     print("Controller disconnected: \(controller.productCategory)")
+                    nativeControllers[controller]?.cleanup()
+                    nativeControllers[controller] = nil
                     refreshControllersList()
                 }
         }
@@ -306,8 +310,9 @@ struct ContentView: View {
             self.onscreencontroller = onscreen
         }
         
-        controllersList.removeAll(where: { $0.id == "0"})
-        
+        controllersList.removeAll(where: { $0.id == "0" || (!$0.name.starts(with: "GC - ") && $0 != onscreencontroller) })
+        controllersList.mutableForEach { $0.name = $0.name.replacingOccurrences(of: "GC - ", with: "") }
+
         currentControllers = []
         
         if controllersList.count == 1 {
@@ -397,3 +402,10 @@ func loadSettings() -> Ryujinx.Configuration? {
     }
 }
 
+extension Array {
+    @inlinable public mutating func mutableForEach(_ body: (inout Element) throws -> Void) rethrows {
+        for index in self.indices {
+            try body(&self[index])
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/GamesList/GameInfoSheet.swift

@@ -14,45 +14,52 @@ struct GameInfoSheet: View {
     
     var body: some View {
         iOSNav {
-            VStack {
-                if let icon = game.icon {
-                    Image(uiImage: icon)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width: 250, height: 250)
-                        .cornerRadius(10)
-                        .padding()
-                        .contextMenu {
-                            Button {
-                                UIImageWriteToSavedPhotosAlbum(icon, nil, nil, nil)
-                            } label: {
-                                Label("Save to Photos", systemImage: "square.and.arrow.down")
-                            }
+            List {
+                Section {}
+                header: {
+                    VStack(alignment: .center) {
+                        if let icon = game.icon {
+                            Image(uiImage: icon)
+                                .resizable()
+                                .aspectRatio(contentMode: .fit)
+                                .frame(width: 250, height: 250)
+                                .cornerRadius(10)
+                                .padding()
+                                .contextMenu {
+                                    Button {
+                                        UIImageWriteToSavedPhotosAlbum(icon, nil, nil, nil)
+                                    } label: {
+                                        Label("Save to Photos", systemImage: "square.and.arrow.down")
+                                    }
+                                }
+                        } else {
+                            Image(systemName: "questionmark.circle")
+                                .resizable()
+                                .aspectRatio(contentMode: .fit)
+                                .frame(width: 150, height: 150)
+                                .padding()
                         }
-                } else {
-                    Image(systemName: "questionmark.circle")
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width: 150, height: 150)
-                        .padding()
-                }
-                
-                VStack(alignment: .leading) {
-                    VStack(alignment: .leading) {
-                        Text("**\(game.titleName)** | \(game.titleId.capitalized)")
-                        Text(game.developer)
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
+                        VStack(alignment: .center) {
+                            Text("**\(game.titleName)** | \(game.titleId.capitalized)")
+                                .multilineTextAlignment(.center)
+                            Text(game.developer)
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                        }
+                        .padding(.vertical, 3)
                     }
-                    .padding(.vertical, 3)
-                    
-                    VStack(alignment: .leading, spacing: 5) {
-                        Text("Information")
-                            .font(.title2)
-                            .bold()
-                        
-                        Text("**Version:** \(game.version)")
-                        Text("**Title ID:** \(game.titleId)")
+                    .frame(maxWidth: .infinity)
+                }
+
+                Section {
+                    HStack {
+                        Text("**Version**")
+                        Spacer()
+                        Text(game.version)
+                            .foregroundStyle(Color.secondary)
+                    }
+                    HStack {
+                        Text("**Title ID**")
                             .contextMenu {
                                 Button {
                                     UIPasteboard.general.string = game.titleId
@@ -60,15 +67,32 @@ struct GameInfoSheet: View {
                                     Text("Copy Title ID")
                                 }
                             }
-                        Text("**Game Size:** \(fetchFileSize(for: game.fileURL) ?? 0) bytes")
-                        Text("**File Type:** .\(getFileType(game.fileURL))")
-                        Text("**Game URL:** \(trimGameURL(game.fileURL))")
+                        Spacer()
+                        Text(game.titleId)
+                            .foregroundStyle(Color.secondary)
                     }
+                    HStack {
+                        Text("**Game Size**")
+                        Spacer()
+                        Text("\(fetchFileSize(for: game.fileURL) ?? 0) bytes")
+                            .foregroundStyle(Color.secondary)
+                    }
+                    HStack {
+                        Text("**File Type**")
+                        Spacer()
+                        Text(getFileType(game.fileURL))
+                            .foregroundStyle(Color.secondary)
+                    }
+                    VStack(alignment: .leading, spacing: 4) {
+                        Text("**Game URL**")
+                        Text(trimGameURL(game.fileURL))
+                            .foregroundStyle(Color.secondary)
+                    }
+                } header: {
+                    Text("Information")
                 }
-
-                Spacer()
+                .headerProminence(.increased)
             }
-            .padding(.horizontal, 5)
             .navigationTitle(game.titleName)
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
@@ -103,10 +127,6 @@ struct GameInfoSheet: View {
     }
     
     func getFileType(_ url: URL) -> String {
-        let path = url.path
-        if let range = path.range(of: ".") {
-            return String(path[range.upperBound...])
-        }
-        return "Unknown"
+        url.pathExtension
     }
 }

src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift

@@ -28,6 +28,7 @@ struct GameLibraryView: View {
     @State var isSelectingGameFile = false
     @State var isViewingGameInfo: Bool = false
     @State var isSelectingGameUpdate: Bool = false
+    @State var isSelectingGameDLC: Bool = false
     @State var gameInfo: Game?
     var games: Binding<[Game]> {
         Binding(
@@ -38,121 +39,107 @@ struct GameLibraryView: View {
     
     var filteredGames: [Game] {
         if searchText.isEmpty {
-            return Ryujinx.shared.games
+            return Ryujinx.shared.games.filter { game in
+                !realRecentGames.contains(where: { $0.titleId == game.titleId })
+            }
         }
-        return Ryujinx.shared.games.filter {
-            $0.titleName.localizedCaseInsensitiveContains(searchText) ||
-            $0.developer.localizedCaseInsensitiveContains(searchText)
+        return Ryujinx.shared.games.filter { game in
+            game.titleName.localizedCaseInsensitiveContains(searchText) ||
+            game.developer.localizedCaseInsensitiveContains(searchText)
         }
     }
-    
+
+    var realRecentGames: [Game] {
+        let games = Ryujinx.shared.games
+        return recentGames.compactMap { recentGame in
+            games.first(where: { $0.titleId == recentGame.titleId })
+        }
+    }
+
     var body: some View {
         iOSNav {
-            ScrollView {
-                LazyVStack(alignment: .leading, spacing: 20) {
-                    if !isSearching {
-                        Text("Games")
-                            .font(.system(size: 34, weight: .bold))
-                            .padding(.horizontal)
-                            .padding(.top, 12)
+            List {
+                if Ryujinx.shared.games.isEmpty {
+                    VStack(spacing: 16) {
+                        Image(systemName: "gamecontroller.fill")
+                            .font(.system(size: 64))
+                            .foregroundColor(.secondary.opacity(0.7))
+                            .padding(.top, 60)
+                        Text("No Games Found")
+                            .font(.title2.bold())
+                            .foregroundColor(.primary)
+                        Text("Add ROM, Keys and Firmware to get started")
+                            .font(.subheadline)
+                            .foregroundColor(.secondary)
                     }
-                    
-                    if Ryujinx.shared.games.isEmpty {
-                        VStack(spacing: 16) {
-                            Image(systemName: "gamecontroller.fill")
-                                .font(.system(size: 64))
-                                .foregroundColor(.secondary.opacity(0.7))
-                                .padding(.top, 60)
-                            Text("No Games Found")
-                                .font(.title2.bold())
-                                .foregroundColor(.primary)
-                            Text("Add ROM, Keys and Firmware to get started")
-                                .font(.subheadline)
-                                .foregroundColor(.secondary)
+                    .frame(maxWidth: .infinity)
+                    .padding(.top, 40)
+                } else {
+                    if !isSearching && !realRecentGames.isEmpty {
+                        Section {
+                            ForEach(realRecentGames) { game in
+                                GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, isSelectingGameDLC: $isSelectingGameDLC, gameInfo: $gameInfo)
+                                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                                        Button(role: .destructive) {
+                                            removeFromRecentGames(game)
+                                        } label: {
+                                            Label("Delete", systemImage: "trash")
+                                        }
+                                    }
+                            }
+                        } header: {
+                            Text("Recent")
+                        }
+
+                        Section {
+                            ForEach(filteredGames) { game in
+                                GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, isSelectingGameDLC: $isSelectingGameDLC, gameInfo: $gameInfo)
+                            }
+                        } header: {
+                            Text("Others")
                         }
-                        .frame(maxWidth: .infinity)
-                        .padding(.top, 40)
                     } else {
-                        if !isSearching && !recentGames.isEmpty {
-                            VStack(alignment: .leading, spacing: 12) {
-                                Text("Recent")
-                                    .font(.title2.bold())
-                                    .padding(.horizontal)
-                                
-                                ScrollView(.horizontal, showsIndicators: false) {
-                                    LazyHStack(spacing: 16) {
-                                        ForEach(recentGames) { game in
-                                            RecentGameCard(game: game, startemu: $startemu)
-                                                .onTapGesture {
-                                                    addToRecentGames(game)
-                                                    startemu = game
-                                                }
-                                        }
-                                    }
-                                    .padding(.horizontal)
-                                }
-                            }
-                            
-                            VStack(alignment: .leading, spacing: 12) {
-                                Text("All Games")
-                                    .font(.title2.bold())
-                                    .padding(.horizontal)
-                                
-                                LazyVStack(spacing: 2) {
-                                    ForEach(filteredGames) { game in
-                                        GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, gameInfo: $gameInfo)
-                                            .onTapGesture {
-                                                addToRecentGames(game)
-                                            }
-                                    }
-                                }
-                            }
-                        } else {
-                            LazyVStack(spacing: 2) {
-                                ForEach(filteredGames) { game in
-                                    GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, gameInfo: $gameInfo)
-                                        .onTapGesture {
-                                            addToRecentGames(game)
-                                        }
-                                }
-                            }
+                        ForEach(filteredGames) { game in
+                            GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, isSelectingGameDLC: $isSelectingGameDLC, gameInfo: $gameInfo)
                         }
                     }
                 }
-                .onAppear {
-                    loadRecentGames()
-                    
-                    let firmware = Ryujinx.shared.fetchFirmwareVersion()
-                    firmwareversion = (firmware == "" ? "0" : firmware)
-                }
-                .fileImporter(isPresented: $firmwareInstaller, allowedContentTypes: [.item]) { result in
-                    switch result {
-                    case .success(let url):
-                        do {
-                            let fun = url.startAccessingSecurityScopedResource()
-                            let path = url.path
-                            
-                            Ryujinx.shared.installFirmware(firmwarePath: path)
-                            
-                            firmwareversion = (Ryujinx.shared.fetchFirmwareVersion() == "" ? "0" : Ryujinx.shared.fetchFirmwareVersion())
-                            if fun  {
-                                url.stopAccessingSecurityScopedResource()
-                            }
-                        }
-                    case .failure(let error):
-                        print(error)
-                    }
-                }
+            }
+            .navigationTitle("Games")
+            .navigationBarTitleDisplayMode(.large)
+            .onAppear {
+                loadRecentGames()
+                    
+                let firmware = Ryujinx.shared.fetchFirmwareVersion()
+                firmwareversion = (firmware == "" ? "0" : firmware)
+            }
+            .fileImporter(isPresented: $firmwareInstaller, allowedContentTypes: [.item]) { result in
+                switch result {
+                case .success(let url):
+                    do {
+                        let fun = url.startAccessingSecurityScopedResource()
+                        let path = url.path
+                            
+                        Ryujinx.shared.installFirmware(firmwarePath: path)
+                            
+                        firmwareversion = (Ryujinx.shared.fetchFirmwareVersion() == "" ? "0" : Ryujinx.shared.fetchFirmwareVersion())
+                        if fun {
+                            url.stopAccessingSecurityScopedResource()
+                        }
+                    }
+                case .failure(let error):
+                    print(error)
+                }
             }
             .toolbar {
-                ToolbarItem(placement: .topBarLeading) {
+                ToolbarItem(placement: .topBarTrailing) {
                     Button {
                         isSelectingGameFile.toggle()
                     } label: {
                         Image(systemName: "plus")
                     }
                 }
-                
+
                 ToolbarItem(placement: .topBarLeading) {
                     Menu {
                         Text("Firmware Version: \(firmwareversion)")
@@ -214,9 +201,13 @@ struct GameLibraryView: View {
                     }
                 }
             }
+            .onChange(of: startemu) { game in
+                guard let game else { return }
+                addToRecentGames(game)
+            }
         }
-        .background(Color(.systemGroupedBackground))
         .searchable(text: $searchText)
+        .animation(.easeInOut, value: searchText)
         .onChange(of: searchText) { _ in
             isSearching = !searchText.isEmpty
         }
@@ -281,6 +272,9 @@ struct GameLibraryView: View {
         .sheet(isPresented: $isSelectingGameUpdate) {
             UpdateManagerSheet(game: $gameInfo)
         }
+        .sheet(isPresented: $isSelectingGameDLC) {
+            DLCManagerSheet(game: $gameInfo)
+        }
         .sheet(isPresented: Binding(
             get: { isViewingGameInfo && gameInfo != nil },
             set: { newValue in
@@ -296,10 +290,9 @@ struct GameLibraryView: View {
         }
     }
     
-    
     private func addToRecentGames(_ game: Game) {
-        recentGames.removeAll { $0.id == game.id }
-        
+        recentGames.removeAll { $0.titleId == game.titleId }
+
         recentGames.insert(game, at: 0)
         
         if recentGames.count > 5 {
@@ -308,7 +301,12 @@ struct GameLibraryView: View {
         
         saveRecentGames()
     }
-    
+
+    private func removeFromRecentGames(_ game: Game) {
+        recentGames.removeAll { $0.titleId == game.titleId }
+        saveRecentGames()
+    }
+
     private func saveRecentGames() {
         do {
             let encoder = JSONEncoder()
@@ -329,8 +327,7 @@ struct GameLibraryView: View {
         }
     }
 
-    
-// MARK: - Delete Game Function
+    // MARK: - Delete Game Function
     func deleteGame(game: Game) {
         let fileManager = FileManager.default
         do {
@@ -343,7 +340,7 @@ struct GameLibraryView: View {
     }
 }
 
-// MARK: -Game Model
+// MARK: - Game Model
 extension Game: Codable {
     enum CodingKeys: String, CodingKey {
         case titleName, titleId, developer, version, fileURL
@@ -372,60 +369,14 @@ extension Game: Codable {
     }
 }
 
-// MARK: -Recent Game Card
-struct RecentGameCard: View {
-    let game: Game
-    @Binding var startemu: Game?
-    @Environment(\.colorScheme) var colorScheme
-    
-    var body: some View {
-        Button(action: {
-            startemu = game
-        }) {
-            VStack(alignment: .leading, spacing: 8) {
-                if let icon = game.icon {
-                    Image(uiImage: icon)
-                        .resizable()
-                        .aspectRatio(contentMode: .fill)
-                        .frame(width: 140, height: 140)
-                        .cornerRadius(12)
-                } else {
-                    ZStack {
-                        RoundedRectangle(cornerRadius: 12)
-                            .fill(colorScheme == .dark ?
-                                  Color(.systemGray5) : Color(.systemGray6))
-                            .frame(width: 140, height: 140)
-                        
-                        Image(systemName: "gamecontroller.fill")
-                            .font(.system(size: 40))
-                            .foregroundColor(.gray)
-                    }
-                }
-                
-                VStack(alignment: .leading, spacing: 2) {
-                    Text(game.titleName)
-                        .font(.subheadline.bold())
-                        .lineLimit(1)
-                    
-                    Text(game.developer)
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                        .lineLimit(1)
-                }
-                .padding(.horizontal, 4)
-            }
-        }
-        .buttonStyle(.plain)
-    }
-}
-
-// MARK: -Game List Item
+// MARK: - Game List Item
 struct GameListRow: View {
     let game: Game
     @Binding var startemu: Game?
     @Binding var games: [Game] // Add this binding
     @Binding var isViewingGameInfo: Bool
     @Binding var isSelectingGameUpdate: Bool
+    @Binding var isSelectingGameDLC: Bool
     @Binding var gameInfo: Game?
     @State var gametoDelete: Game?
     @State var showGameDeleteConfirmation: Bool = false
@@ -447,7 +398,7 @@ struct GameListRow: View {
                     ZStack {
                         RoundedRectangle(cornerRadius: 8)
                             .fill(colorScheme == .dark ?
-                                  Color(.systemGray5) : Color(.systemGray6))
+                                Color(.systemGray5) : Color(.systemGray6))
                             .frame(width: 45, height: 45)
                         
                         Image(systemName: "gamecontroller.fill")
@@ -474,43 +425,48 @@ struct GameListRow: View {
                     .foregroundColor(.accentColor)
                     .opacity(0.8)
             }
-            .padding(.horizontal)
-            .padding(.vertical, 8)
-            .background(Color(.systemBackground))
-            .contextMenu {
-                Section {
-                    Button {
-                        startemu = game
-                    } label: {
-                        Label("Play Now", systemImage: "play.fill")
-                    }
-                    
-                    Button {
-                        gameInfo = game
-                        isViewingGameInfo.toggle()
-                    } label: {
-                        Label("Game Info", systemImage: "info.circle")
-                    }
-
-                    Button {
-                        gameInfo = game
-                        isSelectingGameUpdate.toggle()
-                    } label: {
-                        Label("Game Update Manager", systemImage: "chevron.up.circle")
-                    }
+        }
+        .contextMenu {
+            Section {
+                Button {
+                    startemu = game
+                } label: {
+                    Label("Play Now", systemImage: "play.fill")
                 }
-                
-                Section {
-                    Button(role: .destructive) {
-                        gametoDelete = game
-                        showGameDeleteConfirmation.toggle()
-                    } label: {
-                        Label("Delete", systemImage: "trash")
-                    }
+
+                Button {
+                    gameInfo = game
+                    isViewingGameInfo.toggle()
+                } label: {
+                    Label("Game Info", systemImage: "info.circle")
+                }
+            }
+
+            Section {
+                Button {
+                    gameInfo = game
+                    isSelectingGameUpdate.toggle()
+                } label: {
+                    Label("Game Update Manager", systemImage: "chevron.up.circle")
+                }
+
+                Button {
+                    gameInfo = game
+                    isSelectingGameDLC.toggle()
+                } label: {
+                    Label("Game DLC Manager", systemImage: "plus.viewfinder")
+                }
+            }
+
+            Section {
+                Button(role: .destructive) {
+                    gametoDelete = game
+                    showGameDeleteConfirmation.toggle()
+                } label: {
+                    Label("Delete", systemImage: "trash")
                 }
             }
         }
-        .buttonStyle(.plain)
         .confirmationDialog("Are you sure you want to delete this game?", isPresented: $showGameDeleteConfirmation) {
             Button("Delete", role: .destructive) {
                 if let game = gametoDelete {
@@ -533,4 +489,3 @@ struct GameListRow: View {
         }
     }
 }
-

src/MeloNX/MeloNX/App/Views/Updates/GameDLCManagerSheet.swift

@@ -0,0 +1,159 @@
+//
+//  GameDLCManagerSheet.swift
+//  MeloNX
+//
+//  Created by XITRIX on 16/02/2025.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+struct DownloadableContentNca: Codable, Hashable {
+    var fullPath: String
+    var titleId: UInt
+    var enabled: Bool
+
+    enum CodingKeys: String, CodingKey {
+        case fullPath = "path"
+        case titleId = "title_id"
+        case enabled = "is_enabled"
+    }
+}
+
+struct DownloadableContentContainer: Codable, Hashable {
+    var containerPath: String
+    var downloadableContentNcaList: [DownloadableContentNca]
+
+    enum CodingKeys: String, CodingKey {
+        case containerPath = "path"
+        case downloadableContentNcaList = "dlc_nca_list"
+    }
+}
+
+struct DLCManagerSheet: View {
+    @Binding var game: Game!
+    @State private var isSelectingGameDLC = false
+    @State private var dlcs: [DownloadableContentContainer] = []
+
+    var body: some View {
+        NavigationView {
+            let withIndex = dlcs.enumerated().map { $0 }
+            List(withIndex, id: \.element.containerPath) { index, dlc in
+                Button(action: {
+                    let toggle = dlcs[index].downloadableContentNcaList.first?.enabled ?? true
+                    dlcs[index].downloadableContentNcaList.mutableForEach { $0.enabled = !toggle }
+                    Self.saveDlcs(game, dlc: dlcs)
+                }) {
+                    HStack {
+                        Text((dlc.containerPath as NSString).lastPathComponent)
+                            .foregroundStyle(Color(uiColor: .label))
+                        Spacer()
+                        if dlc.downloadableContentNcaList.first?.enabled == true {
+                            Image(systemName: "checkmark.circle.fill")
+                                .foregroundStyle(Color.accentColor)
+                                .font(.system(size: 24))
+                        } else {
+                            Image(systemName: "circle")
+                                .foregroundStyle(Color(uiColor: .secondaryLabel))
+                                .font(.system(size: 24))
+                        }
+                    }
+                }
+                .contextMenu {
+                    Button {
+                        let path = URL.documentsDirectory.appendingPathComponent(dlc.containerPath)
+                        try? FileManager.default.removeItem(atPath: path.path)
+                        dlcs.remove(at: index)
+                        Self.saveDlcs(game, dlc: dlcs)
+                    } label: {
+                        Text("Remove DLC")
+                    }
+                }
+            }
+            .navigationTitle("\(game.titleName) DLCs")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                Button("Add", systemImage: "plus") {
+                    isSelectingGameDLC = true
+                }
+            }
+        }
+        .onAppear {
+            dlcs = Self.loadDlc(game)
+        }
+        .fileImporter(isPresented: $isSelectingGameDLC, allowedContentTypes: [.item], allowsMultipleSelection: true) { result in
+            switch result {
+            case .success(let urls):
+                for url in urls {
+                    guard url.startAccessingSecurityScopedResource() else {
+                        print("Failed to access security-scoped resource")
+                        return
+                    }
+                    defer { url.stopAccessingSecurityScopedResource() }
+
+                    do {
+                        let fileManager = FileManager.default
+                        let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
+                        let dlcDirectory = documentsDirectory.appendingPathComponent("dlc")
+                        let romDlcDirectory = dlcDirectory.appendingPathComponent(game.titleId)
+
+                        if !fileManager.fileExists(atPath: dlcDirectory.path) {
+                            try fileManager.createDirectory(at: dlcDirectory, withIntermediateDirectories: true, attributes: nil)
+                        }
+
+                        if !fileManager.fileExists(atPath: romDlcDirectory.path) {
+                            try fileManager.createDirectory(at: romDlcDirectory, withIntermediateDirectories: true, attributes: nil)
+                        }
+
+                        let dlcContent = Ryujinx.shared.getDlcNcaList(titleId: game.titleId, path: url.path)
+                        guard !dlcContent.isEmpty else { return }
+
+                        let destinationURL = romDlcDirectory.appendingPathComponent(url.lastPathComponent)
+                        try? fileManager.copyItem(at: url, to: destinationURL)
+
+                        let container = DownloadableContentContainer(
+                            containerPath: Self.relativeDlcDirectoryPath(for: game, dlcPath: destinationURL),
+                            downloadableContentNcaList: dlcContent
+                        )
+                        dlcs.append(container)
+
+                        Self.saveDlcs(game, dlc: dlcs)
+                    } catch {
+                        print("Error copying game file: \(error)")
+                    }
+                }
+            case .failure(let err):
+                print("File import failed: \(err.localizedDescription)")
+            }
+        }
+    }
+}
+
+private extension DLCManagerSheet {
+    static func loadDlc(_ game: Game) -> [DownloadableContentContainer] {
+        let jsonURL = dlcJsonPath(for: game)
+        guard let data = try? Data(contentsOf: jsonURL),
+              var result = try? JSONDecoder().decode([DownloadableContentContainer].self, from: data)
+        else { return [] }
+
+        result = result.filter { container in
+            let path = URL.documentsDirectory.appendingPathComponent(container.containerPath)
+            return FileManager.default.fileExists(atPath: path.path)
+        }
+
+        return result
+    }
+
+    static func saveDlcs(_ game: Game, dlc: [DownloadableContentContainer]) {
+        guard let data = try? JSONEncoder().encode(dlc) else { return }
+        try? data.write(to: dlcJsonPath(for: game))
+    }
+
+    static func relativeDlcDirectoryPath(for game: Game, dlcPath: URL) -> String {
+        "dlc/\(game.titleId)/\(dlcPath.lastPathComponent)"
+    }
+
+    static func dlcJsonPath(for game: Game) -> URL {
+        URL.documentsDirectory.appendingPathComponent("games").appendingPathComponent(game.titleId).appendingPathComponent("dlc.json")
+    }
+}

src/MeloNX/MeloNX/App/Views/Updates/GameUpdateManagerSheet.swift

@@ -15,39 +15,45 @@ struct UpdateManagerSheet: View {
     @Binding var game: Game?
     @State private var isSelectingGameUpdate = false
     @State private var jsonURL: URL? = nil
-    
+
     var body: some View {
         NavigationView {
-            VStack {
-                List(paths, id: \..self) { item in
-                    Button(action: {
-                        selectItem(item.lastPathComponent)
-                    }) {
-                        HStack {
-                            Text(item.lastPathComponent)
-                            if selectedItem == "\(game!.titleId)/\(item.lastPathComponent)" {
-                                Spacer()
-                                Image(systemName: "checkmark")
-                            }
-                        }
-                    }
-                    .contextMenu {
-                        Button {
-                            removeUpdate(item)
-                        } label: {
-                            Text("Remove Update")
+            List(paths, id: \..self, selection: $selectedItem) { item in
+                Button(action: {
+                    selectItem(item.lastPathComponent)
+                }) {
+                    HStack {
+                        Text(item.lastPathComponent)
+                            .foregroundStyle(Color(uiColor: .label))
+                        Spacer()
+                        if selectedItem == "updates/\(game!.titleId)/\(item.lastPathComponent)" {
+                            Image(systemName: "checkmark.circle.fill")
+                                .foregroundStyle(Color.accentColor)
+                                .font(.system(size: 24))
+                        } else {
+                            Image(systemName: "circle")
+                                .foregroundStyle(Color(uiColor: .secondaryLabel))
+                                .font(.system(size: 24))
                         }
                     }
                 }
+                .contextMenu {
+                    Button {
+                        removeUpdate(item)
+                    } label: {
+                        Text("Remove Update")
+                    }
+                }
             }
-            .onAppear() {
+            .onAppear {
                 print(URL.documentsDirectory.appendingPathComponent("games").appendingPathComponent(game!.titleId).appendingPathComponent("updates.json"))
                 
                 loadJSON(URL.documentsDirectory.appendingPathComponent("games").appendingPathComponent(game!.titleId).appendingPathComponent("updates.json"))
             }
             .navigationTitle("\(game!.titleName) Updates")
+            .navigationBarTitleDisplayMode(.inline)
             .toolbar {
-                Button("+") {
+                Button("Add", systemImage: "plus") {
                     isSelectingGameUpdate = true
                 }
             }
@@ -80,7 +86,8 @@ struct UpdateManagerSheet: View {
                     let destinationURL = romUpdatedDirectory.appendingPathComponent(url.lastPathComponent)
                     try? fileManager.copyItem(at: url, to: destinationURL)
 
-                    Ryujinx.shared.setTitleUpdate(titleId: gameInfo.titleId, updatePath: "\(gameInfo.titleId)/" + url.lastPathComponent)
+                    items.append("updates/" + gameInfo.titleId + "/" + url.lastPathComponent)
+                    selectItem(url.lastPathComponent)
                     Ryujinx.shared.games = Ryujinx.shared.loadGames()
                     loadJSON(jsonURL!)
                 } catch {
@@ -93,7 +100,7 @@ struct UpdateManagerSheet: View {
     }
     
     func removeUpdate(_ game: URL) {
-        let gameString = "\(self.game!.titleId)/\(game.lastPathComponent)"
+        let gameString = "updates/\(self.game!.titleId)/\(game.lastPathComponent)"
         paths.removeAll { $0 == game }
         items.removeAll { $0 == gameString }
         
@@ -108,6 +115,7 @@ struct UpdateManagerSheet: View {
         }
         
         saveJSON(selectedItem: selectedItem ?? "")
+        Ryujinx.shared.games = Ryujinx.shared.loadGames()
     }
     
     func saveJSON(selectedItem: String) {
@@ -122,26 +130,28 @@ struct UpdateManagerSheet: View {
     }
     
     func loadJSON(_ json: URL) {
-        
         self.jsonURL = json
-        print("Failed to read JSO")
         
-        guard let jsonURL = jsonURL else { return }
-        print("Failed to read JSOK")
+        guard let jsonURL else { return }
         
         do {
             let data = try Data(contentsOf: jsonURL)
             if let jsonDict = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-               let list = jsonDict["paths"] as? [String] {
-                var urls: [URL] = []
-                
-                for path in list {
-                    urls.append(URL.documentsDirectory.appendingPathComponent("updates").appendingPathComponent(path))
+               let list = jsonDict["paths"] as? [String]
+            {
+
+                let filteredList = list.filter { relativePath in
+                    let path = URL.documentsDirectory.appendingPathComponent(relativePath)
+                    return FileManager.default.fileExists(atPath: path.path)
                 }
-                
-                self.items = list
-                self.paths = urls
-                self.selectedItem = jsonDict["selected"] as? String
+
+                let urls: [URL] = filteredList.map { relativePath in
+                    URL.documentsDirectory.appendingPathComponent(relativePath)
+                }
+
+                items = filteredList
+                paths = urls
+                selectedItem = jsonDict["selected"] as? String
             }
         } catch {
             print("Failed to read JSON: \(error)")
@@ -155,17 +165,17 @@ struct UpdateManagerSheet: View {
         do {
             let newData = try JSONSerialization.data(withJSONObject: defaultData, options: .prettyPrinted)
             try newData.write(to: jsonURL)
-            self.items = []
-            self.selectedItem = ""
+            items = []
+            selectedItem = ""
         } catch {
             print("Failed to create default JSON: \(error)")
         }
     }
     
     func selectItem(_ item: String) {
-        let newSelection = "\(game!.titleId)/\(item)"
-        
-        guard let jsonURL = jsonURL else { return }
+        let newSelection = "updates/\(game!.titleId)/\(item)"
+
+        guard let jsonURL else { return }
         
         do {
             let data = try Data(contentsOf: jsonURL)
@@ -175,17 +185,17 @@ struct UpdateManagerSheet: View {
                 jsonDict["selected"] = ""
                 selectedItem = ""
             } else {
-                jsonDict["selected"] = newSelection
+                jsonDict["selected"] = "\(newSelection)"
                 selectedItem = newSelection
             }
             
             jsonDict["paths"] = items
-            
+
             let newData = try JSONSerialization.data(withJSONObject: jsonDict, options: .prettyPrinted)
             try newData.write(to: jsonURL)
+            Ryujinx.shared.games = Ryujinx.shared.loadGames()
         } catch {
             print("Failed to update JSON: \(error)")
         }
     }
-
 }

src/Ryujinx.Headless.SDL2/Program.cs

@@ -142,34 +142,95 @@ namespace Ryujinx.Headless.SDL2
             return 0;
         }
 
-        [UnmanagedCallersOnly(EntryPoint = "set_title_update")]
-        public static unsafe void SetTitleUpdate(IntPtr titleIdPtr, IntPtr updatePathPtr) {
+        [UnmanagedCallersOnly(EntryPoint = "get_dlc_nca_list")]
+        public static unsafe DlcNcaList GetDlcNcaList(IntPtr titleIdPtr, IntPtr pathPtr) 
+        {
             var titleId = Marshal.PtrToStringAnsi(titleIdPtr);
-            var updatePath = Marshal.PtrToStringAnsi(updatePathPtr);
-            string _updateJsonPath = System.IO.Path.Combine(AppDataManager.GamesDirPath, titleId, "updates.json");
+            var containerPath = Marshal.PtrToStringAnsi(pathPtr);
 
-            TitleUpdateMetadata _titleUpdateWindowData;
-
-            if (File.Exists(_updateJsonPath)) {
-                _titleUpdateWindowData = JsonHelper.DeserializeFromFile<TitleUpdateMetadata>(_updateJsonPath, _titleSerializerContext.TitleUpdateMetadata);
-
-                _titleUpdateWindowData.Paths ??= new List<string>();
-                if (!_titleUpdateWindowData.Paths.Contains(updatePath)) {
-                    _titleUpdateWindowData.Paths.Add(updatePath);
-                }
-
-                _titleUpdateWindowData.Selected = updatePath;
-            } else {
-                _titleUpdateWindowData = new TitleUpdateMetadata {
-                    Selected = updatePath,
-                    Paths = new List<string> { updatePath },
-                };
+            if (!File.Exists(containerPath))
+            {
+                return new DlcNcaList { success = false };
             }
 
-            JsonHelper.SerializeToFile(_updateJsonPath, _titleUpdateWindowData, _titleSerializerContext.TitleUpdateMetadata);
+            using FileStream containerFile = File.OpenRead(containerPath);
+
+            PartitionFileSystem pfs = new();
+            pfs.Initialize(containerFile.AsStorage()).ThrowIfFailure();
+            bool containsDlc = false;
+
+            _virtualFileSystem.ImportTickets(pfs);
+
+            // TreeIter? parentIter = null;
+
+            List<DlcNcaListItem> listItems = new();
+            foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
+            {
+                using var ncaFile = new UniqueRef<IFile>();
+
+                pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
+
+                Nca nca = TryCreateNca(ncaFile.Get.AsStorage(), containerPath);
+
+                if (nca == null)
+                {
+                    continue;
+                }
+
+                if (nca.Header.ContentType == NcaContentType.PublicData)
+                {
+                    if ((nca.Header.TitleId & 0xFFFFFFFFFFFFE000).ToString("x16") != titleId)
+                    {
+                        break;
+                    }
+
+                    Logger.Warning?.Print(LogClass.Application, $"ContainerPath: {containerPath}");
+                    Logger.Warning?.Print(LogClass.Application, $"TitleId: {nca.Header.TitleId}");
+                    Logger.Warning?.Print(LogClass.Application, $"fileEntry.FullPath: {fileEntry.FullPath}");
+                    
+                    // parentIter ??= ((TreeStore)_dlcTreeView.Model).AppendValues(true, "", containerPath);
+                    // ((TreeStore)_dlcTreeView.Model).AppendValues(parentIter.Value, true, nca.Header.TitleId.ToString("X16"), fileEntry.FullPath);
+
+                    DlcNcaListItem item = new();
+                    CopyStringToFixedArray(fileEntry.FullPath, item.Path, 256);
+                    item.TitleId = nca.Header.TitleId;
+                    listItems.Add(item);
+                    
+                    containsDlc = true;
+                }
+            }
+
+            if (!containsDlc)
+            {
+                return new DlcNcaList { success = false };
+                // GtkDialog.CreateErrorDialog("The specified file does not contain DLC for the selected title!");
+            }
+            
+            var list = new DlcNcaList { success = true, size = (uint) listItems.Count };
+
+            DlcNcaListItem[] items = listItems.ToArray();
+
+            fixed (DlcNcaListItem* p = &items[0])
+            {
+                list.items = p;
+            }
+            
+            return list;
         }
+        
+        private static Nca TryCreateNca(IStorage ncaStorage, string containerPath)
+        {
+            try
+            {
+                return new Nca(_virtualFileSystem.KeySet, ncaStorage);
+            }
+            catch (Exception exception)
+            {
+                // ignored
+            }
 
-
+            return null;
+        }
 
         [UnmanagedCallersOnly(EntryPoint = "get_current_fps")]
         public static unsafe int GetFPS() 
@@ -751,7 +812,8 @@ namespace Ryujinx.Headless.SDL2
 
                     if (File.Exists(titleUpdateMetadataPath))
                     {
-                        updatePath = JsonHelper.DeserializeFromFile(titleUpdateMetadataPath, _titleSerializerContext.TitleUpdateMetadata).Selected;
+                        string updatePathRelative = JsonHelper.DeserializeFromFile(titleUpdateMetadataPath, _titleSerializerContext.TitleUpdateMetadata).Selected;
+                        updatePath = Path.Combine(AppDataManager.BaseDirPath, updatePathRelative);
 
                         if (File.Exists(updatePath))
                         {
@@ -1517,6 +1579,19 @@ namespace Ryujinx.Headless.SDL2
             public byte[]? Icon;
         }
 
+        public unsafe struct DlcNcaListItem 
+        {
+            public fixed byte Path[256];
+            public ulong TitleId;
+        }
+
+        public unsafe struct DlcNcaList
+        {
+            public bool success;
+            public uint size;
+            public unsafe DlcNcaListItem* items;
+        }
+
         public unsafe struct GameInfoNative
         {
             public ulong FileSize;
@@ -1564,14 +1639,13 @@ namespace Ryujinx.Headless.SDL2
                     ImageData = null;
                 }
             }
-
-            private static void CopyStringToFixedArray(string source, byte* destination, int length)
-            {
-                var span = new Span<byte>(destination, length);
-                span.Clear();
-                Encoding.UTF8.GetBytes(source, span);
-            }
         }
 
+        private static unsafe void CopyStringToFixedArray(string source, byte* destination, int length)
+        {
+            var span = new Span<byte>(destination, length);
+            span.Clear();
+            Encoding.UTF8.GetBytes(source, span);
+        }
     }
 }