moonq/q-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timing only if files counted

Browse Source
This commit is contained in:
Ville Rantanen
2020-08-25 08:35:26 +03:00
parent 2db892dd0f
commit babb593ce4
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
files/rm-progress
View File

@@ -49,15 +49,17 @@ function deletefiles() {
printf -v timedone "%02d:%02d:%02d" \ printf -v timedone "%02d:%02d:%02d" \
$(($done/3600)) $(($done%3600/60)) $(($done%60)) $(($done/3600)) $(($done%3600/60)) $(($done%60))
fi fi
if [[ $(( $SECONDS - $left_update )) -ge 10 ]]; then if [[ $files -ne 0 ]]; then
left_update=$SECONDS if [[ $(( $SECONDS - $left_update )) -ge 10 ]]; then
left=$(( ($files - $i) * $SECONDS / $i )) left_update=$SECONDS
left_live=$left left=$(( ($files - $i) * $SECONDS / $i ))
else left_live=$left
left_live=$(( $left - $SECONDS + $left_update )) else
fi left_live=$(( $left - $SECONDS + $left_update ))
if [[ -n "$left" ]]; then fi
printf -v timeleft "%02d:%02d:%02d" $(($left_live/3600)) $(($left_live%3600/60)) $(($left_live%60)) if [[ -n "$left" ]]; then
printf -v timeleft "%02d:%02d:%02d" $(($left_live/3600)) $(($left_live%3600/60)) $(($left_live%60))
fi
fi fi
printf "\r%s %s %${filespad}d/%${filespad}d %2d%% %s\033[0K" \ printf "\r%s %s %${filespad}d/%${filespad}d %2d%% %s\033[0K" \
"$timedone" "$timeleft" "$i" "$files" "$percent" "$line" "$timedone" "$timeleft" "$i" "$files" "$percent" "$line"
@@ -69,6 +71,8 @@ function deletefiles() {
$RMCOMMAND $RMFORCE "$line" $RMCOMMAND $RMFORCE "$line"
fi fi
done < <(find "$@" \( -type f -or -type l \) -print0) done < <(find "$@" \( -type f -or -type l \) -print0)
printf "\r%s %s %${filespad}d/%${filespad}d %2d%%" \
"$timedone" "$timeleft" "$i" "$files" "100"
printf "\n" printf "\n"
} }
function listfolders() { function listfolders() {