- Ozone is now RA default.

- Updated RA cores dir in ES-DE.
- Configurations for RA.
- Code cleanup

com.xargon.retrodeck.yml

@@ -471,125 +471,29 @@ modules:
   - name: retrodeck
     buildsystem: simple
     build-commands:
-        - mkdir -p ~/retrodeck/roms/bios
-        - mkdir -p ~/retrodeck/roms/3do
-        - mkdir -p ~/retrodeck/roms/amiga
-        - mkdir -p ~/retrodeck/roms/amigacd32
-        - mkdir -p ~/retrodeck/roms/amstradcpc
-        - mkdir -p ~/retrodeck/roms/arcade
-        - mkdir -p ~/retrodeck/roms/atari2600
-        - mkdir -p ~/retrodeck/roms/atari5200
-        - mkdir -p ~/retrodeck/roms/atari7800
-        - mkdir -p ~/retrodeck/roms/atarist
-        - mkdir -p ~/retrodeck/roms/atari800
-        - mkdir -p ~/retrodeck/roms/atomiswave
-        - mkdir -p ~/retrodeck/roms/channelf
-        - mkdir -p ~/retrodeck/roms/colecovision
-        - mkdir -p ~/retrodeck/roms/c64
-        - mkdir -p ~/retrodeck/roms/c128
-        - mkdir -p ~/retrodeck/roms/vic20
-        - mkdir -p ~/retrodeck/roms/laserdisc
-        - mkdir -p ~/retrodeck/roms/dreamcast
-        - mkdir -p ~/retrodeck/roms/easyrpg
-        - mkdir -p ~/retrodeck/roms/famicom
-        - mkdir -p ~/retrodeck/roms/fbn
-        - mkdir -p ~/retrodeck/roms/gb
-        - mkdir -p ~/retrodeck/roms/gbh
-        - mkdir -p ~/retrodeck/roms/gameandwatch
-        - mkdir -p ~/retrodeck/roms/gba
-        - mkdir -p ~/retrodeck/roms/fds
-        - mkdir -p ~/retrodeck/roms/c16
-        - mkdir -p ~/retrodeck/roms/ggh
-        - mkdir -p ~/retrodeck/roms/gbah
-        - mkdir -p ~/retrodeck/roms/intellivision
-        - mkdir -p ~/retrodeck/roms/gbch
-        - mkdir -p ~/retrodeck/roms/atarilynx
-        - mkdir -p ~/retrodeck/roms/mame
-        - mkdir -p ~/retrodeck/roms/dos
-        - mkdir -p ~/retrodeck/roms/snesmsu1
-        - mkdir -p ~/retrodeck/roms/msx
-        - mkdir -p ~/retrodeck/roms/msx2
-        - mkdir -p ~/retrodeck/roms/naomi
-        - mkdir -p ~/retrodeck/roms/neogeo
-        - mkdir -p ~/retrodeck/roms/ngp
-        - mkdir -p ~/retrodeck/roms/nds
-        - mkdir -p ~/retrodeck/roms/n64
-        - mkdir -p ~/retrodeck/roms/nes
-        - mkdir -p ~/retrodeck/roms/nesh
-        - mkdir -p ~/retrodeck/roms/ngpc
-        - mkdir -p ~/retrodeck/roms/neocd
-        - mkdir -p ~/retrodeck/roms/pc-9800
-        - mkdir -p ~/retrodeck/roms/pcengine
-        - mkdir -p ~/retrodeck/roms/pcenginecd
-        - mkdir -p ~/retrodeck/roms/pcfx
-        - mkdir -p ~/retrodeck/roms/openbor
-        - mkdir -p ~/retrodeck/roms/piece
-        - mkdir -p ~/retrodeck/roms/odyssey2
-        - mkdir -p ~/retrodeck/roms/psp
-        - mkdir -p ~/retrodeck/roms/pspminis
-        - mkdir -p ~/retrodeck/roms/pokemini
-        - mkdir -p ~/retrodeck/roms/homebrew
-        - mkdir -p ~/retrodeck/roms/ports
-        - mkdir -p ~/retrodeck/roms/sc-3000
-        - mkdir -p ~/retrodeck/roms/scummvm
-        - mkdir -p ~/retrodeck/roms/psx
-        - mkdir -p ~/retrodeck/roms/segacd
-        - mkdir -p ~/retrodeck/roms/sega32x
-        - mkdir -p ~/retrodeck/roms/genesis
-        - mkdir -p ~/retrodeck/roms/genh
-        - mkdir -p ~/retrodeck/roms/mastersystem
-        - mkdir -p ~/retrodeck/roms/megadrive
-        - mkdir -p ~/retrodeck/roms/megaduck
-        - mkdir -p ~/retrodeck/roms/saturn
-        - mkdir -p ~/retrodeck/roms/sg-1000
-        - mkdir -p ~/retrodeck/roms/x1
-        - mkdir -p ~/retrodeck/roms/zxspectrum
-        - mkdir -p ~/retrodeck/roms/zx81
-        - mkdir -p ~/retrodeck/roms/pc-8800
-        - mkdir -p ~/retrodeck/roms/snes
-        - mkdir -p ~/retrodeck/roms/supergrafx
-        - mkdir -p ~/retrodeck/roms/pico-8
-        - mkdir -p ~/retrodeck/roms/megacd
-        - mkdir -p ~/retrodeck/roms/snesh
-        - mkdir -p ~/retrodeck/roms/satellaview
-        - mkdir -p ~/retrodeck/roms/sfc
-        - mkdir -p ~/retrodeck/roms/sufami
-        - mkdir -p ~/retrodeck/roms/tic-80
-        - mkdir -p ~/retrodeck/roms/tg16
-        - mkdir -p ~/retrodeck/roms/solarus
-        - mkdir -p ~/retrodeck/roms/vectrex
-        - mkdir -p ~/retrodeck/roms/gbc
-        - mkdir -p ~/retrodeck/roms/videopac
-        - mkdir -p ~/retrodeck/roms/virtualboy
-        - mkdir -p ~/retrodeck/roms/wonderswan
-        - mkdir -p ~/retrodeck/roms/wonderswancolor
-        - mkdir -p ~/retrodeck/roms/ecwolf
-        - mkdir -p ~/retrodeck/roms/x68000
-        - mkdir -p ~/retrodeck/roms/build
-        - mkdir -p ~/retrodeck/roms/tools
-        - mkdir -p ~/retrodeck/roms/imageviewer
-        - mkdir -p ~/retrodeck/roms/gamegear
-        - mkdir -p ~/retrodeck/roms/tg16cd
-        - mkdir -p ~/retrodeck/roms/j2me
-        - mkdir -p ~/retrodeck/roms/uzebox
-        - mkdir -p ~/retrodeck/roms/supervision
-        - mkdir -p ~/retrodeck/roms/doom
-        - mkdir -p ~/retrodeck/roms/switch
-        - mkdir -p ~/retrodeck/roms/wii
-        - mkdir -p ~/retrodeck/roms/gc
-        - mkdir -p ~/retrodeck/roms/3ds
-
-        - rm -f ${FLATPAK_DEST}/etc/retroarch.cfg
-        - mv retroarch.cfg ${FLATPAK_DEST}/etc/retroarch.cfg
+    
+        # RA is already doing this no?
+        #- rm -f ${FLATPAK_DEST}/etc/retroarch.cfg
+        #- mv retroarch.cfg ${FLATPAK_DEST}/etc/retroarch.cfg
 
         # - symlink useful dirs and files in ~/retrodeck
