LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

optimizeimages: code style fixes

Browse Source 
Now PEP8 compliant!
This commit is contained in:
Nicolas F
2017-03-16 14:58:41 +01:00
parent f1909e9684
commit 5c44084332
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
overviewer_core/optimizeimages.py
View File

@@ -18,6 +18,7 @@ import subprocess
import shlex
import logging
class Optimizer:
binaryname = ""
binarynames = []
@@ -35,7 +36,8 @@ class Optimizer:
path = os.environ.get("PATH").split(os.pathsep)
def exists_in_path(prog):
result = filter(lambda x: os.path.exists(os.path.join(x, prog)), path)
result = filter(lambda x: os.path.exists(os.path.join(x, prog)),
path)
return len(result) != 0
binaries = self.binarynames + [x + ".exe" for x in self.binarynames]
@@ -44,11 +46,14 @@ class Optimizer:
self.binaryname = b
break
else:
raise Exception("Optimization programs '%s' were not found!" % binaries)
raise Exception("Optimization programs '%s' were not found!" %
binaries)
def is_crusher(self):
"""Should return True if the optimization is lossless, i.e. none of the actual image data will be changed."""
raise NotImplementedError("I'm so abstract I can't even say whether I'm a crusher.")
"""Should return True if the optimization is lossless, i.e. none of the
actual image data will be changed."""
raise NotImplementedError("I'm so abstract I can't even say whether "
"I'm a crusher.")
class NonAtomicOptimizer(Optimizer):
@@ -60,24 +65,26 @@ class NonAtomicOptimizer(Optimizer):
subprocess.check_call(args)
self.cleanup(img)
class PNGOptimizer:
def __init__(self):
raise NotImplementedError("I can't let you do that, Dave.")
class JPEGOptimizer:
def __init__(self):
raise NotImplementedError("I can't let you do that, Dave.")
class pngnq(NonAtomicOptimizer, PNGOptimizer):
binarynames = ["pngnq-s9", "pngnq"]
def __init__(self, sampling=3, dither="n"):
if sampling < 1 or sampling > 10:
raise Exception("Invalid sampling value '%d' for pngnq!" % sampling)
raise Exception("Invalid sampling value '%d' for pngnq!" %
sampling)
if dither not in ["n", "f"]:
raise Exception("Invalid dither method '%s' for pngnq!" % dither)
self.sampling = sampling
self.dither = dither
@@ -87,7 +94,8 @@ class pngnq(NonAtomicOptimizer, PNGOptimizer):
else:
extension = ".png.tmp"
args = [self.binaryname, "-s", str(self.sampling), "-f", "-e", extension, img]
args = [self.binaryname, "-s", str(self.sampling), "-f", "-e",
extension, img]
# Workaround for poopbuntu 12.04 which ships an old broken pngnq
if self.dither != "n":
args.insert(1, "-Q")
@@ -98,8 +106,10 @@ class pngnq(NonAtomicOptimizer, PNGOptimizer):
def is_crusher(self):
return False
class pngcrush(NonAtomicOptimizer, PNGOptimizer):
binarynames = ["pngcrush"]
# really can't be bothered to add some interface for all
# the pngcrush options, it sucks anyway
def __init__(self, brute=False):
@@ -107,7 +117,7 @@ class pngcrush(NonAtomicOptimizer, PNGOptimizer):
def optimize(self, img):
args = [self.binaryname, img, img + ".tmp"]
if self.brute == True: # Was the user an idiot?
if self.brute: # Was the user an idiot?
args.insert(1, "-brute")
NonAtomicOptimizer.fire_and_forget(self, args, img)
@@ -115,6 +125,7 @@ class pngcrush(NonAtomicOptimizer, PNGOptimizer):
def is_crusher(self):
return True
class optipng(Optimizer, PNGOptimizer):
binarynames = ["optipng"]
@@ -122,11 +133,13 @@ class optipng(Optimizer, PNGOptimizer):
self.olevel = olevel
def optimize(self, img):
Optimizer.fire_and_forget(self, [self.binaryname, "-o" + str(self.olevel), "-quiet", img])
Optimizer.fire_and_forget(self, [self.binaryname, "-o" +
str(self.olevel), "-quiet", img])
def is_crusher(self):
return True
class advpng(Optimizer, PNGOptimizer):
binarynames = ["advpng"]
crusher = True
@@ -135,11 +148,13 @@ class advpng(Optimizer, PNGOptimizer):
self.olevel = olevel
def optimize(self, img):
Optimizer.fire_and_forget(self, [self.binaryname, "-z" + str(self.olevel), "-q", img])
Optimizer.fire_and_forget(self, [self.binaryname, "-z" +
str(self.olevel), "-q", img])
def is_crusher(self):
return True
class jpegoptim(Optimizer, JPEGOptimizer):
binarynames = ["jpegoptim"]
crusher = True
@@ -149,7 +164,8 @@ class jpegoptim(Optimizer, JPEGOptimizer):
def __init__(self, quality=None, target_size=None):
if quality is not None:
if quality < 0 or quality > 100:
raise Exception("Invalid target quality %d for jpegoptim" % quality)
raise Exception("Invalid target quality %d for jpegoptim" %
quality)
self.quality = quality
if target_size is not None:
@@ -176,7 +192,6 @@ class jpegoptim(Optimizer, JPEGOptimizer):
return True
def optimize_image(imgpath, imgformat, optimizers):
for opt in optimizers:
if imgformat == 'png':