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

Simpler check of dependencies

Browse source
This commit is contained in:
Hugo Posnic 2019-02-21 16:34:07 +01:00
parent fa94b546fb
commit 06aad62cb6
1 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
trimage/trimage.py
View file

@ -40,8 +40,8 @@ class StartQT5(QMainWindow):
if self.settings.value("geometry"): if self.settings.value("geometry"):
self.restoreGeometry(self.settings.value("geometry")) self.restoreGeometry(self.settings.value("geometry"))
# check if apps are installed # check if dependencies are installed
if self.checkapps(): if not self.check_dependencies():
quit() quit()
#add quit shortcut #add quit shortcut
@ -252,29 +252,23 @@ class StartQT5(QMainWindow):
if QSystemTrayIcon.isSystemTrayAvailable() and not self.cli: if QSystemTrayIcon.isSystemTrayAvailable() and not self.cli:
self.systemtray.recompress.setEnabled(True) self.systemtray.recompress.setEnabled(True)
def checkapps(self): def check_dependencies(self):
"""Check if the required command line apps exist.""" """Check if the required command line apps exist."""
exe = ".exe" if (sys.platform == "win32") else "" exe = ".exe" if (sys.platform == "win32") else ""
status = True
dependencies = {
"jpegoptim": "--version",
"optipng": "-v",
"advpng": "--version",
"pngcrush": "-version"
}
for elt in dependencies:
retcode = self.safe_call(elt + exe + " " + dependencies[elt])
if retcode != 0:
status = False status = False
retcode = self.safe_call("jpegoptim" + exe + " --version") print("[error] please install {}".format(elt), file=sys.stderr)
if retcode != 0:
status = True
print("[error] please install jpegoptim", file=sys.stderr)
retcode = self.safe_call("optipng" + exe + " -v")
if retcode != 0:
status = True
print("[error] please install optipng", file=sys.stderr)
retcode = self.safe_call("advpng" + exe + " --version")
if retcode != 0:
status = True
print("[error] please install advancecomp", file=sys.stderr)
retcode = self.safe_call("pngcrush" + exe + " -version")
if retcode != 0:
status = True
print("[error] please install pngcrush", file=sys.stderr)
return status return status
def safe_call(self, command): def safe_call(self, command):