Merge branch 'cooker-0.5.2b'

.github/workflows/flathub_push_main.yml

@@ -38,8 +38,7 @@ jobs:
           #sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
 
           cd $gits_folder/flathub
-
+          git checkout master
-          git checkout -b $relname
 
           git rm -rf *
           git clean -fxd # restroing git index
@@ -73,14 +72,9 @@ jobs:
 
           sed -i "s#__SHA__#$sha#g" net.retrodeck.retrodeck.yml
 
-          echo -e "Resulting manifest:\n"
-          cat net.retrodeck.retrodeck.yml
-
           git config --global user.name "${{ secrets.GITNAME }}"
           git config --global user.email "${{ secrets.GITMAIL }}"
 
           git add *
           git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch"
-
+          git push --force https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master
-          git remote -v
-          git push https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git $relname

.github/workflows/main-selfhosted.yml

@@ -42,14 +42,13 @@ jobs:
           org.freedesktop.Sdk.Extension.llvm13 \
           org.freedesktop.Sdk.Extension.dotnet6/x86_64/21.08
 
-      # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
       - name: Build flatpak
         run: |
-          flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
 
       - name: Create Artifact for flathub
         run: | 
-          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
+          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-main .
           hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz))
           echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha
           mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }}
@@ -57,17 +56,11 @@ jobs:
 
       - name: Create Bundle
         run: |
-          flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
           flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 
-      - name: Read version from version file
-        id: version
-        run: echo "##[set-output name=version;]$(cat $(find . -name version))"
-
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
         with:
-          #tag: "${{ steps.version.outputs.version }}"
           tag: "${{ steps.generating_buildid.outputs.build-id }}"
           body: |
             # Release Notes

net.retrodeck.retrodeck.appdata.xml

@@ -69,6 +69,18 @@
 
 <releases>
 
+<release version="0.5.2b" date="2022-10-13">
+    <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.2b</url>
+    <description>
+       <ul>
+          <li>VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.</li>
+          <li>Fixed Citra save migration folder</li>
+          <li>Fixed a bug where the videos were not played correctly in some cases</li>
+          <li>Fixed the Rewind tool</li>
+      </ul>
+    </description>
+</release>
+
 <release version="0.5.1b" date="2022-10-12">
     <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.1b</url>
     <description>
@@ -386,4 +398,4 @@
     </release>
 	
 	</releases>
-</component>
+</component>

net.retrodeck.retrodeck.yml

@@ -64,11 +64,11 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   # 
   # UPDATE STEPS FOR MAIN:
-  # [X] Update the VERSION variable
+  # [ ] Update the VERSION variable
-  # [X] Update the appdata.xml with the version number and notes
+  # [ ] Update the appdata.xml with the version number and notes
-  # [X] change branch into main in version-initialization (first one)
+  # [ ] change branch into main in version-initialization (first one)
-  # [X] change branch into main in retrodeck module (last one)
+  # [ ] change branch into main in retrodeck module (last one)
-  # [X] if header (before modules) was edited, edit it even in flathub.yml
+  # [ ] if header (before modules) was edited, edit it even in flathub.yml
   #
   - name: version-initialization
     buildsystem: simple
@@ -76,7 +76,7 @@ modules:
       - |
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="0.5.1b"
+        VERSION="0.5.2b"
         if [[ $VERSION == *"cooker"* ]];
         then
           VERSION="cooker-"$(git rev-parse --short HEAD)
@@ -232,7 +232,7 @@ modules:
     sources:
       - type: git
         url: https://gitlab.com/es-de/emulationstation-de
-        branch: 18b2ee412e1bb3ea35ffd6e680ebf1dacda8e0ff
+        branch: f8d782f1f3b1fba8a119b793edd01f37e0258953
       - type: shell
         commands:
           - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp

retrodeck.sh

