Compare commits

..

No commits in common. "33120e8be3e54a50af7e81124a5982ebaec8fac6" and "16f0d4233558642f0611804374d15aec39b3c681" have entirely different histories.

2 changed files with 2 additions and 11 deletions

11
atom
View File

@ -353,7 +353,6 @@ updateMimes
removeObsoleteFiles removeObsoleteFiles
(( cron )) || echo -n 'Gathering files for cleaning...'
echo ' echo '
SELECT COUNT(id) SELECT COUNT(id)
FROM destination_files FROM destination_files
@ -401,7 +400,7 @@ do
then then
echo 'COMMIT;BEGIN TRANSACTION;' >&3 echo 'COMMIT;BEGIN TRANSACTION;' >&3
fi fi
(( cron )) || echo -en "\rClean obsolete data: $(((deleted+removed)*100/removecount))%\033[K" (( cron )) || echo -en "\rClean obsolete data: $(((deleted+removed)*100/removecount))%"
done done
echo 'COMMIT;' >&3 echo 'COMMIT;' >&3
(( cron )) || echo -n $'\r' (( cron )) || echo -n $'\r'
@ -697,15 +696,8 @@ starttime=$concurrencychange
taskcount=$count taskcount=$count
remaining=$taskcount remaining=$taskcount
failed=0 failed=0
echo 'BEGIN TRANSACTION;' >&3
committime=$(date +%s)
while (( (remaining || ${#workers[@]}) && ! quit )) while (( (remaining || ${#workers[@]}) && ! quit ))
do do
if (( $(date +%s) - committime >= 60 ))
then
echo $'COMMIT;\nBEGIN TRANSACTION;' >&3
committime=$(date +%s)
fi
read humanload garbage < /proc/loadavg read humanload garbage < /proc/loadavg
load=${humanload%.*} load=${humanload%.*}
if (( fixed_workers )) if (( fixed_workers ))
@ -806,7 +798,6 @@ do
fi fi
fi fi
done done
echo 'COMMIT;' >&3
unset count unset count
endtime=$(date +%s) endtime=$(date +%s)

View File

@ -60,6 +60,6 @@ getFiles() {
) )
echo 'COMMIT;' >&3 echo 'COMMIT;' >&3
(( cron )) || echo -n $'\r' (( cron )) || echo -n $'\r'
echo "${count:-0} files found, ${new:=0} new or changed."$'\033[K' echo "${count:-0} files found, ${new:=0} new or changed."
unset count unset count
} }