diff --git a/lib/copy/copyFiles_action b/lib/copy/copyFiles_action index 1caad38..86820cc 100644 --- a/lib/copy/copyFiles_action +++ b/lib/copy/copyFiles_action @@ -1,5 +1,6 @@ #!/bin/bash copyFiles_action() { + echo -n "Copying files... " echo ' SELECT source_files.filename, @@ -27,9 +28,11 @@ copyFiles_action() { read -u4 line done + echo 'BEGIN TRANSACTION;' >&3 for copyfile in "${copyfiles[@]}" do sourcefilename=${copyfile%%|*} + sourcedir=${sourcefilename%/*} rest="${copyfile#*|}|" lastchange=${rest%%|*} rest=${rest#*|} @@ -37,7 +40,6 @@ copyFiles_action() { rest=${rest#*|} destfileid=${rest%%|*} rest=${rest#*|} - sourcedir=${sourcefilename%/*} echo 'SELECT IFNULL( ( SELECT destination_files.filename FROM destination_files @@ -65,13 +67,17 @@ copyFiles_action() { Update destination_files \ filename "$destdir/${sourcefilename##*/}"\ rename_pattern "${destinationrenamepath[$destination]}/${destinationrename[$destination]}:${destinationfat32compat["$destination"]}"\ + last_change $lastchange \ <<-EOWhere id = $destfileid - last_change = $lastchange EOWhere - progressSpin + (( done++ )) fi fi + (( count++ )) + printf '\b\b\b\b%3i%%' $(( (count * 100) / ${#copyfiles[@]} )) done - unset count + echo 'COMMIT;' >&3 + echo -e "\rCopied ${done:-0} of $count files.\033[K" + unset count done }