@@ -22,7 +22,7 @@ fi
 
 dir_prep() {
     # This script is creating a symlink preserving old folder contents and moving them in the new one
-    
+
     # Call me with:
     # dir prep "real dir" "symlink location"
     real="$1"
@@ -43,7 +43,7 @@ dir_prep() {
       echo "$real not found, creating it" #DEBUG
       mkdir -pv "$real"
     fi
-    
+
     # creating the symlink
     echo "linking $real in $symlink" #DEBUG
     mkdir -pv "$(dirname "$symlink")" # creating the full path except the last folder
@@ -72,7 +72,7 @@ tools_init() {
 
 standalones_init() {
     # This script is configuring the standalone emulators with the default files present in emuconfigs folder
-    
+
     echo "----------------------"
     echo "Initializing standalone emulators"
     echo "----------------------"
@@ -279,7 +279,7 @@ post_update() {
     dir_prep "$media_folder" "/var/config/emulationstation/.emulationstation/downloaded_media"
     dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes"
     mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions
-    
+
 
     # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed
     cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml
@@ -292,6 +292,11 @@ post_update() {
     mv -fv /var/config/PCSX2/sstates/* $rdhome/states/ps2/pcsx2
     mv -fv /var/config/PCSX2/memcards/* $rdhome/saves/ps2/memcards
 
+    # Moving Citra saves from legacy location to 0.5.0b structure
+
+    mv -fv $rdhome/saves/Citra/* $rdhome/saves/n3ds/citra
+    rmdir $rdhome/saves/Citra # Old folder cleanup
+
     versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves
 
     if [[ $(sed -e "s/\.//g" <<< $hard_version) > $(sed -e "s/\.//g" <<< $versionwheresaveschanged) ]] && [[ ! $(sed -e "s/\.//g" <<< $hard_version) == $(sed -e "s/\.//g" <<< $version) ]]; then # Check if user is upgrading from the version where save organization was changed. Try not to reuse this, it things 0.4.5b is newer than 0.4.5
@@ -387,7 +392,7 @@ post_update() {
             [[ -n $found ]] && movefile $j $i || echo "ERROR: No ROM match found for state file" $i | sed -e 's/\^/ /g' >> $migration_logfile # If a match is found, run movefile() otherwise warn user of stranded state file
         done
 
-        ) | 
+        ) |
         zenity --progress \
         --icon-name=net.retrodeck.retrodeck \
         --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
@@ -433,7 +438,7 @@ browse(){
   path_selected=false
       while [ $path_selected == false ]
       do
-        sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)"  
+        sdcard="$(zenity --file-selection --title="Choose retrodeck folder location" --directory)"
         echo "Path choosed: $sdcard, answer=$?"
         zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
         --cancel-label="No" \
@@ -549,7 +554,7 @@ finit() {
     rm -rfv /var/config/emulationstation/
     rm -rfv /var/config/retrodeck/tools/
     mkdir -pv /var/config/emulationstation/
-    
+
     # Initializing ES-DE
     # TODO: after the next update of ES-DE this will not be needed - let's test it
     emulationstation --home /var/config/emulationstation --create-system-dirs
@@ -660,7 +665,7 @@ then
   #conf_init             # Initializing/reading the config file (sourced from global.sh)
 
   # ...but the version doesn't match with the config file
-  if [ "$hard_version" != "$version" ]; 
+  if [ "$hard_version" != "$version" ];
   then
       echo "Config file's version is $version but the actual version is $hard_version"
       post_update       # Executing post update script
@@ -671,7 +676,7 @@ then
 
 # Else, LOCKFILE IS NOT EXISTING (WAS REMOVED)
 # if the lock file doesn't exist at all means that it's a fresh install or a triggered reset
-else 
+else
   echo "Lockfile not found"
   #conf_init         # Initializing/reading the config file (sourced from global.sh)
   finit             # Executing First/Force init

tools/rewind.sh

@@ -9,13 +9,13 @@ zenity --question \
 
 if [ $? == 0 ] #yes, enable
 then
-	sed -i 's%rewind_enable = .*%rewind_enable = "true"' $racfg
+	sed -i 's%rewind_enable = .*%rewind_enable = "true"%' $racfg
 	zenity --info \
 		--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
 		--title "RetroDECK" \
 		--text="Rewind enabled\!\nYou can check on Libretro docs to see which cores supports this function."
 else # no, disable
-	sed -i 's%rewind_enable = .*%rewind_enable = "false"' $racfg
+	sed -i 's%rewind_enable = .*%rewind_enable = "false"%' $racfg
 	zenity --info \
 		--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
 		--title "RetroDECK" \