Emulation/EmuDeck
1
0
Fork 0
mirror of https://github.com/dragoonDorise/EmuDeck.git synced 2024-06-01 19:17:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pegasus: Tweaks and Fixes (#1117)

Browse source 
* Fixed Model 2 Emulator and Supermodel metadata files
* Moved metadata files and metadata to rom subfolder for Proton emulators
* Added RPCS3 support through desktop files
* Adjusted defaults
    * Atari Jaguar/Atari Jaguar CD changed to BigPEmu
    * Arcade changed to MAME (standalone)
    * NDS changed to melonDS DS
    * Nintendo 64DD changed to RMG
    * PSP changed to PPSSPP (Standalone)
    * Nintendo Switch changed to Ryujinx (Standalone)
    * VSmile changed to MAME (Standalone)
* Removed z: from wiiu metadata file since it's presumably running Cemu Native
* Cleaned up Pegasus file
* Added support for XBLA through zar files
    * Can implement zar compression in a separate PR

Co-authored-by: Dragoon Dorise <rodrigosedano@me.com>
This commit is contained in:
rawdatafeel 2024-03-12 12:33:19 -04:00 committed by GitHub
parent ce57583667
commit 83a108c561
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 101 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configs/pegasus-frontend/game_dirs.txt
View file

@ -88,7 +88,7 @@
/run/media/mmcblk0p1/Emulation/roms/megadrivejp
/run/media/mmcblk0p1/Emulation/roms/megaduck
/run/media/mmcblk0p1/Emulation/roms/mess
/run/media/mmcblk0p1/Emulation/roms/model2
/run/media/mmcblk0p1/Emulation/roms/model2/roms
/run/media/mmcblk0p1/Emulation/roms/model3
/run/media/mmcblk0p1/Emulation/roms/moonlight
/run/media/mmcblk0p1/Emulation/roms/moto
@ -182,6 +182,7 @@
/run/media/mmcblk0p1/Emulation/roms/x68000
/run/media/mmcblk0p1/Emulation/roms/xbox
/run/media/mmcblk0p1/Emulation/roms/xbox360/roms
/run/media/mmcblk0p1/Emulation/roms/xbox360/roms/xbla
/run/media/mmcblk0p1/Emulation/roms/zmachine
/run/media/mmcblk0p1/Emulation/roms/zx81
/run/media/mmcblk0p1/Emulation/roms/zxspectrum

62
functions/ToolScripts/emuDeckPegasus.sh
View file

