# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304557930 -7200
# Node ID 01dfc1ed1e0eb1b633da4d7d4009b8a3eaf16147
# Parent  fa9a36a8c1f4bf5fc959a00bae767584ecf46aea
Better CGI interface and a bunch a small improvment

diff -r fa9a36a8c1f4 -r 01dfc1ed1e0e cooker
--- a/cooker	Thu May 05 00:06:01 2011 +0200
+++ b/cooker	Thu May 05 03:12:10 2011 +0200
@@ -18,7 +18,7 @@
 commits="$CACHE/commits"
 cooklist="$CACHE/cooklist"
 cookorder="$CACHE/cookorder"
-status="$CACHE/status"
+command="$CACHE/command"
 blocked="$CACHE/blocked"
 broken="$CACHE/broken"
 
@@ -56,18 +56,29 @@
 		sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity
 }
 
+# Some message goes in activity but log verbose output when checking for commits
+# into a log file.
+log_commits() {
+	tee -a $LOGS/commits.log
+}
+
 # Log broken packages
 broken() {
 	echo "$pkg" >> $broken
 }
 
+# Clean up after cook sucess.
+clean_status() {
+	rm -f $command && touch $command
+}
+
 # Scan packages deps an fill up cookorder list.
 cook_order_scan() {
 	touch $cooklist $cookorder
 	for pkg in $(cat $cooklist)
 	do
 		unset DEPENDS BUILD_DEPENDS
-		. $WOK/$pkg/receipt
+		. $wok/$pkg/receipt
 		for dep in $DEPENDS $BUILD_DEPENDS
 		do
 			if grep -q "^$dep$" $cooklist; then
@@ -125,7 +136,7 @@
 	for pkg in $(cat $cooklist)
 	do
 		unset WANTED
-		. $WOK/$pkg/receipt
+		. $wok/$pkg/receipt
 		if [ "$WANTED" ]; then
 			echo "$pkg: $WANTED"
 			sed -i -e "/^$pkg$/"d  \
@@ -150,19 +161,39 @@
 	separator && echo ""
 }
 
+# Remove blocked (faster this way than grepping before).
+strip_blocked() {
+	for pkg in $(cat $blocked)
+	do
+		sed -i /^${pkg}$/d $cooklist
+	done && sed -i /^$/d $cooklist
+}
+
 # Uses in default mode and with all cmd.
 cook_commits() {
 	if [ -s "$commits" ]; then
 		for pkg in $(cat $commits)
 		do
 			echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
-			echo "cook:$pkg" > $status
+			echo "cook:$pkg" > $command
 			cook $pkg || broken
 			sed -i /^${pkg}$/d $commits
 		done
 	fi
 }
 
+# Cook all package in a cooklist.
+cook_list() {
+	for pkg in $(cat $cooklist)
+	do
+		if [ ! -d "$wok/$pkg/install" ]; then
+			echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
+			cook $pkg || broken
+			sed -i /^${pkg}$/d $cooklist
+		fi
+	done
+}
+
 #
 # Commands
 #
@@ -186,17 +217,20 @@
 		# Directories and files
 		echo "mkdir's and touch files in: $SLITAZ"
 		mkdir -p $PKGS $LOGS $CACHE $SRC
-		for f in $activity $blocked $broken $commits $cooklist $status
+		for f in $activity $blocked $broken $commits $cooklist $command
 		do
 			touch $f
 		done
-		hg clone $WOK_URL ${wok}-hg
+		hg clone $WOK_URL ${wok}-hg || exit 1
 		hg clone $FLAVORS_URL flavors
 		cp -a ${wok}-hg $wok
 		separator && echo "" ;;
 	--reverse=*)
 		# Cook all reverse dependencies for a packages. This command let us
 		# control the Cooker manually for commit that will cook a lot of packages.
