From 74d93ff904ddda894b173221ab50cba868515936 Mon Sep 17 00:00:00 2001
From: Vincent Riquer <vincent+gitorious@riquer.fr>
Date: Fri, 5 Apr 2013 13:52:27 +0200
Subject: [PATCH] facelift

---
 atom | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/atom b/atom
index 33ab3ab..55406dd 100755
--- a/atom
+++ b/atom
@@ -42,6 +42,8 @@ declare -r				\
 					\
 	oldIFS="$IFS"
 
+LC_ALL=C
+
 source $SHAREDIR/id3genres
 
 shopt -s extglob
@@ -2142,16 +2144,12 @@ echo -e "\rCreated ${count:-0} tasks for $filecount files (${copies:-0} immediat
 concurrency=$(( maxload / 2 ))
 (( concurrency )) || concurrency=1
 active=0
-#set -x
-for (( i=0 ; i < concurrency ; i++ ))
-do
-	master
-done
 concurrencychange=$(date +%s)
 starttime=$concurrencychange
 taskcount=$count
+remaining=$taskcount
 failed=0
-while (( ${#workers[@]} ))
+while (( remaining ))
 do
 	if read -n 1 -t 0.1 userinput
 	then
@@ -2218,19 +2216,25 @@ do
 		avgdsec=${avgduration:0:-3}
 		avgdmsec=${avgduration#$avgdsec}
 	fi
-	dran=$(printf %${#taskcount}i ${ran:-0})
-	rtime=$(
-		printf	'%2id %2ih%02im%02is'	\
-			${days:-0}		\
-			${hours:-0}		\
-			${minutes:-0}		\
-			${seconds:-0}
-	)
-	percent=$(printf %3i $((ran * 100 / taskcount)))
-	echo -en "\rL: $humanload/$maxload"			\
-	"W: $active/$concurrency"				\
-	"T: ${dran}/$taskcount (F:$failed) $percent% $rtime"	\
-	"(A: ${avgdsec:--}.${avgdmsec:--}s/task)"
+	fmtload='L: %2.1f/%i'
+	fmtworkers='W: %i/%i'
+	fmtprogress="T:%${#taskcount}i/%i (F:%i) %3i%%"
+	fmttime='%2id %2ih%02im%02is (A:%2.1fs/task)'
+	printf							\
+		"\r$fmtload $fmtworkers $fmtprogress $fmttime"	\
+		$humanload					\
+		$maxload					\
+		${active:-0}					\
+		${concurrency:-0}				\
+		${ran:-0}					\
+		${taskcount:-0}					\
+		${failed:-0}					\
+		$(( ran * 100 / taskcount ))			\
+		${days:-0}					\
+		${hours:-0}					\
+		${minutes:-0}					\
+		${seconds:-0}   				\
+		${avgdsec:-0}.${avgdmsec:-0}
 done
 unset count