@ -37,18 +37,68 @@ pegasus_init(){
rsync -avhp --mkpath "$EMUDECKGIT/configs/$pegasus_emuPath/" "$pegasus_path/"
#metadata and paths
rsync -r "$EMUDECKGIT/roms/" "$romsPath"
rsync -av -f"+ */" -f"- *" "$EMUDECKGIT/roms/" "$toolsPath/downloaded_media"
rsync -r --exclude='roms' --exclude='pfx' "$EMUDECKGIT/roms/" "$romsPath"
rsync -av --exclude='roms' --exclude='pfx' "$EMUDECKGIT/roms/" "$toolsPath/downloaded_media"
find $romsPath -type f -name "metadata.txt" -exec sed -i "s|CORESPATH|${RetroArch_cores}|g" {} \;
find $romsPath -type f -name "metadata.txt" -exec sed -i "s|/run/media/mmcblk0p1/Emulation|${emulationPath}|g" {} \;
for systemPath in "$romsPath"/*; do rm -rf "$systemPath/media" &> /dev/null; done
for systemPath in "$romsPath"/*; do system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/'); mkdir -p "$toolsPath/downloaded_media/$system/covers"; rm -rf "$toolsPath/downloaded_media/$system/box2dfront" ; mkdir -p "$toolsPath/downloaded_media/$system/marquees"; rm -rf "$toolsPath/downloaded_media/$system/wheel" &> /dev/null; rm -rf "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null; mkdir -p "$toolsPath/downloaded_media/$system/screenshots/"; done
for systemPath in "$romsPath"/*; do system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/'); ln -s "$toolsPath/downloaded_media/$system" "$systemPath/media" &> /dev/null; ln -s "$toolsPath/downloaded_media/$system/covers/" "$toolsPath/downloaded_media/$system/box2dfront" &> /dev/null; ln -s "$toolsPath/downloaded_media/$system/marquees/" "$toolsPath/downloaded_media/$system/wheel" &> /dev/null; ln -s "$toolsPath/downloaded_media/$system/screenshots/" "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null; done
for systemPath in "$romsPath"/*; do
echo $romsPath
if [[ "$systemPath" == "$romsPath/model2" || "$systemPath" == "$romsPath/xbox360" || "$systemPath" == "$romsPath/wiiu" ]]; then
rm -rf "$systemPath/roms/media" &> /dev/null;
rm -rf "$romsPath/xbox360/roms/xbla/media" &> /dev/null;
else
rm -rf "$systemPath/media" &> /dev/null;
fi
done
for systemPath in "$romsPath"/*; do
if [[ "$systemPath" == "$romsPath/model2" || "$systemPath" == "$romsPath/xbox360" || "$systemPath" == "$romsPath/wiiu" ]]; then
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
echo $system
mkdir -p "$toolsPath/downloaded_media/$system/covers"
rm -rf "$toolsPath/downloaded_media/$system/box2dfront"
mkdir -p "$toolsPath/downloaded_media/$system/marquees"
rm -rf "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
rm -rf "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
mkdir -p "$toolsPath/downloaded_media/$system/screenshots/"
else
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
mkdir -p "$toolsPath/downloaded_media/$system/covers"
rm -rf "$toolsPath/downloaded_media/$system/box2dfront"
mkdir -p "$toolsPath/downloaded_media/$system/marquees"
rm -rf "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
rm -rf "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
mkdir -p "$toolsPath/downloaded_media/$system/screenshots/"
fi
done
for systemPath in "$romsPath"/*; do
if [[ "$systemPath" == "$romsPath/model2" || "$systemPath" == "$romsPath/xbox360" || "$systemPath" == "$romsPath/wiiu" ]]; then
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
ln -s "$toolsPath/downloaded_media/$system" "$systemPath/roms/media" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/covers/" "$toolsPath/downloaded_media/$system/box2dfront" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/marquees/" "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/screenshots/" "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
cp -P "$romsPath/xbox360/roms/media" "$romsPath/xbox360/roms/xbla"
else
system=$(echo "$systemPath" | sed 's/.*\/\([^\/]*\)\/\?$/\1/')
ln -s "$toolsPath/downloaded_media/$system" "$systemPath/media" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/covers/" "$toolsPath/downloaded_media/$system/box2dfront" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/marquees/" "$toolsPath/downloaded_media/$system/wheel" &> /dev/null
ln -s "$toolsPath/downloaded_media/$system/screenshots/" "$toolsPath/downloaded_media/$system/screenshot" &> /dev/null
fi
done
for systemPath in "$romsPath"/*; do
rm -rf ".*/" &> /dev/null;
done
for systemPath in "$romsPath"/*; do rm -rf ".*/" &> /dev/null; done
sed -i "s|/run/media/mmcblk0p1/Emulation|${emulationPath}|g" "$pegasus_dir_file"
mkdir -p "$toolsPath/launchers/pegasus/"

2
roms/arcade/metadata.txt
View file

@ -1,4 +1,4 @@
collection: Arcade
shortname: arcade
extensions: cmd, CMD, 7z, 7Z, zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh -L CORESPATH/mame_libretro.so {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/mame.sh {file.path}

2
roms/atarijaguar/metadata.txt
View file

@ -1,4 +1,4 @@
collection: Atari Jaguar
shortname: atarijaguar
extensions: j64, J64, jag, JAG, rom, ROM, abs, ABS, cof, COF, bin, BIN, prg, PRG, 7z, 7Z, zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh -L CORESPATH/virtualjaguar_libretro.so {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/bigpemu.sh {file.path}

2
roms/atarijaguarcd/metadata.txt
View file

@ -1,6 +1,6 @@
collection: Atari Jaguar CD
shortname: atarijaguarcd
extensions: j64, J64, jag, JAG, rom, ROM, abs, ABS, cof, COF, bin, BIN, prg, PRG, 7z, 7Z, zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh -L CORESPATH/virtualjaguar_libretro.so {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/bigpemu.sh {file.path}

2
roms/gc/metadata.txt
View file

@ -1,6 +1,6 @@
collection: Nintendo GameCube
shortname: gc
extensions: gcm, GCM, iso, ISO, wbfs, WBFS, wia, WIA, ciso, CISO, gcz, GCZ, elf, ELF, dol, DOL, dff, DFF, json, JSON, rvz, RVZ, tgc, TGC, wad, WAD, m3u, M3U
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/dolphin-emu.sh vblank_mode=0 %command% -b -e {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/dolphin-emu.sh -b -e {file.path}

6
roms/model2/metadata.txt
View file

@ -1,6 +0,0 @@
collection: Sega Model 2
shortname: model2
extensions: 7z, 7Z, zip, ZIP
launch: PLACEHOLDER {file.path}

6
roms/model2/roms/metadata.txt Normal file
View file

@ -0,0 +1,6 @@
collection: Sega Model 2
shortname: model2
extensions: zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/model-2-emulator.sh {file.basename}

4
roms/model3/metadata.txt
View file

@ -1,6 +1,6 @@
collection: Sega Model 3
shortname: model3
extensions: 7z, 7Z, zip, ZIP
launch: PLACEHOLDER {file.path}
extensions: zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/supermodel.sh {file.path}

2
roms/n64dd/metadata.txt
View file

@ -1,7 +1,7 @@
collection: Nintendo 64DD
shortname: n64dd
extensions: bin, BIN, n64, N64, ndd, NDD, u1, U1, v64, V64, z64, Z64, 7z, 7Z, zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh -L CORESPATH/parallel_n64_libretro.so {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/rosaliesmupengui.sh --fullscreen --nogui --quit-after-emulation {file.path}

2
roms/nds/metadata.txt
View file

@ -1,4 +1,4 @@
collection: Nintendo DS
shortname: nds
extensions: bin, BIN, nds, NDS, 7z, 7Z, zip, ZIP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/melonds.sh -f {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh -L CORESPATH/melondsds_libretro.so {file.path}

4
roms/ps3/metadata.txt
View file

@ -1,7 +1,7 @@
collection: Sony PlayStation 3
shortname: ps3
extensions: desktop, ps3, PS3, ps3dir, PS3DIR
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/rpcs3.sh --no-gui {file.path}
extensions: desktop, DESKTOP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/rpcs3.sh {file.path}

2
roms/psp/metadata.txt
View file

@ -1,7 +1,7 @@
collection: Sony PlayStation Portable
shortname: psp
extensions: elf, ELF, iso, ISO, cso, CSO, prx, PRX, pbp, PBP
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh -L CORESPATH/ppsspp_libretro.so {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/ppsspp.sh {file.path}

4
roms/switch/metadata.txt
View file

@ -1,4 +1,4 @@
collection: Nintendo Switch
shortname: switch
extensions: nca, NCA, nro, NRO, nso, NSO, nsp, NSP, xci, XCI, 7z, 7Z, zip, ZIP
launch: /bin/bash /run/media/mmcblk0p1/Emulation/tools/launchers/yuzu.sh -f -g '{file.path}'
extensions: nca, NCA, nro, NRO, nso, NSO, nsp, NSP, xci, XCI
launch: /bin/bash /run/media/mmcblk0p1/Emulation/tools/launchers/ryujinx.sh --fullscreen '{file.path}'

2
roms/vsmile/metadata.txt
View file

@ -1,6 +1,6 @@
collection: VTech V, Smile
shortname: vsmile
extensions: bin, BIN, 7z, 7Z, zip, ZIP
launch: PLACEHOLDER {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/mame.sh vsmile -cart {file.path}

2
roms/wii/metadata.txt
View file

@ -1,4 +1,4 @@
collection: Nintendo Wii
shortname: wii
extensions: gcm, GCM, iso, ISO, wbfs, WBFS, wia, WIA, ciso, CISO, gcz, GCZ, elf, ELF, dol, DOL, dff, DFF, json, JSON, rvz, RVZ, tgc, TGC, wad, WAD, m3u, M3U
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/dolphin-emu.sh vblank_mode=0 %command% -b -e {file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/dolphin-emu.sh -b -e {file.path}

2
roms/wiiu/roms/metadata.txt
View file

@ -1,6 +1,6 @@
collection: Nintendo Wii U
shortname: wiiu
extensions: rpx, RPX, wud, WUD, wux, WUX, elf, ELF, iso, ISO, wad, WAD, wua, WUA
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/cemu.sh -f -g z:{file.path}
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/cemu.sh -f -g {file.path}

2
roms/xbox360/metadata.txt → roms/xbox360/roms/metadata.txt
View file

@ -1,4 +1,4 @@
collection: Microsoft Xbox 360
shortname: xbox360
extensions: iso, ISO, xex, XEX
extensions: iso, ISO, xex, XEX, zar, ZAR
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/xenia.sh "Z:{file.path}"

4
roms/xbox360/xbla/metadata.txt Normal file
View file

@ -0,0 +1,4 @@
collection: Microsoft Xbox 360
shortname: xbox360
extensions: iso, ISO, xex, XEX, zar, ZAR
launch: /run/media/mmcblk0p1/Emulation/tools/launchers/xenia.sh "Z:{file.path}"

25
tools/launchers/rpcs3.sh
View file

@ -19,12 +19,19 @@ else
chmod +x $exe
fi
#run the executable with the params.
#Fix first '
param="${@}"
substituteWith='"'
param=${param/\'/"$substituteWith"}
#Fix last ' on command
param=$(echo "$param" | sed 's/.$/"/')
eval "${exe} ${param}"
rm -rf "$savesPath/.gaming"
fileExtension="${@##*.}"
if [[ $fileExtension == "desktop" ]]; then
rpcs3desktopFile=$(grep -E "^Exec=" "${*}" | sed 's/^Exec=//' | sed 's/%%/%/g')
echo "Exec=$rpcs3desktopFile"
eval $rpcs3desktopFile
else
#run the executable with the params.
#Fix first '
param="${@}"
substituteWith='"'
param=${param/\'/"$substituteWith"}
#Fix last ' on command
param=$(echo "$param" | sed 's/.$/"/')
eval "${exe} ${param}"
fi