+		#
+		# Use hg commit ? Ex: hg commit -m "Message bla bla | cooker:--reverse"
+		#
 		pkg=${1#--reverse=}
 		[ ! -d "$wok/$pkg" ] && echo "No package $2 found." && exit 0
 		cd $wok
@@ -209,28 +243,27 @@
 	--pkg=*)
 		# Same as 'cook pkg' but with log for web interface.
 		pkg=${1#--pkg=}
+		echo "cooker:$1" > $command
 		echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
 		cook $pkg || broken ;;
 	--cat=*)
 		# Cook all packages of a category.
-		rm -f $cooklist && touch $cooklist
-		cat=${1#--cat=} && cd $WOK
+		cat=${1#--cat=}
+		echo "cooker:$1" > $command
+		rm -f $cooklist && touch $cooklist && cd $wok
 		for pkg in *
 		do
 			unset CATEGORY && . $pkg/receipt
 			[ "$CATEGORY" == "$cat" ] && echo $pkg >> $cooklist
 		done
-		cook_order | tee $LOGS/cooker-order.log
-		for pkg in $(cat $cooklist)
-		do
-			echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
-			cook $pkg || broken
-		done
-		;;
+		strip_blocked
+		cook_order | tee $LOGS/cookorder.log
+		cook_list
+		clean_status ;;
 	--all)
 		# Try to build all unbuilt packages except blocked's.
+		echo "cooker:--all" > $command
 		rm -f $cooklist && touch $cooklist
-		
 		echo "" && cd $wok
 		echo "Cooker cooklist"
 		separator
@@ -244,54 +277,47 @@
 				echo $pkg >> $cooklist
 		done
 
-		# Remove blocked (faster this way than grepping before).
-		for pkg in $(cat $blocked)
-		do
-			sed -i /^${pkg}$/d $cooklist
-		done && sed -i /^$/d $cooklist
-
-		echo "Packages to cook: $(cat $cooklist | wc -l)"
+		strip_blocked
 		echo "Packages to cook: $(cat $cooklist | wc -l)" | log
-		cook_order | tee $LOGS/cooker-order.log
-
-		# Clean DB files
-		echo "Cleaning cached DB files" | log
-		#sed /^$/ $cooklist > $cooklist.tmp
-		#uniq $cooklist.tmp > $cooklist && rm -f $cooklist.tmp
-		#echo "Cooklist: $(cat $cooklist | wc -l)"
-		echo "" ;;
+		cook_order | tee $LOGS/cookorder.log
+		cook_list
+		clean_status ;;
 	*)
 		# Default is to cook all commits.
 		[ "$1" ] && usage
 		cooklist=$CACHE/commits
-		echo -e "\nChecking for commits"
-		separator
+		rm -f $LOGS/commits.log
+		echo ""
+		echo "Checking for commits" | log_commits
+		separator | tee -a $LOGS/commits.log
 		
 		# Get revisions.
-		cd $wok || ( echo "" && exit 1 )
+		cd $wok || ( echo "No wok found: $wok" && exit 1 )
 		cur=$(hg head --template '{rev}\n')
 		echo "Updating Hg wok: ${wok}-hg" | log
-		echo "hg:pull" > $status
-		cd ${wok}-hg && hg pull -u
+		echo "hg:pull" > $command
+		cd ${wok}-hg && hg pull -u | log_commits
 		new=$(hg head --template '{rev}\n')
-		echo "Hg wok revision : $cur"
-		echo "Pulled revision : $new"
-	
+		echo "Hg wok revision : $cur" | log_commits
+		echo "Pulled revision : $new" | log_commits
+		
 		# Sync build wok with rsync so we dont take care about removing old
 		# files as before.
 		if [ "$new" -gt "$cur" ]; then
 			echo "Changes found from: $cur to $new" | log
