archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1816 from maxengel/cloud_sync-display_progress

Browse Source 
Cloud sync scripts: show progress and rclone version bump
This commit is contained in:
spycat88
2025-09-03 08:08:15 +01:00
committed by GitHub
parent 883da8b208 26de84b84f
commit d3ad06c8ef
3 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/ROCKNIX/packages/network/rclone/package.mk
View File

@@ -4,7 +4,7 @@
# Copyright (C) 2025 ROCKNIX Team (https://github.com/ROCKNIX)
PKG_NAME="rclone"
PKG_VERSION="1.70.3"
PKG_VERSION="1.71.0"
PKG_DEPENDS_TARGET="toolchain fuse rsync"
PKG_LONGDESC="rsync for cloud storage"
PKG_TOOLCHAIN="manual"

36
projects/ROCKNIX/packages/network/rclone/sources/cloud_backup
View File

@@ -313,27 +313,23 @@ execute_rclone_with_error_handling() {
log_message "About to execute: rclone ${method} ${extra_opts[*]} ${source} ${dest}" "false"
# Create a temporary script to capture both stdout and stderr
local temp_script="/tmp/rclone_exec_$$"
cat > "$temp_script" << EOF
#!/bin/bash
rclone ${method} ${extra_opts[*]} "${source}" "${dest}" 2>&1
echo "RCLONE_EXIT_CODE:\$?"
EOF
chmod +x "$temp_script"
# Use a temporary file to capture stderr while allowing stdout (progress) to display
local stderr_file="/tmp/rclone_stderr_$$"
# Execute and capture output
local output
output=$("$temp_script")
local rclone_exit_code=$(echo "$output" | grep "RCLONE_EXIT_CODE:" | cut -d: -f2)
# Execute rclone with real-time progress display
# stdout goes to terminal (shows progress), stderr goes to temp file for logging
rclone "${method}" "${extra_opts[@]}" "${source}" "${dest}" 2>"$stderr_file"
local rclone_exit_code=$?
# Log any stderr output for debugging
if [ -s "$stderr_file" ]; then
while IFS= read -r line; do
log_message "rclone stderr: $line" "false"
done < "$stderr_file"
fi
# Clean up
rm -f "$temp_script"
# Log the full output for debugging
echo "$output" | grep -v "RCLONE_EXIT_CODE:" | while IFS= read -r line; do
log_message "rclone: $line" "false"
done
rm -f "$stderr_file"
return $rclone_exit_code
}
@@ -381,7 +377,7 @@ backup_game_saves() {
# Add debug logging if LOG_LEVEL is INFO
if [ "${LOG_LEVEL}" == "INFO" ]; then
rclone_debug="--log-level INFO"
rclone_debug="--log-level"
fi
# Build the complete options array
@@ -398,7 +394,7 @@ backup_game_saves() {
# Add debug logging if enabled
if [ -n "$rclone_debug" ]; then
all_opts+=("$rclone_debug")
all_opts+=("$rclone_debug" "INFO")
fi
# Add exclusions

44
projects/ROCKNIX/packages/network/rclone/sources/cloud_restore
View File

@@ -378,27 +378,23 @@ execute_rclone_with_error_handling() {
log_message "About to execute: rclone ${method} ${extra_opts[*]} ${source} ${dest}" "false"
# Create a temporary script to capture both stdout and stderr
local temp_script="/tmp/rclone_exec_$$"
cat > "$temp_script" << EOF
#!/bin/bash
rclone ${method} ${extra_opts[*]} "${source}" "${dest}" 2>&1
echo "RCLONE_EXIT_CODE:\$?"
EOF
chmod +x "$temp_script"
# Use a temporary file to capture stderr while allowing stdout (progress) to display
local stderr_file="/tmp/rclone_stderr_$$"
# Execute and capture output
local output
output=$("$temp_script")
local rclone_exit_code=$(echo "$output" | grep "RCLONE_EXIT_CODE:" | cut -d: -f2)
# Execute rclone with real-time progress display
# stdout goes to terminal (shows progress), stderr goes to temp file for logging
rclone "${method}" "${extra_opts[@]}" "${source}" "${dest}" 2>"$stderr_file"
local rclone_exit_code=$?
# Log any stderr output for debugging
if [ -s "$stderr_file" ]; then
while IFS= read -r line; do
log_message "rclone stderr: $line" "false"
done < "$stderr_file"
fi
# Clean up
rm -f "$temp_script"
# Log the full output for debugging
echo "$output" | grep -v "RCLONE_EXIT_CODE:" | while IFS= read -r line; do
log_message "rclone: $line" "false"
done
rm -f "$stderr_file"
return $rclone_exit_code
}
@@ -435,9 +431,9 @@ restore_game_saves() {
# Add debug logging if LOG_LEVEL is INFO
if [ "${LOG_LEVEL}" == "INFO" ]; then
rclone_debug="--log-level INFO"
rclone_debug="--log-level"
fi
# Build the complete options array
local all_opts=()
if [ ${#filtered_opts[@]} -gt 0 ]; then
@@ -449,13 +445,11 @@ restore_game_saves() {
"--filter-from" "/storage/.config/cloud_sync-rules.txt"
)
fi
# Add debug logging if enabled
if [ -n "$rclone_debug" ]; then
all_opts+=("$rclone_debug")
fi
# Add exclusions
all_opts+=("$rclone_debug" "INFO")
fi # Add exclusions
all_opts+=(
"--exclude=${BACKUPFOLDER}/**"
"--exclude=backups/**"