Merge pull request #83 from Mte90/patch-2

Fix incomplete code of #77

README.md

@@ -1,3 +1,13 @@
+### Made by [@kilianvalkhof](https://twitter.com/kilianvalkhof)
+
+#### Other projects:
+
+- 💻 [Polypane](https://polypane.app) - Develop responsive websites and apps twice as fast on multiple screens at once
+- 🖌️ [Superposition](https://superposition.design) - Kickstart your design system by extracting design tokens from your website
+- 🗒️ [FromScratch](https://fromscratch.rocks) - A smart but simple autosaving scratchpad
+
+---
+
 # Trimage image compressor
 
 A cross-platform tool for optimizing PNG and JPG files.

debian/compat

@@ -1 +1 @@
-10
+11

debian/control

@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Kilian Valkhof <kilian@kilianvalkhof.com>
 Build-Depends: debhelper (>=7), python3
-Standards-Version: 3.9.2
+Standards-Version: 4.3.0
 Homepage: http://trimage.org
 
 Package: trimage

debian/pycompat

@@ -1 +0,0 @@
-3

debian/rules

@@ -1,4 +1,3 @@
 #!/usr/bin/make -f
 %:
 	dh $@
-

desktop/trimage.desktop

@@ -7,4 +7,4 @@ Type=Application
 Exec=trimage
 Categories=Application;Qt;Graphics;
 StartupNotify=true
-
+Keywords=compression;compressor;images;jpg;jpeg;png;web;

trimage/ThreadPool/ThreadPool.py

@@ -30,9 +30,6 @@ class ThreadPoolMixIn:
     def __init__(self, threadpool=None):
         if (threadpool == None):
             threadpool = ThreadPool()
-            self.__private_threadpool = True
-        else:
-            self.__private_threadpool = False
 
         self.__threadpool = threadpool
 
@@ -52,10 +49,6 @@ class ThreadPoolMixIn:
     def process_request(self, request, client_address):
         self.__threadpool.add_job(self.process_request_thread, [request, client_address])
 
-    def shutdown(self):
-        if (self.__private_threadpool): self.__threadpool.shutdown()
-
-
 class AddJobException(Exception):
     '''
     Exceptoion raised when a Job could not be added

trimage/tools.py

@@ -7,7 +7,6 @@ from subprocess import call, PIPE
 
 def check_dependencies():
     """Check if the required command line apps exist."""
-    exe = ".exe" if (sys.platform == "win32") else ""
     status = True
     dependencies = {
         "jpegoptim": "--version",
@@ -17,7 +16,7 @@ def check_dependencies():
     }
 
     for elt in dependencies:
-        retcode = safe_call(elt + exe + " " + dependencies[elt])
+        retcode = safe_call(elt + " " + dependencies[elt])
         if retcode != 0:
             status = False
             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:
             return "%3.1f%s%s" % (num, unit, suffix)
         num /= 1024.0
-    return "%.1f%s%s" % (num, "Y", suffix)
+    return "%.1f%s%s" % (num, "Y", suffix)

trimage/trimage.py

@@ -304,8 +304,9 @@ class ImageRow:
     def __init__(self, image, waitingIcon=None):
         """Build the information visible in the table image row."""
         self.image = image
+
         d = {
-            'filename_w_ext': lambda i: self.statusStr() % i.filename_w_ext,
+            'filename_w_ext': lambda i: self.statusStr().format(i.filename_w_ext),
             'oldfilesizestr': lambda i: human_readable_size(i.oldfilesize)
                 if i.compressed else "",
             'newfilesizestr': lambda i: human_readable_size(i.newfilesize)
@@ -326,15 +327,15 @@ class ImageRow:
     def statusStr(self):
         """Set the status message."""
         if self.image.failed:
-            return "ERROR: %s"
+            return "ERROR: {0}"
         if self.image.compressing:
-            message = "Compressing %s..."
+            message = "Compressing {0}..."
             return message
         if not self.image.compressed and self.image.recompression:
-            return "Queued for recompression..."
+            return "Queued for recompression {0}..."
         if not self.image.compressed:
-            return "Queued..."
+            return "Queued {0}..."
-        return "%s"
+        return "{0}"
 
     def __getitem__(self, key):
         return self.d[key](self.image)
@@ -371,10 +372,9 @@ class Image:
             file)"
         self.reset()
         self.compressing = True
-        exe = ".exe" if (sys.platform == "win32") else ""
         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
         backupfullpath = '/tmp/' + self.filename_w_ext
@@ -410,9 +410,6 @@ class Worker(QThread):
         self.toDisplay = Queue()
         self.threadpool = ThreadPool(max_workers=cpu_count())
 
-    def __del__(self):
-        self.threadpool.shutdown()
-
     def compress_file(self, images, showapp, verbose, imagelist):
         """Start the worker thread."""
         for image in images:

website/index.html

@@ -125,6 +125,14 @@
         <ol>
           <li><code>yaourt -S trimage</code></li>
         </ol>
+
+        <h3><img src="macos.png" alt="" /> macOS</h3><!-- Attribution for the image: VICDJES21 / CC BY-SA (https://creativecommons.org/licenses/by-sa/4.0) -->
+        Trimage is available from Homebrew, to install, type:
+        <ol>
+          <li><code>brew install trimage</code></li>
+        </ol>
+        <p>Launch by executing <code>trimage</code> in Terminal.app</p>
+
         <h3><img src="linux.png" alt="" /> Other *nix</h3>
         <ol>
           <li>Download the source via git or bzr (see repositories)</li>
@@ -142,8 +150,6 @@
           >
         </p>
         <!--
-          <h3><img src="mac.png" alt=""> Mac</h3>
-          <p>Trimage should be able to run on Mac. <a href="mailto:help@trimage.org">Help us with this</a></p>
           <h3><img src="windows.png" alt=""> Windows</h3>
           <p>Trimage should be able to run on Windows. <a href="mailto:help@trimage.org">Help us with this</a></p>
         -->