Working Game Shortcuts for all game sources #423
Conversation
…ectly. Will now look to test and fix front-end exporting.
📝 WalkthroughWalkthroughImplements GameSource-aware external launches and shortcuts: intent-parsed Changes
Sequence DiagramsequenceDiagram
participant Intent as External Intent
participant IL as IntentLaunchManager
participant PM as PluviaMain
participant Steam as SteamService
participant GOG as GOGService
participant Epic as EpicService
participant CS as CustomGameScanner
Intent->>IL: Launch intent (game_id, game_source?)
IL->>IL: Extract & validate game_source (default STEAM)
IL->>PM: Deliver LaunchRequest (appId = "<SOURCE>_<id>")
alt source == STEAM
PM->>Steam: SteamService.isAppInstalled(appId)
Steam-->>PM: installed?
else source == GOG
PM->>GOG: Ensure credentials / init
GOG-->>PM: ready
PM->>GOG: GOGService.isGameInstalled(appId)
GOG-->>PM: installed?
else source == EPIC
PM->>Epic: EpicService.isGameInstalled(appId)
Epic-->>PM: installed?
else source == CUSTOM_GAME
PM->>CS: CustomGameScanner.isGameInstalled(appId)
CS-->>PM: installed?
end
alt installed
PM->>PM: Apply container/config overrides (use launchRequest.appId)
PM->>PM: preLaunchApp / launch
else not installed
PM->>PM: Log / show not-installed message
end
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
| @@ -40,7 +42,14 @@ object IntentLaunchManager { | |||
| return null | |||
| } | |||
|
|
|||
| val appId = "${GameSource.STEAM.name}_$gameId" | |||
| // Get Game Source for launch intent | |||
| var gameSource = intent.getStringExtra(EXTRA_GAME_SOURCE)?.uppercase() | |||
| val isValidGameSource = GameSource.entries.any { it.name == gameSource } | |||
| if (!isValidGameSource) { | |||
| gameSource = GameSource.STEAM.name | |||
| } | |||
|
|
|||
| val appId = "${gameSource}_$gameId" | |||
There was a problem hiding this comment.
Intent Manager will now correctly parse the gameSource.
|
|
||
| // Helper function to check if game is installed to match pattern of GOG & Steam Service | ||
| fun isGameInstalled(appId: Int): Boolean { | ||
| val isInstalled = findCustomGameById(appId) != null | ||
|
|
||
| return isInstalled | ||
| } | ||
|
|
There was a problem hiding this comment.
Added isGameInstalled helper function to match the pattern of GOG and Steam services.
| @@ -235,27 +241,13 @@ fun PluviaMain( | |||
| return@let | |||
| } | |||
|
|
|||
| // If it's a custom game, update the appId to use CUSTOM_GAME format | |||
| val finalAppId = if (customGamePath != null && !isSteamInstalled) { | |||
| "${GameSource.CUSTOM_GAME.name}_$gameId" | |||
| } else { | |||
| launchRequest.appId | |||
| } | |||
|
|
|||
| // Update launchRequest with the correct appId if it was changed | |||
| val updatedLaunchRequest = if (finalAppId != launchRequest.appId) { | |||
| launchRequest.copy(appId = finalAppId) | |||
| } else { | |||
| launchRequest | |||
| } | |||
|
|
|||
| if (updatedLaunchRequest.containerConfig != null) { | |||
| if (launchRequest.containerConfig != null) { | |||
There was a problem hiding this comment.
Now correctly parses and identifies the game, and this logic is also cleaned up so that it's extensible for future purposes.
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
2 issues found across 5 files
Prompt for AI agents (all issues)
Check if these issues are valid — if so, understand the root cause of each and fix them.
<file name="app/src/main/java/app/gamenative/utils/IntentLaunchManager.kt">
<violation number="1" location="app/src/main/java/app/gamenative/utils/IntentLaunchManager.kt:46">
P2: Use locale-independent uppercasing when normalizing `game_source`; `uppercase()` is locale-sensitive and can mis-normalize values (e.g., Turkish locale), causing valid sources to be rejected and defaulted to STEAM.</violation>
</file>
<file name="app/src/main/java/app/gamenative/ui/PluviaMain.kt">
<violation number="1" location="app/src/main/java/app/gamenative/ui/PluviaMain.kt:215">
P2: Legacy GOG shortcuts without a `GOG_` prefix are treated as STEAM, so valid GOG installs will be rejected as “not installed” and never launched.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
app/src/main/java/app/gamenative/ui/PluviaMain.kt (2)
145-180: Missing GOG installation check in ExternalGameLaunch handler.This handler checks Steam and Custom game installation but doesn't check GOG. A GOG game launched via this path would incorrectly fall through with
isSteamInstalled = falseandcustomGamePath = null, leading to the wrongfinalAppIdor launch failure.The
OnLogonEndedhandler at lines 214-226 correctly checks all three sources. This handler should follow the same pattern.Suggested fix
is MainViewModel.MainUiEvent.ExternalGameLaunch -> { Timber.i("[PluviaMain]: Received ExternalGameLaunch UI event for app ${event.appId}") // Extract game ID from appId (format: "STEAM_<id>" or "CUSTOM_GAME_<id>") val gameId = ContainerUtils.extractGameIdFromContainerId(event.appId) + val gameSource = ContainerUtils.extractGameSourceFromContainerId(event.appId) - // First check if it's a Steam game and if it's installed - val isSteamInstalled = SteamService.isAppInstalled(gameId) - - // If not installed as Steam game, check if it's a custom game - val customGamePath = if (!isSteamInstalled) { - CustomGameScanner.findCustomGameById(gameId) - } else { - null + val isInstalled = when (gameSource) { + GameSource.STEAM -> SteamService.isAppInstalled(gameId) + GameSource.GOG -> GOGService.isGameInstalled(gameId.toString()) + GameSource.CUSTOM_GAME -> CustomGameScanner.isGameInstalled(gameId) } - // Determine the final appId to use - val finalAppId = if (customGamePath != null && !isSteamInstalled) { - "${GameSource.CUSTOM_GAME.name}_$gameId" - } else { - event.appId + if (!isInstalled) { + // Handle not installed case similar to OnLogonEnded + // Show error dialog and return + return@collect } + val finalAppId = event.appId + Timber.i("[PluviaMain]: Using appId: $finalAppId ...")
228-241: App name lookup incorrectly uses Steam service for all game sources.Line 229 uses
SteamService.getAppInfoOf(gameId)regardless ofgameSource. For GOG and Custom games, this returnsnull, falling back to the generic "App ${launchRequest.appId}" message.To improve UX, use source-appropriate lookups:
val appName = when (gameSource) { GameSource.STEAM -> SteamService.getAppInfoOf(gameId)?.name GameSource.GOG -> GOGService.getGOGGameOf(gameId)?.title GameSource.CUSTOM_GAME -> CustomGameScanner.findCustomGameById(gameId)?.let { File(it).name } } ?: "App ${launchRequest.appId}"Note: The custom game case falls back to using the folder name as the game name, since there is no dedicated game name retrieval method in
CustomGameScanner.
♻️ Duplicate comments (1)
app/src/main/java/app/gamenative/ui/PluviaMain.kt (1)
212-226: Multi-source installation check looks good, minor API inconsistency noted.The
whenexpression properly handles all three game sources. Note the type inconsistency:GOGService.isGameInstalledtakes aString(line 220) whileSteamService.isAppInstalledandCustomGameScanner.isGameInstalledtakeInt. Consider aligning the APIs for consistency.Regarding legacy GOG shortcuts defaulting to STEAM: since GOG shortcut creation is new in this PR, there shouldn't be legacy GOG shortcuts to worry about.
🧹 Nitpick comments (1)
app/src/main/java/app/gamenative/ui/PluviaMain.kt (1)
397-404: Consider using the importedGOGServiceinstead of fully qualified names.
GOGServiceis imported at line 54, but lines 397-404 use the fully qualifiedapp.gamenative.service.gog.GOGService. This is inconsistent with line 220 which uses the short form.Suggested simplification
- if (app.gamenative.service.gog.GOGService.hasStoredCredentials(context) && - !app.gamenative.service.gog.GOGService.isRunning - ) { + if (GOGService.hasStoredCredentials(context) && !GOGService.isRunning) { Timber.tag("GOG").d("[PluviaMain]: Starting GOGService for logged-in user") - app.gamenative.service.gog.GOGService.start(context) + GOGService.start(context) } else { - Timber.tag("GOG").d("GOG SERVICE Not going to start: ${app.gamenative.service.gog.GOGService.isRunning}") + Timber.tag("GOG").d("GOG SERVICE Not going to start: ${GOGService.isRunning}") }
|
Will update this once EGS if merged in and we can get this one in too. |
… into fix/exports-shortcuts
| protected fun getGameSource(libraryItem: LibraryItem): GameSource { | ||
| return libraryItem.gameSource | ||
| } | ||
|
|
There was a problem hiding this comment.
Only change here, rest is formatting changes from kotlin's formatter.
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@app/src/main/java/app/gamenative/ui/PluviaMain.kt`:
- Around line 214-226: The when expression in PluviaMain.kt that computes
isInstalled for gameSource omits GameSource.EPIC; add a GameSource.EPIC branch
to the same when block (alongside GameSource.STEAM, GOG, CUSTOM_GAME) and call
the appropriate Epic installation check (e.g.,
EpicService.isGameInstalled(gameId.toString()) or
EpicService.isAppInstalled(gameId) depending on the EpicService API), and add
any required import for EpicService so EPIC cases are handled explicitly.
🧹 Nitpick comments (2)
app/src/main/java/app/gamenative/ui/screen/library/appscreen/BaseAppScreen.kt (1)
153-156: Consider adding KDoc comment for consistency.The surrounding helper methods (
getGameName,getGameId,getIconUrl) all have KDoc comments describing their purpose. Adding one here would maintain consistency.📝 Suggested documentation
+ /** + * Get the game source (Steam, GOG, Custom, etc.) for shortcuts + */ protected fun getGameSource(libraryItem: LibraryItem): GameSource { return libraryItem.gameSource }app/src/main/java/app/gamenative/ui/PluviaMain.kt (1)
228-240: App name lookup should be source-aware for better UX.When
gameSourceis GOG or CUSTOM_GAME,SteamService.getAppInfoOf(gameId)returnsnull, causing the error dialog to display "App GOG_12345" or "App CUSTOM_GAME_5" instead of the actual game name.Consider adding source-aware name resolution:
♻️ Proposed source-aware name lookup
if (!isInstalled) { - val appName = SteamService.getAppInfoOf(gameId)?.name ?: "App ${launchRequest.appId}" + val appName = when (gameSource) { + GameSource.STEAM -> SteamService.getAppInfoOf(gameId)?.name + GameSource.GOG -> GOGService.getGOGGameOf(gameId.toString())?.title + GameSource.CUSTOM_GAME -> CustomGameScanner.findCustomGameById(gameId)?.let { File(it).name } + } ?: "App ${launchRequest.appId}" Timber.tag("IntentLaunch").w("Game not installed: $appName (${launchRequest.appId})")
1 participant
Overview
This PR updates the Game Shortcut logic for exporting and consuming the launch intent.
This does the following:
Summary by cubic
Shortcuts and launch intents now work for Steam, GOG, Epic, and Custom games. Shortcuts embed the game source so they open the right game and show a clear message if the game isn’t installed.
Written for commit 5450014. Summary will update on new commits.
Summary by CodeRabbit
New Features
Improvements