Merge lp:~mvo/archive-index/app-install-mvo into lp:archive-index/app-install

[Michael Vogt]

[Michael Vogt (mvo)]

I played with pngcrush as well but did not manage to get a real reduction of the size:

+ if ! pngcrush $new_name ../icons/$new_name; then
+ echo " pngcrunch!, copying instead"
+ cp $new_name ../icons/

For each converted svg, xpm and all exisiting pngs. I compared the two dirs:

20428 icons
18852 icons-pngcrunch-reduced

That is not really great for the amount of time that pngcrush churns.

[Michael Vogt (mvo)]

I added a resize now for bigger icons to the target size, that gained another megabyte for size 128 and for size 64 brought the uncompressed size down to 14 mb for the icons.

[lp:~mvo/archive-index/app-install-mvo]

7. By Michael Vogt on 2011-08-03

resize all big icons to target size

8. By Michael Vogt on 2011-08-03

utils/package-metadata: set size to 64px, use pngcrush after everything is finished

[Michael Vogt (mvo)]

I added a targetsize of 64px and added pngcrush (does not gain much, but every bit counts) and this brings the size down to 7.8mb compressed with gzip. This is comparable to the old size, but we have 300 icons more :) So all in all I think this is a clear winner now.

[Jjed (jjed)]

Thanks for this. Have merged with a dependency sanity check, will repropose my new-extract branch once I resolve the ardour namespace collision problem.

review: Approve

=== modified file 'postprocess-app-metadata'
--- postprocess-app-metadata	2011-06-29 16:33:50 +0000
+++ postprocess-app-metadata	2011-08-03 18:01:44 +0000
@@ -13,7 +13,10 @@
     Option("-c", "--config-dir", dest="config_dir", default="config/",
            help="directory with ArchiveCache blacklists and transforms"),
     Option("-o", "--output-dir", dest="out_dir", default="output/",
-           help="directory where extract-app-metadata outputed"))
+           help="directory where extract-app-metadata outputed"),
+    Option("-v", "--verbose",  default=False, action="store_true",
+           help="show more output to stdout"),
+    )
 
 
 def postprocess_metadata(config_dir, out_dir):
@@ -100,4 +103,11 @@
         parser.print_usage()
         print("extraneous arguments: {0}".format(" ".join(args)))
         sys.exit(1)
+
+    # create output on stdout
+    if opts.verbose:
+        log = logging.getLogger()
+        handler = logging.StreamHandler()
+        log.addHandler(handler)
+
     postprocess_metadata(opts.config_dir, opts.out_dir)
 
=== modified file 'utils/package-metadata'
--- utils/package-metadata	2011-06-29 16:33:50 +0000
+++ utils/package-metadata	2011-08-03 18:01:44 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 echo "running package-metadata...."
 
 # we need this to create PNGS from scalables
@@ -8,29 +10,69 @@
     exit 1
 fi
 
+SIZE=64
+
 cd output/icons/
 SVGS=`file -Nz * | grep "SVG" | cut -d ":" -f 1`
+XPMS=`file -Nz * | grep "X pixmap image" | cut -d ":" -f 1`
 SVGS_WC=`echo $SVGS | wc -w`
+XPMS_WC=`echo $XPMS | wc -w`
 ICONS_WC=`ls | wc -w`
 
 echo "$SVGS_WC out of $ICONS_WC output icons are scalable"
+echo "$XPMS_WC out of $ICONS_WC output icons are xpms"
 echo "converting to PNGs..."
 
 # don't delete SVGs while converting
 mkdir -p ../backup/
-mv $SVGS ../backup/
+if [ -n "$SVGS" ]; then
+    mv $SVGS ../backup/
+fi
+if [ -n "$XPMS" ];then
+    mv $XPMS ../backup/
+fi
 cd ../backup/
 
+# conver the svgs
 for svg in $SVGS; do
     echo " * $svg"
-    rsvg -w 128 $svg ../icons/${svg%%.svg*}.png
-    if [ $? -ne 0 ]; then
+    if ! rsvg -w $SIZE $svg ../icons/${svg%%.svg*}.png; then
         echo "   failed!, copying instead"
         cp $svg ../icons/
     fi
 done
 
-cd ..
+# convert the xpms
+for xpm in $XPMS; do
+    echo " * $xpm"
+    if ! convert $xpm ../icons/${xpm%%.xpm*}.png; then
+        echo "   failed!, copying instead"
+        cp $xpm ../icons/
+    fi
+done
+cd ..
+
+# resize all the big ones to our target size
+cd icons
+for png in *.png; do
+    w=$(identify -format "%[fx:w]" $png)
+    #h=$(identify -format "%[fx:h]")
+    if [ "$w" -gt $SIZE ]; then
+        echo " * resizing $png from width $w to $SIZE"
+        mv $png ../backup
+        if ! convert -resize $SIZE ../backup/$png $png; then
+            echo "   resize failed, copying"
+            cp ../backup/$png $png
+        fi
+    fi
+done
+cd ..
+
+# and run pngcrush 
+mkdir -p icons-reduced
+pngcrush -q -d icons-reduced icons/*.png
+mv icons-reduced/*.png icons/
+
 echo "done compressing. now archive everything"
 DATE=`date '+%Y%m%d'`
 tar czf ../archive-metadata-$DATE.tar.gz desktop/ icons/