-        # TODO: cannot see home folder at this point
+        # TODO: cannot see home folder at this point, same for es_settings.xml
         #- ln -s ${FLATPAK_DEST}/etc/retroarch.cfg ~/retrodeck/retroarch.cfg
         #- ln -s ${FLATPAK_DEST}/share/emulationstation/themes/ ~/retrodeck/
 
+        # Remove this when/if commited to ES-DE
+        - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
+        - cp es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
+
+        # Create retrodeck.sh scripts:
+        # sed the es_config to inject the default rom folder
+        
+
     #cleanup: ['*']
     sources:
-      - type: file
-        path: retroarch.cfg
+      #- type: file
+      #  path: retroarch.cfg
+      - type: file # Remove this when/if commited to ES-DE
+        path: es_find_rules.xml
       
     # create desktop entry

es_find_rules.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<!-- This is the ES-DE find rules configuration file for Unix -->
+<ruleList>
+    <emulator name="RETROARCH">
+        <rule type="systempath">
+            <entry>retroarch</entry>
+            <entry>org.libretro.RetroArch</entry>
+            <entry>RetroArch-Linux-x86_64.AppImage</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
+            <entry>~/Applications/RetroArch-Linux-x86_64.AppImage</entry>
+            <entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage</entry>
+            <entry>~/bin/RetroArch-Linux-x86_64.AppImage</entry>
+        </rule>
+    </emulator>
+    <core name="RETROARCH">
+        <rule type="corepath">
+            <!-- Snap package -->
+            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
+            <!-- Flatpak package -->
+            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
+            <!-- AppImage and compiled from source -->
+            <entry>~/.config/retroarch/cores</entry>
+            <!-- Ubuntu and Linux Mint repository -->
+            <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
+            <!-- Fedora repository -->
+            <entry>/usr/lib64/libretro</entry>
+            <!-- Manjaro repository -->
+            <entry>/usr/lib/libretro</entry>
+            <!-- FreeBSD and OpenBSD repository -->
+            <entry>/usr/local/lib/libretro</entry>
+            <!-- NetBSD repository -->
+            <entry>/usr/pkg/lib/libretro</entry>
+            <!-- FlatPak RetroDECK -->
+            <entry>/app/share/libretro/cores</entry>
+        </rule>
+    </core>
+    <emulator name="CITRA">
+        <!-- Nintendo 3DS emulator Citra -->
+        <rule type="systempath">
+            <entry>citra-emu.citra-nightly</entry>
+            <entry>org.citra_emu.citra</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.citra_emu.citra</entry>
+        </rule>
+    </emulator>
+    <emulator name="DOLPHIN">
+        <!-- Nintendo GameCube and Wii emulator Dolphin -->
+        <rule type="systempath">
+            <entry>dolphin-emu</entry>
+            <entry>org.DolphinEmu.dolphin-emu</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu</entry>
+            <entry>~/Applications/Dolphin_Emulator*.AppImage</entry>
+            <entry>~/.local/bin/Dolphin_Emulator*.AppImage</entry>
+            <entry>~/bin/Dolphin_Emulator*.AppImage</entry>
+        </rule>
+    </emulator>
+    <emulator name="DOSBOX-STAGING">
+        <!-- DOS emulator DOSBox Staging -->
+        <rule type="systempath">
+            <entry>dosbox-staging</entry>
+            <entry>io.github.dosbox-staging</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/io.github.dosbox-staging</entry>
+        </rule>
+    </emulator>
+    <emulator name="FS-UAE">
+        <!-- Commodore Amiga emulator FS-UAE -->
+        <rule type="systempath">
+            <entry>fs-uae</entry>
+            <entry>fsuae.fs-uae</entry>
+            <entry>net.fsuae.FS-UAE</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.fsuae.FS-UAE</entry>
+        </rule>
+    </emulator>
+    <emulator name="MAME">
+        <!-- Arcade emulator MAME -->
+        <rule type="systempath">
+            <entry>mame</entry>
+        </rule>
+    </emulator>
+    <emulator name="MGBA">
+        <!-- Nintendo Game Boy Advance emulator mGBA -->
+        <rule type="systempath">
+            <entry>mgba</entry>
+            <entry>io.mgba.mGBA</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/io.mgba.mGBA</entry>
+            <entry>~/Applications/mGBA*.AppImage</entry>
+            <entry>~/.local/bin/mGBA*.AppImage</entry>
+            <entry>~/bin/mGBA*.AppImage</entry>
+        </rule>
+    </emulator>
+    <emulator name="MUPEN64PLUS">
+        <!-- Nintendo 64 emulator Mupen64Plus -->
+        <rule type="systempath">
+            <entry>m64p</entry>
+            <entry>io.github.m64p.m64p</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/io.github.m64p.m64p</entry>
+        </rule>
+    </emulator>
+    <emulator name="PCSX2">
+        <!-- Sony PlayStation 2 emulator PCSX2 -->
+        <rule type="systempath">
+            <entry>PCSX2</entry>
+            <entry>pcsx2</entry>
+            <entry>net.pcsx2.PCSX2</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
+        </rule>
+    </emulator>
+    <emulator name="PPSSPP">
+        <!-- Sony PlayStation Portable emulator PPSSPP -->
+        <rule type="systempath">
+            <entry>ppsspp-emu.ppsspp-sdl</entry>
+            <entry>org.ppsspp.PPSSPP</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP</entry>
+        </rule>
+    </emulator>
+    <emulator name="RPCS3">
+        <!-- Sony PlayStation 3 emulator RPCS3 -->
+        <rule type="systempath">
+            <entry>rpcs3</entry>
+            <entry>rpcs3-emu.rpcs3</entry>
+            <entry>net.rpcs3.RPCS3</entry>
+            <entry>rpcs3.AppImage</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.rpcs3.RPCS3</entry>
+            <entry>~/Applications/rpcs3*.AppImage</entry>
+            <entry>~/.local/bin/rpcs3*.AppImage</entry>
+            <entry>~/bin/rpcs3*.AppImage</entry>
+        </rule>
+    </emulator>
+    <emulator name="VBA-M">
+        <!-- Nintendo Game Boy Advance emulator VBA-M -->
+        <rule type="systempath">
+            <entry>visualboyadvance-m</entry>
+        </rule>
+    </emulator>
+    <emulator name="XEMU">
+        <!-- Microsoft Xbox emulator xemu -->
+        <rule type="systempath">
+            <entry>xemu</entry>
+            <entry>app.xemu.xemu</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/app.xemu.xemu</entry>
+            <entry>~/Applications/Xemu*.AppImage</entry>
+            <entry>~/.local/bin/Xemu*.AppImage</entry>
+            <entry>~/bin/Xemu*.AppImage</entry>
+        </rule>
+    </emulator>
+    <emulator name="YUZU">
+        <!-- Nintendo Switch emulator Yuzu -->
+        <rule type="systempath">
+            <entry>yuzu</entry>
+            <entry>org.yuzu_emu.yuzu</entry>
+            <entry>yuzu.AppImage</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
+            <entry>~/Applications/yuzu*.AppImage</entry>
+            <entry>~/.local/bin/yuzu*.AppImage</entry>
+            <entry>~/bin/yuzu*.AppImage</entry>
+        </rule>
+    </emulator>
+</ruleList>

