cookutils rev 75

Let's have a progress/stat bar for cooked packages
author Christophe Lincoln <pankso@slitaz.org>
date Sat May 07 23:00:41 2011 +0200 (2011-05-07)
parents dad3f6ed300c
children 14a78c701527
files web/cooker.cgi web/style.css
line diff
     1.1 --- a/web/cooker.cgi	Sat May 07 19:46:58 2011 +0200
     1.2 +++ b/web/cooker.cgi	Sat May 07 23:00:41 2011 +0200
     1.3 @@ -167,6 +167,11 @@
     1.4  			echo "<pre>No receipt for: $log</pre>"
     1.5  		fi ;;
     1.6  	*)
     1.7 +		# Main page with summary.
     1.8 +		cooked=$(ls $PKGS/*.tazpkg | wc -l)
     1.9 +		inwok=$(ls $WOK | wc -l)
    1.10 +		div=$(($inwok / 100))
    1.11 +		pct=$(($cooked / $div))
    1.12  		cat << EOT
    1.13  <div style="float: right;">
    1.14  	<form method="get" action="$SCRIPT_NAME">
    1.15 @@ -176,22 +181,29 @@
    1.16  </div>
    1.17  
    1.18  <h2>Summary</h2>
    1.19 +
    1.20 +
    1.21  <pre>
    1.22  Running command  : $([ -s "$command" ] && cat $command || echo "Not running")
    1.23 -Cooked packages  : $(ls $PKGS/*.tazpkg | wc -l)
    1.24 -Packages in wok  : $(ls $WOK | wc -l)
    1.25  Wok revision     : <a href="http://hg.slitaz.org/wok">$(cd $WOK && hg head --template '{rev}\n')</a>
    1.26  Commits to cook  : $(cat $commits | wc -l)
    1.27  Current cooklist : $(cat $cooklist | wc -l)
    1.28  Broken packages  : $(cat $broken | wc -l)
    1.29  </pre>
    1.30  
    1.31 -<div id="info">
    1.32 -	Logs:
    1.33 -	<a class="button" href="cooker.cgi?file=cookorder.log">cookorder</a>
    1.34 -	<a class="button" href="cooker.cgi?file=commits.log">commits</a>
    1.35 +<p>
    1.36 +	Packages: $cooked cooked on $inwok in the wok.
    1.37 +</p>
    1.38 +<div class="pctbar">
    1.39 +	<div class="pct" style="width: ${pct}%;">${pct}%</div>
    1.40  </div>
    1.41  
    1.42 +<p>
    1.43 +	Latest logs:
    1.44 +	<a href="cooker.cgi?file=cookorder.log">cookorder</a>
    1.45 +	<a href="cooker.cgi?file=commits.log">commits</a>
    1.46 +</p>
    1.47 +
    1.48  <h2>Activity</h2>
    1.49  <pre>
    1.50  $(tac $CACHE/activity | head -n 12 | \
     2.1 --- a/web/style.css	Sat May 07 19:46:58 2011 +0200
     2.2 +++ b/web/style.css	Sat May 07 23:00:41 2011 +0200
     2.3 @@ -44,14 +44,11 @@
     2.4  
     2.5  .button {
     2.6  	padding: 2px 4px;
     2.7 -	margin: 0;
     2.8 -	background-color: #f1f1f1;
     2.9 -	border: 1px solid #ddd;
    2.10  	cursor: pointer;
    2.11  	color: #000;
    2.12  }
    2.13  
    2.14 -a.button  {
    2.15 +a.button, .pctbar  {
    2.16  	text-decoration: none;
    2.17  	color: #666;
    2.18  }
    2.19 @@ -61,9 +58,17 @@
    2.20  	border: 1px solid #999;
    2.21  }
    2.22  
    2.23 +.pct { background: #9dff4a; padding: 2px 4px; }
    2.24 +
    2.25 +.button, .pctbar {
    2.26 +	margin: 0;
    2.27 +	background: #f1f1f1;
    2.28 +	border: 1px solid #ddd;
    2.29 +}
    2.30 +
    2.31  /* Round corner */
    2.32  
    2.33 -pre, .button {
    2.34 +pre, .button, .pctbar {
    2.35  	/*-moz-border-radius: 4px;
    2.36  	-webkit-border-radius: 4px; */
    2.37  	border-radius: 4px;