- Introduced Art Book DE as default theme

- Tweaked some retroarch and DE settings
- Updated and integrated startup script

com.xargon.retrodeck.yml

@@ -2,8 +2,7 @@ app-id: com.xargon.retrodeck
 runtime: org.kde.Platform
 runtime-version: '5.15-21.08'
 sdk: org.kde.Sdk
-command: emulationstation
+command: retrodeck.sh
-#command: retroarch #--appendconfig /app/retrodeck/retroarch/.config/retroarch.cfg
 
 finish-args:
    - --socket=x11
@@ -17,7 +16,7 @@ finish-args:
    - --talk-name=org.freedesktop.ScreenSaver
    - --talk-name=org.freedesktop.PowerManagement.Inhibit
    - --talk-name=org.freedesktop.login1
-   - --filesystem=host
+   #- --filesystem=host
    - --filesystem=xdg-run/app/com.discordapp.Discord:create
   # Yuzu
    - --filesystem=home:ro
@@ -143,12 +142,12 @@ modules:
   - name: art-book-next
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/
+      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-de/
-      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/
+      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-de/
     sources:
       - type: git
-        url: https://github.com/anthonycaccese/es-theme-art-book-next.git
+        url: https://github.com/anthonycaccese/art-book-next-de.git
-        branch: eaf73a4eefde22791681c7f430a238fb324bdeaf
+        branch: cba2e914128dd749df53e710b7c1feb9fc7b5cc8
 
 
   # External manifests start
@@ -481,13 +480,21 @@ modules:
         #- 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
+        # Prep the ES-DE and RetroArch config files
         - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
         - cp es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
-      
+        - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml
+        - cp es_systems.xml /app/share/emulationstation/resources/systems/unix/
+        - rm -rf /app/share/emulationstation/resources/systems/unix/es_input.xml
+        - cp es_input.xml /app/share/emulationstation/resources/systems/unix/
+        # These must be put in home folder, managed by retrodeck.sh
         - mkdir -p ${FLATPAK_DEST}/retrodeck/
         - cp es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
+        - cp retrodeck-retroarch.cfg ${FLATPAK_DEST}/retrodeck/retrodeck-retroarch.cfg
 
+        #- find / -iname es_settings.xml #debug
+        #- BREAK #debug
+        
         - cp retrodeck.sh /app/bin/retrodeck.sh
         - chmod +x /app/bin/retrodeck.sh
 
@@ -499,6 +506,12 @@ modules:
         path: es_find_rules.xml
       - type: file
         path: es_settings.xml
+      - type: file
+        path: es_systems.xml
+      - type: file
+        path: es_input.xml
       - type: file
         path: retrodeck.sh
+      - type: file
+        path: retrodeck-retroarch.cfg
     # create desktop entry

es_input.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<inputList>
+	<inputConfig type="keyboard" deviceName="Keyboard" deviceGUID="-1">
+		<input name="a" type="key" id="120" value="1" />
+		<input name="b" type="key" id="122" value="1" />
+		<input name="back" type="key" id="13" value="1" />
+		<input name="down" type="key" id="1073741905" value="1" />
+		<input name="left" type="key" id="1073741904" value="1" />
+		<input name="leftshoulder" type="key" id="119" value="1" />
+		<input name="leftthumbstickclick" type="key" id="111" value="1" />
+		<input name="leftthumbstickdown" type="key" id="107" value="1" />
+		<input name="leftthumbstickleft" type="key" id="106" value="1" />
+		<input name="leftthumbstickright" type="key" id="108" value="1" />
+		<input name="leftthumbstickup" type="key" id="105" value="1" />
+		<input name="lefttrigger" type="key" id="113" value="1" />
+		<input name="right" type="key" id="1073741903" value="1" />
+		<input name="rightshoulder" type="key" id="101" value="1" />
+		<input name="rightthumbstickclick" type="key" id="1073741917" value="1" />
+		<input name="rightthumbstickdown" type="key" id="1073741914" value="1" />
+		<input name="rightthumbstickleft" type="key" id="1073741916" value="1" />
+		<input name="rightthumbstickright" type="key" id="1073741918" value="1" />
+		<input name="rightthumbstickup" type="key" id="1073741920" value="1" />
+		<input name="righttrigger" type="key" id="114" value="1" />
+		<input name="start" type="key" id="1073742053" value="1" />
+		<input name="up" type="key" id="1073741906" value="1" />
+		<input name="x" type="key" id="97" value="1" />
+		<input name="y" type="key" id="115" value="1" />
+	</inputConfig>
+</inputList>

es_settings.xml

@@ -105,7 +105,7 @@
 <string name="MiximagePhysicalMediaSize" value="medium" />
 <string name="MiximageResolution" value="1280x960" />
 <string name="MiximageScreenshotScaling" value="sharp" />
-<string name="ROMDirectory" value="~/retrodeck/roms/">
+<string name="ROMDirectory" value="~/roms" />
 <string name="SaveGamelistsMode" value="always" />
 <string name="Scraper" value="screenscraper" />
 <string name="ScraperLanguage" value="en" />
@@ -115,7 +115,7 @@
 <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="ThemeSet" value="art-book-next-de" />
-<string name="TransitionStyle" value="fade" />
+<string name="TransitionStyle" value="slide" />
 <string name="UIMode" value="full" />
 <string name="UIMode_passkey" value="uuddlrlrba" />

retrodeck.sh

@@ -1,8 +1,31 @@
 #!/bin/bash
 
-# if we got the es_settings.xml means that it's a clean(-ish)/first run
+# if we got the .lock file it means that it's not a first run
-if test -f "/app/retrodeck/es_settings.xml"; then
+if [ ! -f ~/retrodeck/.lock ]
-    mv -f /app/retrodeck/es_settings.xml ~/.emulationstation/es_settings.xml
+then
+    #mkdir -p /tmp/retrodeck_logs/
+    #ln -s /tmp/retrodeck_logs/ ~/retrodeck/logs/
+    #touch ~/retrodeck/logs/retrodeck.log
+    #echo "RetroDECK: .lock file not found, initializing."
+    mkdir -p ~/retrodeck/.emulationstation
+    mkdir -p ~/retrodeck/saves
+    mkdir -p ~/retrodeck/states
+    mkdir -p ~/retrodeck/screenshots
+    mkdir -p /var/config/retroarch/
+    rm -rf ~/retrodeck/.emulationstation/es_settings.xml
+    rm -rf ~/retrodeck/.emulationstation/es_input.xml
+    cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_settings.xml
+    cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_input.xml
+    cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
+    touch ~/retrodeck/.lock
 fi
 
-emulationstation
+#numFields=$(xmlstarlet sel -t -m '//system' -o "." /app/share/emulationstation/resources/systems/unix/es_systems.xml | wc -c)
+#for i in $(seq 1 $numFields); do
+#    system=$(xmlstarlet sel -t -m "//system[$i]" -v "name" /app/share/emulationstation/resources/systems/unix/es_systems.xml)
+#    if test -d ~/retrodeck/roms/${system}; then
+#        mkdir -p ~/retrodeck/roms/${system}
+#    fi
+#done
+
+emulationstation --home ~/retrodeck/