Skip corrupted png file

tools/resources/optimize-png-files.sh

 #!/bin/bash
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # The optimization code is based on pngslim (http://goo.gl/a0XHg)
 # and executes a similar pipleline to optimize the png file size.
 # The steps that require pngoptimizercl/pngrewrite/deflopt are omitted,
 # but this runs all other processes, including:
 # 1) various color-dependent optimizations using optipng.
 # 2) optimize the number of huffman blocks.
 # 3) randomize the huffman table.
 # 4) Further optimize using optipng and advdef (zlib stream).
 # Due to the step 3), each run may produce slightly different results.
 #
 # Note(oshima): In my experiment, advdef didn't reduce much. I'm keeping it
 # for now as it does not take much time to run.
 
 readonly ALL_DIRS="
 ash/resources
-ui/resources
 chrome/app/theme
 chrome/browser/resources
 chrome/renderer/resources
+content/public/android

[msw, 2013/11/06 21:44:12]

Perhaps limit this to content/public/android/java/res?

[oshima, 2014/01/09 19:39:25]

Done.

+content/renderer/resources
+content/shell/resources
+remoting/resources
+ui/resources
+ui/webui/resources

[msw, 2013/11/06 21:44:12]

perhaps limit this to ui/webui/resources/images?

[oshima, 2014/01/09 19:39:25]

Done.

 webkit/glue/resources
-remoting/resources
-remoting/webapp
+win8/metro_driver/resources
 "
 
 # Files larger than this file size (in bytes) will
 # use the optimization parameters tailored for large files.
 LARGE_FILE_THRESHOLD=3000
 
 # Constants used for optimization
 readonly DEFAULT_MIN_BLOCK_SIZE=128
 readonly DEFAULT_LIMIT_BLOCKS=256
 readonly DEFAULT_RANDOM_TRIALS=100
 # Taken from the recommendation in the pngslim's readme.txt.
 readonly LARGE_MIN_BLOCK_SIZE=1
 readonly LARGE_LIMIT_BLOCKS=2
 readonly LARGE_RANDOM_TRIALS=1
 
 # Global variables for stats
 TOTAL_OLD_BYTES=0
 TOTAL_NEW_BYTES=0
 TOTAL_FILE=0
+CORRUPTED_FILE=0
 PROCESSED_FILE=0
 
 declare -a THROBBER_STR=('-' '\\' '|' '/')
 THROBBER_COUNT=0
 
 # Show throbber character at current cursor position.
 function throbber {
   echo -ne "${THROBBER_STR[$THROBBER_COUNT]}\b"
   let THROBBER_COUNT=($THROBBER_COUNT+1)%4
 }
@@ skipping 204 matching lines @@
   final_compression $file
 }
 
 # Usage: process_file <file>
 function process_file {
   local file=$1
   local name=$(basename $file)
   # -rem alla removes all ancillary chunks except for tRNS
   pngcrush -d $TMP_DIR -brute -reduce -rem alla $file > /dev/null
 
-  if [ $OPTIMIZE_LEVEL != 0 ]; then
+  if [ -f $TMP_DIR/$name -a $OPTIMIZE_LEVEL != 0 ]; then

[msw, 2013/11/06 21:44:12]

Wow, shell scripting is archaic... I need to look up everything.

     optimize_size $TMP_DIR/$name
   fi
 }
 
 # Usage: optimize_file <file>
 function optimize_file {
   local file=$1
   if $using_cygwin ; then
     file=$(cygpath -w $file)
   fi
 
   local name=$(basename $file)
   local old=$(stat -c%s $file)
   local tmp_file=$TMP_DIR/$name
+  let TOTAL_FILE+=1
 
   process_file $file
 
+  if [ ! -e  $tmp_file ] ; then
+    let CORRUPTED_FILE+=1
+    echo "The png file ($file) may be corrupted. skipping"

[msw, 2013/11/06 21:44:12]

Interesting, have you encountered this case at all?
Does it regularly repro for any of the files in our codebase?

[oshima, 2014/01/09 19:39:25]

Yes, I had. I think this happened because someone committed png as text file.

+    return
+  fi
+
   local new=$(stat -c%s $tmp_file)
   let diff=$old-$new
   let percent=($diff*100)/$old
-  let TOTAL_FILE+=1
 
   tput el
   if [ $new -lt $old ]; then
     echo -ne "$file : $old => $new ($diff bytes : $percent %)\n"
     mv "$tmp_file" "$file"
     let TOTAL_OLD_BYTES+=$old
     let TOTAL_NEW_BYTES+=$new
     let PROCESSED_FILE+=1
   else
     if [ $OPTIMIZE_LEVEL == 0 ]; then
@@ skipping 152 matching lines @@
     optimize_dir $d
     echo
   done
 fi
 
 # Print the results.
 if [ $PROCESSED_FILE == 0 ]; then
   echo "Did not find any files (out of $TOTAL_FILE files)" \
        "that could be optimized" \
        "in $(date -u -d @$SECONDS +%T)s"
+  if [ $CORRUPTED_FILE != 0 ]; then

[msw, 2013/11/06 21:44:12]

nit: just print this after everything else outside the if.

[oshima, 2014/01/09 19:39:25]

Done.

+    echo "Warning: corrupted files found: $CORRUPTED_FILE"

[msw, 2013/11/06 21:44:12]

Would it help to print a list of these file names now, or give the user some
idea of how to handle them?

[oshima, 2014/01/09 19:39:25]

File names are printed in #297.

I added "contact author of the CL that landed corrupted files"

+  fi
 else
   let diff=$TOTAL_OLD_BYTES-$TOTAL_NEW_BYTES
   let percent=$diff*100/$TOTAL_OLD_BYTES
   echo "Processed $PROCESSED_FILE files (out of $TOTAL_FILE files)" \
        "in $(date -u -d @$SECONDS +%T)s"
+  if [ $CORRUPTED_FILE != 0 ]; then
+    echo "Warning: corrupted files found: $CORRUPTED_FILE"
+  fi
   echo "Result : $TOTAL_OLD_BYTES => $TOTAL_NEW_BYTES bytes" \
        "($diff bytes : $percent %)"
 fi