-			echo "Syncing build work with Hg wok..."
-			cp -a ${wok}-hg/* $wok
-			cp -a ${wok}-hg/.hg $wok
+			echo "Syncing build wok with Hg wok..."
+			#cp -a ${wok}-hg/* $wok
+			#cp -a ${wok}-hg/.hg $wok
+			rsync -r -t -c -l -u -D -E --delete ${wok}-hg/ $wok/ | log_commits
 		else
 			echo "No revision changes: $cur vs $new" | log
-			separator && echo "" && exit 0
+			separator | log_commits
+			clean_status && echo "" && exit 0
 		fi
 		
 		# Get modifications
 		cd ${wok}-hg
-		cur=$(($cur+1))
+		cur=$(($cur + 1))
 		msg="from revision $cur to $new"
 		[ "$new" == "$cur" ] && msg="revision: $new"
 		echo -e "Will cook $msg\n"
@@ -299,6 +325,7 @@
 		for rev in $(seq $cur $new); do
 			log=$(hg log --rev=$rev --template "{files}\n" | cut -d "/" -f 1)
 			for file in $log; do
+				echo "Commited file: $file" log_commits
 				echo $file >> $commits.tmp
 			done
 		done
@@ -306,10 +333,12 @@
 		# Keep previews commit and discard duplicate lines
 		cat $commits $commits.tmp | sed /"^$"/d > $commits.new
 		uniq $commits.new > $commits && rm $commits.*
-		echo "Packages to cook: $(cat $commits | wc -l)"
-		cook_order | tee $LOGS/cooker-order.log
+		echo "Packages to cook: $(cat $commits | wc -l)" | log
+		separator && echo "" | log_commits
+		strip_blocked
+		cook_order | tee $LOGS/cookorder.log
 		cook_commits
-		echo "" > $status ;;
+		clean_status ;;
 esac
 
 exit 0
diff -r fa9a36a8c1f4 -r 01dfc1ed1e0e web/cooker.cgi
--- a/web/cooker.cgi	Thu May 05 00:06:01 2011 +0200
+++ b/web/cooker.cgi	Thu May 05 03:12:10 2011 +0200
@@ -16,7 +16,7 @@
 commits="$CACHE/commits"
 cooklist="$CACHE/cooklist"
 cookorder="$CACHE/cookorder"
-status="$CACHE/status"
+command="$CACHE/command"
 blocked="$CACHE/blocked"
 broken="$CACHE/broken"
 
@@ -73,8 +73,13 @@
 	log=*)
 		pkg=${QUERY_STRING#log=}
 		if [ -f "$LOGS/$pkg.log" ]; then
+			echo "<h2>Log for: $pkg</h2>"
+			if [ "$pkg" == "commits" ]; then
+				echo '<pre>' && cat $LOGS/$pkg.log | syntax_highlighter
+				echo '</pre>' && exit 0
+			fi
 			echo '<pre>'
-			if grep -q "cook:$pkg$" $status; then
+			if grep -q "cook:$pkg$" $command; then
 				echo "$pkg currently cooking"
 			fi
 			grep -A 8 "Summary" $LOGS/$pkg.log | sed /^$/d | syntax_highlighter
@@ -103,6 +108,11 @@
 Broken packages  : $(cat $broken | wc -l)
 </pre>
 
+<div>
+Latest logs: <a href="cooker.cgi?log=cookorder">cookorder</a>
+<a href="cooker.cgi?log=commits">commits</a>
+</div>
+
 <h2>Activity</h2>
 <pre>
 $(tac $CACHE/activity | sed s"#^\([^']* : \)#<span class='span-date'>\0</span>#"g)
@@ -118,6 +128,11 @@
 $(cat $broken | sed s"#^[^']*#<a href='cooker.cgi?log=\0'>\0</a>#"g)
 </pre>
 
+<h2>Bloked</h2>
+<pre>
+$(cat $blocked | sed s"#^[^']*#<a href='cooker.cgi?log=\0'>\0</a>#"g)
+</pre>
+
 <h2>Latest cook</h2>
 <pre>
 $(list_packages | sed s"#^\([^']* \)#<span class='span-date'>\0</span>#"g)