Merge branch 'optimizeimg' of http://github.com/kbrantley/Minecraft-Overviewer

quadtree.py

@@ -24,10 +24,11 @@ import shutil
 import collections
 import json
 import logging
+import util
 
 from PIL import Image
+from optimizeimages import optimize_image
 
-import util
 
 """
 This module has routines related to generating a quadtree of tiles
@@ -55,7 +56,7 @@ def catch_keyboardinterrupt(func):
     return newfunc
 
 class QuadtreeGen(object):
-    def __init__(self, worldobj, destdir, depth=None, imgformat=None):
+    def __init__(self, worldobj, destdir, depth=None, imgformat=None, optimizeimg=None):
         """Generates a quadtree from the world given into the
         given dest directory
 
@@ -67,6 +68,7 @@ class QuadtreeGen(object):
         """
         assert(imgformat)
         self.imgformat = imgformat
+        self.optimizeimg = optimizeimg
 
         if depth is None:
             # Determine quadtree depth (midpoint is always 0,0)
@@ -244,7 +246,8 @@ class QuadtreeGen(object):
             # (even if tilechunks is empty, render_worldtile will delete
             # existing images if appropriate)
             yield pool.apply_async(func=render_worldtile, args= (tilechunks,
-                colstart, colend, rowstart, rowend, dest, self.imgformat))
+                colstart, colend, rowstart, rowend, dest, self.imgformat,
+                self.optimizeimg))
 
     def _apply_render_inntertile(self, pool, zoom):
         """Same as _apply_render_worltiles but for the inntertile routine.
@@ -256,7 +259,7 @@ class QuadtreeGen(object):
             dest = os.path.join(self.destdir, "tiles", *(str(x) for x in path[:-1]))
             name = str(path[-1])
 
-            yield pool.apply_async(func=render_innertile, args= (dest, name, self.imgformat))
+            yield pool.apply_async(func=render_innertile, args= (dest, name, self.imgformat, self.optimizeimg))
 
     def go(self, procs):
         """Renders all tiles"""
@@ -340,7 +343,7 @@ class QuadtreeGen(object):
         pool.join()
 
         # Do the final one right here:
-        render_innertile(os.path.join(self.destdir, "tiles"), "base", self.imgformat)
+        render_innertile(os.path.join(self.destdir, "tiles"), "base", self.imgformat, self.optimizeimg)
 
     def _get_range_by_path(self, path):
         """Returns the x, y chunk coordinates of this tile"""
@@ -371,7 +374,7 @@ class QuadtreeGen(object):
         return chunklist
 
 @catch_keyboardinterrupt
-def render_innertile(dest, name, imgformat):
+def render_innertile(dest, name, imgformat, optimizeimg):
     """
     Renders a tile at os.path.join(dest, name)+".ext" by taking tiles from
     os.path.join(dest, name, "{0,1,2,3}.png")
@@ -461,12 +464,15 @@ def render_innertile(dest, name, imgformat):
         img.save(imgpath, quality=95, subsampling=0)
     else: # png
         img.save(imgpath)
+        if optimizeimg:
+            optimize_image(imgpath, imgformat, optimizeimg)
+
     with open(hashpath, "wb") as hashout:
         hashout.write(newhash)
 
 
 @catch_keyboardinterrupt
-def render_worldtile(chunks, colstart, colend, rowstart, rowend, path, imgformat):
+def render_worldtile(chunks, colstart, colend, rowstart, rowend, path, imgformat, optimizeimg):
     """Renders just the specified chunks into a tile and save it. Unlike usual
     python conventions, rowend and colend are inclusive. Additionally, the
     chunks around the edges are half-way cut off (so that neighboring tiles
@@ -595,6 +601,10 @@ def render_worldtile(chunks, colstart, colend, rowstart, rowend, path, imgformat
 
     # Save them
     tileimg.save(imgpath)
+
+    if optimizeimg:
+	optimize_image(imgpath, imgformat, optimizeimg)
+
     with open(hashpath, "wb") as hashout:
         hashout.write(digest)