FIX: Remove duplicates from favorites on-the-fly #994
Merged
Conversation
This file contains 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.
Problem
Favorites still gets corrupted sometimes. It happens when we share rom folders between Verified, Expert, or Search.
This:
{"label":"Earthworm Jim (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","type":5,"rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim (U).zip"} {"label":"Earthworm Jim 2 (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","type":5,"rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim 2 (U).zip"} {"label":"Ecks vs. Sever (U) (M5)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","type":5,"rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Ecks vs. Sever (U) (M5).zip"} {"label":"Earthworm Jim (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","type":5,"rompath":"/mnt/SDCARD/Emu/GBA/../../Roms/GBA/Earthworm Jim (U).zip"} {"label":"Earthworm Jim 2 (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","type":5,"rompath":"/mnt/SDCARD/Emu/GBA/../../Roms/GBA/Earthworm Jim 2 (U).zip"} {"label":"Ecks vs. Sever (U) (M5)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","type":5,"rompath":"/mnt/SDCARD/Emu/GBA/../../Roms/GBA/Ecks vs. Sever (U) (M5).zip"}Will get mangled into this:
{"label":"Earthworm Jim (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim (U).zip","imgpath":"","type":5} {"label":"Earthworm Jim (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim (U).zip","imgpath":"","type":5,"label":"Earthworm Jim 2 (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim 2 (U).zip","imgpath":"","type":5} {"label":"Earthworm Jim (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim (U).zip","imgpath":"","type":5,"label":"Earthworm Jim 2 (U)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim 2 (U).zip","imgpath":"","type":5,"label":"Ecks vs. Sever (U) (M5)","launch":"/mnt/SDCARD/Emu/GBA/launch.sh","rompath":"/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Ecks vs. Sever (U) (M5).zip","imgpath":"","type":5}To reproduce:
Miyoo's fix seems to be comparing the string value of the rom paths for restricting double-favoriting - when in reality they should be comparing the absolute paths:
/mnt/SDCARD/RApp/gpsp/../../Roms/GBA/Earthworm Jim (U).zip<>
/mnt/SDCARD/Emu/GBA/../../Roms/GBA/Earthworm Jim (U).zipComparing absolute paths:
/mnt/SDCARD/Roms/GBA/Earthworm Jim (U).zip<>
/mnt/SDCARD/Roms/GBA/Earthworm Jim (U).zipChanges
keymon