remove code duplication for progress spinner

This commit is contained in:
Vincent Riquer 2013-03-14 13:18:01 +01:00
parent 3f0f985409
commit 58439c61fe

37
atom
View File

@ -585,6 +585,15 @@ createDestinations() {
done done
} }
progressSpin() {
case $(( ++count % 40 )) in
0) echo -ne '\b|' ;;
10) echo -ne '\b/' ;;
20) echo -en '\b-' ;;
30) echo -ne '\b\\' ;;
*) ;;
esac
}
getFiles() { getFiles() {
scantime=$(date +%s) scantime=$(date +%s)
for prune_expression in "${skippeddirectories[@]}" for prune_expression in "${skippeddirectories[@]}"
@ -629,18 +638,12 @@ getFiles() {
filename = $filename filename = $filename
EOWhere EOWhere
fi fi
case $(( ++count % 40 )) in progressSpin
0) echo -ne '\b|' ;;
10) echo -ne '\b/' ;;
20) echo -en '\b-' ;;
30) echo -ne '\b\\' ;;
*) ;;
esac
done < <( done < <(
find "$sourcepath" $prunes -type f -printf "%T@ %s %P\n" find "$sourcepath" $prunes -type f -printf "%T@ %s %P\n"
) )
echo 'COMMIT;' >&3 echo 'COMMIT;' >&3
echo -e "\r$count files found, ${new:=0} new or changed." echo -e "\r${count:-0} files found, ${new:=0} new or changed."
unset count unset count
} }
@ -1166,7 +1169,7 @@ do
fi fi
done done
echo 'COMMIT;' >&3 echo 'COMMIT;' >&3
echo -e "\rRead tags from $count files." echo -e "\rRead tags from ${count:-0} files."
unset count tagfiles unset count tagfiles
echo ' echo '
@ -1292,13 +1295,7 @@ do
status 0 status 0
EOInsert EOInsert
) )
case $(( ++count % 40 )) in progressSpin
0) echo -ne '\b|' ;;
10) echo -ne '\b/' ;;
20) echo -en '\b-' ;;
30) echo -ne '\b\\' ;;
*) ;;
esac
fi fi
if (( sox_needed )) if (( sox_needed ))
then then
@ -1315,13 +1312,7 @@ do
status 0 status 0
EOInsert EOInsert
) )
case $(( ++count % 40 )) in progressSpin
0) echo -ne '\b|' ;;
10) echo -ne '\b/' ;;
20) echo -en '\b-' ;;
30) echo -ne '\b\\' ;;
*) ;;
esac
fi fi
fi fi
unset \ unset \