genebean/Trimage
1
0
Fork 0
mirror of https://github.com/Kilian/Trimage.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #64 from Huluti/remove-win32-support

Browse source 
Remove win32 bytes following d6118b5
This commit is contained in:
Kilian Valkhof 2019-10-14 17:00:36 +02:00 • committed by GitHub
commit 0cbbfcdfe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trimage/tools.py
View file

@ -7,7 +7,6 @@ from subprocess import call, PIPE
def check_dependencies(): def check_dependencies():
"""Check if the required command line apps exist.""" """Check if the required command line apps exist."""
exe = ".exe" if (sys.platform == "win32") else ""
status = True status = True
dependencies = { dependencies = {
"jpegoptim": "--version", "jpegoptim": "--version",
@ -17,7 +16,7 @@ def check_dependencies():
} }
for elt in dependencies: for elt in dependencies:
retcode = safe_call(elt + exe + " " + dependencies[elt]) retcode = safe_call(elt + " " + dependencies[elt])
if retcode != 0: if retcode != 0:
status = False status = False
print("[error] please install {}".format(elt), file=sys.stderr) print("[error] please install {}".format(elt), file=sys.stderr)
@ -43,4 +42,4 @@ def human_readable_size(num, suffix="B"):
if abs(num) < 1024.0: if abs(num) < 1024.0:
return "%3.1f%s%s" % (num, unit, suffix) return "%3.1f%s%s" % (num, unit, suffix)
num /= 1024.0 num /= 1024.0
return "%.1f%s%s" % (num, "Y", suffix) return "%.1f%s%s" % (num, "Y", suffix)

5
trimage/trimage.py
View file

@ -371,10 +371,9 @@ class Image:
file)" file)"
self.reset() self.reset()
self.compressing = True self.compressing = True
exe = ".exe" if (sys.platform == "win32") else ""
runString = { runString = {
"jpeg": "jpegoptim" + exe + " -f --strip-all '%(file)s'", "jpeg": "jpegoptim -f --strip-all '%(file)s'",
"png": "optipng" + exe + " -force -o7 '%(file)s'&&advpng" + exe + " -z4 '%(file)s' && pngcrush -rem gAMA -rem alla -rem cHRM -rem iCCP -rem sRGB -rem time '%(file)s' '%(file)s.bak' && mv '%(file)s.bak' '%(file)s'" "png": "optipng -force -o7 '%(file)s'&&advpng -z4 '%(file)s' && pngcrush -rem gAMA -rem alla -rem cHRM -rem iCCP -rem sRGB -rem time '%(file)s' '%(file)s.bak' && mv '%(file)s.bak' '%(file)s'"
} }
# create a backup file # create a backup file
backupfullpath = '/tmp/' + self.filename_w_ext backupfullpath = '/tmp/' + self.filename_w_ext