Repository navigation
Fix media lookup by title for game files in subdirectories - #1190
Open
theluckystrike wants to merge 1 commit into
Open
theluckystrike wants to merge 1 commit into
theluckystrike wants to merge 1 commit into
Conversation
Media is searched in <game dir>/media/<title>, but the title key was built from the game file's own directory, so a file like Minecraft/start.sh never matched media/Minecraft/. Also add the key relative to each game dir that contains the file, after the existing keys so no current layout changes. Fixes mmatyas#1172
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1172
When a game file sits in a subdirectory of the collection, for example
Minecraft/start.sh, media stored by title in the collection'smedia/Minecraft/folder is never picked up. MediaProvider looks for media under<game dir>/media/<title>, but the title key it matches against was built from the game file's own folder, so for a nested file it pointed at<root>/Minecraft/Minecraftinstead of<root>/Minecraft.The lookup map now also adds
<game dir>/<title>when the file's folder is inside one of the game dirs. The old key still goes in first. Nothing changes for existing layouts. The prefix check includes the trailing slash, so a dir likesnes2doesn't count as being insidesnes.The new test
asset_search_by_title_nestedputs the game file undersubdir/and the box art undermedia/My Precious Game/, then checks that the game gets that boxFront, which it doesn't when the new loop is disabled. With the loop in place all 7 tests in test_PegasusMediaProvider pass on Qt 5.15 (macOS).Michael