es_settings.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<bool name="AlternativeEmulatorPerGame" value="true" />
+<bool name="CollectionShowSystemInfo" value="true" />
+<bool name="CustomEventScripts" value="false" />
+<bool name="DebugSkipInputLogging" value="false" />
+<bool name="DisableComposition" value="true" />
+<bool name="DisplayGPUStatistics" value="false" />
+<bool name="EnableMenuKidMode" value="false" />
+<bool name="FavFirstCustom" value="false" />
+<bool name="FavStarCustom" value="false" />
+<bool name="FavoritesAddButton" value="true" />
+<bool name="FavoritesFirst" value="true" />
+<bool name="FavoritesStar" value="true" />
+<bool name="FoldersOnTop" value="true" />
+<bool name="GamelistFilters" value="true" />
+<bool name="GamelistVideoAudio" value="true" />
+<bool name="GamelistVideoPillarbox" value="true" />
+<bool name="GamelistVideoScanlines" value="false" />
+<bool name="IgnoreGamelist" value="false" />
+<bool name="InputOnlyFirstController" value="false" />
+<bool name="ListScrollOverlay" value="false" />
+<bool name="MediaViewerKeepVideoRunning" value="true" />
+<bool name="MediaViewerScreenshotScanlines" value="true" />
+<bool name="MediaViewerStretchVideos" value="false" />
+<bool name="MediaViewerVideoAudio" value="true" />
+<bool name="MediaViewerVideoBlur" value="false" />
+<bool name="MediaViewerVideoScanlines" value="true" />
+<bool name="MenuBlurBackground" value="true" />
+<bool name="MiximageCoverFallback" value="true" />
+<bool name="MiximageGenerate" value="true" />
+<bool name="MiximageIncludeBox" value="true" />
+<bool name="MiximageIncludeMarquee" value="true" />
+<bool name="MiximageIncludePhysicalMedia" value="true" />
+<bool name="MiximageOverwrite" value="true" />
+<bool name="MiximageRemoveLetterboxes" value="true" />
+<bool name="MiximageRemovePillarboxes" value="true" />
+<bool name="MiximageRotateHorizontalBoxes" value="true" />
+<bool name="NavigationSounds" value="true" />
+<bool name="ParseGamelistOnly" value="false" />
+<bool name="PlayVideosImmediately" value="false" />
+<bool name="PreloadGamelists" value="true" />
+<bool name="QuickSystemSelect" value="true" />
+<bool name="RandomAddButton" value="false" />
+<bool name="RunInBackground" value="false" />
+<bool name="Scrape3DBoxes" value="true" />
+<bool name="ScrapeBackCovers" value="true" />
+<bool name="ScrapeControllers" value="true" />
+<bool name="ScrapeCovers" value="true" />
+<bool name="ScrapeGameNames" value="true" />
+<bool name="ScrapeMarquees" value="true" />
+<bool name="ScrapeMetadata" value="true" />
+<bool name="ScrapePhysicalMedia" value="true" />
+<bool name="ScrapeRatings" value="true" />
+<bool name="ScrapeScreenshots" value="true" />
+<bool name="ScrapeTitleScreens" value="true" />
+<bool name="ScrapeVideos" value="true" />
+<bool name="ScraperExcludeRecursively" value="true" />
+<bool name="ScraperHaltOnInvalidMedia" value="true" />
+<bool name="ScraperIncludeFolders" value="false" />
+<bool name="ScraperInteractive" value="true" />
+<bool name="ScraperOverwriteData" value="true" />
+<bool name="ScraperRespectExclusions" value="true" />
+<bool name="ScraperRetryPeerVerification" value="false" />
+<bool name="ScraperSearchMetadataName" value="true" />
+<bool name="ScraperSemiautomatic" value="true" />
+<bool name="ScraperUseAccountScreenScraper" value="true" />
+<bool name="ScreensaverControls" value="true" />
+<bool name="ScreensaverSlideshowCustomImages" value="false" />
+<bool name="ScreensaverSlideshowGameInfo" value="true" />
+<bool name="ScreensaverSlideshowRecurse" value="false" />
+<bool name="ScreensaverSlideshowScanlines" value="true" />
+<bool name="ScreensaverStretchImages" value="false" />
+<bool name="ScreensaverStretchVideos" value="false" />
+<bool name="ScreensaverVideoAudio" value="false" />
+<bool name="ScreensaverVideoBlur" value="false" />
+<bool name="ScreensaverVideoGameInfo" value="true" />
+<bool name="ScreensaverVideoScanlines" value="true" />
+<bool name="ScrollIndicators" value="true" />
+<bool name="ShowHelpPrompts" value="true" />
+<bool name="ShowHiddenFiles" value="true" />
+<bool name="ShowHiddenGames" value="true" />
+<bool name="ShowQuitMenu" value="false" />
+<bool name="SpecialCharsASCII" value="false" />
+<bool name="UseCustomCollectionsSystem" value="true" />
+<bool name="VideoUpscaleFrameRate" value="false" />
+<bool name="VirtualKeyboard" value="true" />
+<int name="DisplayIndex" value="1" />
+<int name="MaxVRAM" value="256" />
+<int name="ScreensaverSwapImageTimeout" value="10000" />
+<int name="ScreensaverSwapVideoTimeout" value="0" />
+<int name="ScreensaverTimer" value="300000" />
+<int name="SoundVolumeNavigation" value="70" />
+<int name="SoundVolumeVideos" value="80" />
+<string name="ApplicationVersion" value="1.2.0" />
+<string name="CollectionSystemsAuto" value="" />
+<string name="CollectionSystemsCustom" value="" />
+<string name="DefaultSortOrder" value="filename, ascending" />
+<string name="ExitButtonCombo" value="F4" />
+<string name="GamelistViewStyle" value="automatic" />
+<string name="InputControllerType" value="xbox" />
+<string name="LaunchScreenDuration" value="normal" />
+<string name="MediaDirectory" value="" />
+<string name="MenuOpeningEffect" value="scale-up" />
+<string name="MiximageBoxSize" value="medium" />
+<string name="MiximagePhysicalMediaSize" value="medium" />
+<string name="MiximageResolution" value="1280x960" />
+<string name="MiximageScreenshotScaling" value="sharp" />
+<string name="ROMDirectory" value="~/retrodeck/roms/">
+<string name="SaveGamelistsMode" value="always" />
+<string name="Scraper" value="screenscraper" />
+<string name="ScraperLanguage" value="en" />
+<string name="ScraperPasswordScreenScraper" value="" />
+<string name="ScraperRegion" value="eu" />
+<string name="ScraperUsernameScreenScraper" value="" />
+<string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
+<string name="ScreensaverType" value="video" />
+<string name="StartupSystem" value="" />
+<string name="ThemeSet" value="rbsimple-DE" />
+<string name="TransitionStyle" value="fade" />
+<string name="UIMode" value="full" />
+<string name="UIMode_passkey" value="uuddlrlrba" />

retroarch.cfg

@@ -258,6 +258,18 @@ input_pause_toggle_axis = "nul"
 input_pause_toggle_btn = "nul"
 input_pause_toggle_mbtn = "nul"
 input_player1_analog_dpad_mode = "1"
+input_player1_a = "x"
+input_player1_b = "z"
+input_player1_y = "a"
+input_player1_x = "s"
+input_player1_start = "enter"
+input_player1_select = "rshift"
+input_player1_l = "q"
+input_player1_r = "w"
+input_player1_left = "left"
+input_player1_right = "right"
+input_player1_up = "up"
+input_player1_down = "down"
 input_poll_type_behavior = "2"
 input_recording_toggle = "nul"
 input_recording_toggle_axis = "nul"
@@ -360,7 +372,7 @@ memory_show = "false"
 memory_update_interval = "256"
 menu_battery_level_enable = "true"
 menu_core_enable = "true"
-menu_driver = "xmb"
+menu_driver = "ozone"
 menu_dynamic_wallpaper_enable = "false"
 menu_enable_widgets = "true"
 menu_font_color_blue = "255"