diff --git a/config/retrodeck/retrodeck.cfg b/config/retrodeck/retrodeck.cfg index 99e4c5cd..13a64d41 100644 --- a/config/retrodeck/retrodeck.cfg +++ b/config/retrodeck/retrodeck.cfg @@ -6,6 +6,7 @@ roms_folder=/home/deck/retrodeck/roms saves_folder=/home/deck/retrodeck/saves states_folder=/home/deck/retrodeck/states bios_folder=/home/deck/retrodeck/bios +backups_folder=/home/deck/retrodeck/backups media_folder=/home/deck/retrodeck/ES-DE/downloaded_media themes_folder=/home/deck/retrodeck/ES-DE/themes logs_folder=/home/deck/retrodeck/logs diff --git a/functions/global.sh b/functions/global.sh index 7e8a7292..a8eb2665 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -236,5 +236,6 @@ logs_folder="$rdhome/logs" # The path of the logs folder, here we steamsync_folder="$rdhome/.sync" # Folder containing all the steam sync launchers for SRM steamsync_folder_tmp="$rdhome/.sync-tmp" # Temp folder containing all the steam sync launchers for SRM cheats_folder="$rdhome/cheats" # Folder containing all the cheats for the emulators +backups_folder="$rdhome/backups" # Folder containing all the RetroDECK backups export GLOBAL_SOURCED=true \ No newline at end of file diff --git a/functions/post_update.sh b/functions/post_update.sh index 0fcaef56..47a72469 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -620,16 +620,23 @@ post_update() { # --- ALWAYS EXECUTED IN 0.9.1b --- - log i "Installing the cheats" - + log i "Preparing the cheats for RetroArch..." create_dir "$cheats_folder/retroarch" - create_dir "$cheats_folder/ppsspp" + set_setting_value "$raconf" "cheat_database_path" "$cheats_folder/retroarch" "retroarch" + tar --strip-components=1 -xzf /app/retrodeck/cheats/retroarch.tar.gz -C "$cheats_folder/retroarch" --overwrite && log i "Cheats for RetroArch installed" + + log i "Preparing the cheats for PPSSPP..." + create_dir -d "$cheats_folder/PPSSPP" + dir_prep "$cheats_folder/PPSSPP" "/var/config/ppsspp/PSP/Cheats" + tar -xzf /app/retrodeck/cheats/ppsspp.tar.gz -C "$cheats_folder/PPSSPP" --overwrite && log i "Cheats for PPSSPP installed" + + log i "Preparing the cheats for PCSX2..." create_dir "$cheats_folder/pcsx2" + set_setting_value "$pcsx2conf" "Cheats" "$cheats_folder/pcsx2" "Folders" + tar --strip-components=1 -xzf /app/retrodeck/cheats/pcsx2.tar.gz -C "$cheats_folder/pcsx2" --overwrite && log i "Cheats for PCSX2 installed" - tar -xzf /app/retrodeck/cheats/retroarch.tar.gz -C "$cheats_folder/retroarch" --overwrite && log i "Cheats for RetroArch installed" - tar -xzf /app/retrodeck/cheats/pcsx2.tar.gz -C "$cheats_folder/pcsx2" --overwrite && log i "Cheats for PCSX2 installed" - tar -xzf /app/retrodeck/cheats/ppsspp.tar.gz -C "$cheats_folder/ppsspp" --overwrite && log i "Cheats for PPSSPP installed" - + log i "Preparing the cheats for MAME..." + create_dir "$cheats_folder/mame" set_setting_value "$mameconf" "cheatpath" "$cheats_folder/mame" "mame" unzip -j -o "$config/mame/cheat0264.zip" 'cheat.7z' -d "$cheats_folder/mame" && log i "Cheats for MAME installed" rm -rf /var/data/mame/cheat diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index a9ae4117..8c7cfb8b 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -125,13 +125,13 @@ prepare_component() { dir_prep "$rdhome/logs/retroarch" "/var/config/retroarch/logs" create_dir -d "/var/config/retroarch/shaders/" if [[ -d "$cheats_folder/retroarch" && "$(ls -A $cheats_folder/retroarch)" ]]; then - backup_file="$backup_folder/cheats/retroarch-$(date +%y%m%d).tar.gz" + backup_file="$backups_folder/cheats/retroarch-$(date +%y%m%d).tar.gz" create_dir "$(dirname "$backup_file")" tar -czf "$backup_file" -C "$cheats_folder" retroarch log i "RetroArch cheats backed up to $backup_file" fi create_dir -d "$cheats_folder/retroarch" - tar -xzf /app/retrodeck/cheats/retroarch.tar.gz -C "$cheats_folder/retroarch" --overwrite + tar --strip-components=1 -xzf /app/retrodeck/cheats/retroarch.tar.gz -C "$cheats_folder/retroarch" --overwrite cp -rf /app/share/libretro/shaders /var/config/retroarch/ dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders" cp -fv $config/retroarch/retroarch.cfg /var/config/retroarch/ @@ -144,7 +144,7 @@ prepare_component() { set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" set_setting_value "$raconf" "log_dir" "$logs_folder" "retroarch" set_setting_value "$raconf" "rgui_browser_directory" "$roms_folder" "retroarch" - set_setting_value "$raconf" "cheat_database_path" "$cheats_folder/retroarch" + set_setting_value "$raconf" "cheat_database_path" "$cheats_folder/retroarch" "retroarch" fi # Shared actions @@ -491,15 +491,15 @@ prepare_component() { set_setting_value "$pcsx2conf" "SaveStates" "$states_folder/ps2/pcsx2" "pcsx2" "Folders" set_setting_value "$pcsx2conf" "MemoryCards" "$saves_folder/ps2/pcsx2/memcards" "pcsx2" "Folders" set_setting_value "$pcsx2conf" "RecursivePaths" "$roms_folder/ps2" "pcsx2" "GameList" - set_setting_value "$pcsx2conf" "Cheats" "$cheats_folder/pcsx2" + set_setting_value "$pcsx2conf" "Cheats" "$cheats_folder/pcsx2" "Folders" if [[ -d "$cheats_folder/pcsx2" && "$(ls -A $cheats_folder/pcsx2)" ]]; then - backup_file="$backup_folder/cheats/pcsx2-$(date +%y%m%d).tar.gz" - create_dir "$(dirname "$backup_file")" + backup_file="$backups_folder/cheats/pcsx2-$(date +%y%m%d).tar.gz" + create_dir "$(dirname $backup_file)" tar -czf "$backup_file" -C "$cheats_folder" pcsx2 log i "PCSX2 cheats backed up to $backup_file" fi create_dir -d "$cheats_folder/pcsx2" - tar -xzf /app/retrodeck/cheats/pcsx2.tar.gz -C "$cheats_folder/pcsx2" --overwrite + tar --strip-components=1 -xzf /app/retrodeck/cheats/pcsx2.tar.gz -C "$cheats_folder/pcsx2" --overwrite fi # Shared actions create_dir "$saves_folder/ps2/pcsx2/memcards" @@ -518,6 +518,7 @@ prepare_component() { set_setting_value "$pcsx2conf" "SaveStates" "$states_folder/ps2/pcsx2" "pcsx2" "Folders" set_setting_value "$pcsx2conf" "MemoryCards" "$saves_folder/ps2/pcsx2/memcards" "pcsx2" "Folders" set_setting_value "$pcsx2conf" "RecursivePaths" "$roms_folder/ps2" "pcsx2" "GameList" + set_setting_value "$pcsx2conf" "Cheats" "$cheats_folder/pcsx2" "Folders" dir_prep "$texture_packs_folder/PCSX2" "/var/config/PCSX2/textures" fi fi @@ -553,16 +554,15 @@ prepare_component() { dir_prep "$saves_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/SAVEDATA" dir_prep "$states_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/PPSSPP_STATE" dir_prep "$texture_packs_folder/PPSSPP" "/var/config/ppsspp/PSP/TEXTURES" - + create_dir -d "$cheats_folder/PPSSPP" dir_prep "$cheats_folder/PPSSPP" "/var/config/ppsspp/PSP/Cheats" - if [[ -d "$cheats_folder/ppsspp" && "$(ls -A $cheats_folder/ppsspp)" ]]; then - backup_file="$backup_folder/cheats/ppsspp-$(date +%y%m%d).tar.gz" + if [[ -d "$cheats_folder/PPSSPP" && "$(ls -A $cheats_folder/PPSSPP)" ]]; then + backup_file="$backups_folder/cheats/PPSSPP-$(date +%y%m%d).tar.gz" create_dir "$(dirname "$backup_file")" - tar -czf "$backup_file" -C "$cheats_folder" ppsspp + tar -czf "$backup_file" -C "$cheats_folder" PPSSPP log i "PPSSPP cheats backed up to $backup_file" fi - create_dir -d "$cheats_folder/pcsx2" - tar -xzf /app/retrodeck/cheats/pcsx2.tar.gz -C "$cheats_folder/pcsx2" --overwrite + tar -xzf /app/retrodeck/cheats/ppsspp.tar.gz -C "$cheats_folder/PPSSPP" --overwrite fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands set_setting_value "$ppssppconf" "CurrentDirectory" "$roms_folder/psp" "ppsspp" "General" diff --git a/tools/configurator/scripts/TabTools.gd b/tools/configurator/scripts/TabTools.gd index f5c9ed7d..55508a2d 100644 --- a/tools/configurator/scripts/TabTools.gd +++ b/tools/configurator/scripts/TabTools.gd @@ -6,7 +6,7 @@ func _ready(): add_child(http_request) http_request.request_completed.connect(_on_request_completed) _connect_signals() - #%backup_user_button.text += " - " + class_functions.rdhome + "/backup" + #%backup_user_button.text += " - " + class_functions.rdhome + "/backups" func _connect_signals() -> void: %check_conn_button.pressed.connect(check_internet_connection) @@ -34,7 +34,7 @@ func _run_backup(button: Button) -> void: var parameters = ["backup_retrodeck_userdata"] var run_result = await class_functions.run_thread_command(class_functions.wrapper_command, parameters, true) if run_result["exit_code"] == 0: - button.text = "Backup Complete - " + class_functions.rdhome + "/backup" + button.text = "Backup Complete - " + class_functions.rdhome + "/backups" class_functions.logger("d","User Backup Completed") await class_functions.wait(3.0) button.text = original_txt