diff --git a/install.sh b/install.sh index 966a9bb..aa7a71f 100644 --- a/install.sh +++ b/install.sh @@ -3,15 +3,12 @@ ENDPOINT="https://git.sassysalamander.net/wytch/recalbox-savesync/archive/main.tar.gz" cd /recalbox/share/system curl -L -o savesync.tar.gz "$ENDPOINT" - tar -xvf savesync.tar.gz + rm savesync.tar.gz cd recalbox-savesync cp *.ash /recalbox/share/userscripts/ mkdir -p /recalbox/share/system/configs/savesync cp *.conf /recalbox/share/system/configs/savesync/ - -mount -o remount,rw / >/dev/null -curl -L -o /usr/bin/nc https://github.com/therealsaumil/static-arm-bins/raw/refs/heads/master/nc-arm-static -chmod 755 /usr/bin/nc -mount -o remount >/dev/null +cd .. +rm -rf recalbox-savesync diff --git a/savesync[start](permanent).ash b/savesync[start](permanent).ash index d3564a9..ec64fba 100644 --- a/savesync[start](permanent).ash +++ b/savesync[start](permanent).ash @@ -10,68 +10,68 @@ LOG_FILE="/recalbox/share/system/logs/savesync.log" chmod 666 "$PIPE" write_log() { - printf "[%s] %s\n" "$(date '+%Y-%m-%d %H:%M:%S')" "$1" >> "$LOG_FILE" + printf "[%s] %s\n" "$(date '+%Y-%m-%d %H:%M:%S')" "$1" >>"$LOG_FILE" } write_log "--- Daemon Started ---" while true; do - # Read one line from the pipe - if read -r line < "$PIPE"; then - case "$line" in - LOG:*) - write_log "${line#LOG:}" - ;; - EVENT:*) - # Fork the event handling - ( - event_data="${line#EVENT:}" - - # Process the multi-line event data - # We use echo and a pipe to feed the while loop - echo "$event_data" | tr -d '\r' | while IFS="=" read -r key val; do - case "$key" in - "SystemId") sid="$val" ;; - "GamePath") - gp="$val" - sp=$(echo "$val" | sed 's|roms|saves|; s|\.[^.]*$|.srm|') - bp=$(echo "$sp" | sed 's|saves|archives|') - ;; - "Action") act="$val" ;; - "State") - st="$val" + # Read one line from the pipe + if read -r line <"$PIPE"; then + case "$line" in + LOG:*) + write_log "${line#LOG:}" + ;; + EVENT:*) + # Fork the event handling + ( + event_data="${line#EVENT:}" - if [ "$st" = "playing" ] && [ "$act" = "rungame" ]; then - write_log "Sync START: $(basename "$gp")" - - remote_f="$REMOTE_BASE/$sid/$(basename "$sp")" - loc_sz=$(stat -c %s "$sp" 2>/dev/null || echo 0) - rem_sz=$(rclone lsjson "$remote_f" 2>/dev/null | grep -o '"Size":[0-9]*' | cut -d: -f2) - : "${rem_sz:=0}" + # Process the multi-line event data + # We use echo and a pipe to feed the while loop + echo "$event_data" | tr -d '\r' | while IFS="=" read -r key val; do + case "$key" in + "SystemId") sid="$val" ;; + "GamePath") + gp="$val" + sp=$(echo "$val" | sed 's|roms|saves|; s|\.[^.]*$|.srm|') + bp=$(echo "$sp" | sed 's|saves|archives|') + ;; + "Action") act="$val" ;; + "State") + st="$val" - if [ "$loc_sz" -lt "$rem_sz" ]; then - write_log "Cloud save larger ($rem_sz). Restoring..." - mkdir -p "$(dirname "$bp")" - rclone copyto "$remote_f" "$sp" --backup-dir "$(dirname "$bp")" - else - write_log "Local save current. Updating..." - rclone update "$remote_f" "$sp" - fi - - # Signal back to the publisher via MQTT or a second Response Pipe - #mosquitto_pub -t "$RESPONSE_TOPIC" -m "SaveSync=0" 2>/dev/null + if [ "$st" = "playing" ] && [ "$act" = "rungame" ]; then + write_log "Sync START: $(basename "$gp")" - elif [ "$st" = "endgame" ]; then - write_log "Sync END: $(basename "$sp")" - rclone update "$sp" "$REMOTE_BASE/$sid/" - write_log "Final Sync Done." - #mosquitto_pub -t "$RESPONSE_TOPIC" -m "SaveSync=0" 2>/dev/null - fi - ;; - esac - done - ) & - ;; - esac - fi + remote_f="$REMOTE_BASE/$sid/$(basename "$sp")" + loc_sz=$(stat -c %s "$sp" 2>/dev/null || echo 0) + rem_sz=$(rclone lsjson "$remote_f" 2>/dev/null | grep -o '"Size":[0-9]*' | cut -d: -f2) + : "${rem_sz:=0}" + + if [ "$loc_sz" -lt "$rem_sz" ]; then + write_log "Cloud save larger ($rem_sz). Restoring..." + mkdir -p "$(dirname "$bp")" + rclone copyto "$remote_f" "$sp" --backup-dir "$(dirname "$bp")" + else + write_log "Local save current. Updating..." + rclone update "$remote_f" "$sp" + fi + + # Signal back to the publisher via MQTT or a second Response Pipe + #mosquitto_pub -t "$RESPONSE_TOPIC" -m "SaveSync=0" 2>/dev/null + + elif [ "$st" = "endgame" ]; then + write_log "Sync END: $(basename "$sp")" + rclone update "$sp" "$REMOTE_BASE/$sid/" + write_log "Final Sync Done." + #mosquitto_pub -t "$RESPONSE_TOPIC" -m "SaveSync=0" 2>/dev/null + fi + ;; + esac + done + ) & + ;; + esac + fi done