diff --git a/.gitignore b/.gitignore index 731c196..0447b8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,116 @@ -*.pyc -MANIFEST -dist/ -build/ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ diff --git a/MANIFEST.in b/MANIFEST.in index 7cbcb9f..d2dd0c9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ -include COPYING MANIFEST MANIFEST.in README trimage +include COPYING MANIFEST MANIFEST.in README.md bin/trimage recursive-include desktop *.svg *.desktop -recursive-include src/ *.py *.png - +recursive-include trimage/ *.py *.png diff --git a/README b/README deleted file mode 100644 index ec43bc4..0000000 --- a/README +++ /dev/null @@ -1,15 +0,0 @@ -Trimage image compressor -A cross-platform tool for optimizing PNG and JPG files. - -Trimage is a cross-platform GUI and command-line interface to optimize image -files via "optipng":http://optipng.sourceforge.net/, -"advpng":http://advancemame.sourceforge.net/comp-readme.html and -"jpegoptim":http://www.kokkonen.net/tjko/projects.html, depending on the -filetype (currently, PNG and JPG files are supported). It was inspired by -"imageoptim":http://imageoptim.pornel.net/. All image files are losslessly -compressed on the highest available compression levels. Trimage gives you -various input functions to fit your own workflow: A regular file dialog, -dragging and dropping and various command line options. - -Visit "Trimage.org":http://trimage.org for more information - diff --git a/README.md b/README.md new file mode 100644 index 0000000..75b2061 --- /dev/null +++ b/README.md @@ -0,0 +1,44 @@ +### 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. + +Trimage is a cross-platform GUI and command-line interface to optimize image files via [advpng](http://advancemame.sourceforge.net/comp-readme.html), [jpegoptim](http://www.kokkonen.net/tjko/projects.html), [optipng](http://optipng.sourceforge.net) and [pngcrush](https://pmt.sourceforge.io/pngcrush) depending on the +filetype (currently, PNG and JPG files are supported). +It was inspired by +[imageoptim](http://imageoptim.pornel.net). + +All image files are losslessly +compressed on the highest available compression levels. Trimage gives you +various input functions to fit your own workflow: a regular file dialog, +dragging and dropping and various command line options. + +## Installation instructions + +Visit [Trimage.org](http://trimage.org) to install Trimage as a package. + +## Building instructions + +### Prerequisites + +- PyQt5 +- advpng +- jpegoptim +- optipng +- pngcrush + +### Build from source + +Build and install by running: + + python setup.py build + sudo python setup.py install diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..b375a3b --- /dev/null +++ b/TODO.md @@ -0,0 +1,17 @@ +# Todo + +- general refactoring +- sys.exit(1) for errors -- how to handle? Not good to simply sys.exit() from any random part of code (can leave things in a mess) +- consider context managers for handling compression, so as to keep operations atomic and/or rollback-able +- add a recursive option on the command-line for use with -d +- make -f accept a list of files +- make the current verbose be "normal", and make -verbose print the commandline app prints as well +- find a way to specify the version once for everywhere +- notification area drag/drop widget -> probably need gtk for gnome +- figure out how to make mac and win versions (someone else :) <- via gui2exe +- animate compressing.gif +- allow selection/deletion of rows from table (and subsequently the imagelist) +- punypng api? http://www.gracepointafterfive.com/punypng/api +- imagemagick/graphicsmagick? +- always on top option +- intelligently recompress, i.e. go through the list of files, recompress each until no more gains are seen (and a sensible number-of-tries limit isn't exceeded), and flag that file as fully-optimised. Repeat for each file in the list, until all are done. Saves pointlessly trying to optimise files. Consider the case of a directory of 100 files, already optimised once. Recompressing maximally compresses 90. Recompressing again would currently try to recompress all 100, when only 10 would be worthy of trying to compress further diff --git a/trimage b/bin/trimage similarity index 95% rename from trimage rename to bin/trimage index 58d7c4a..c402a5a 100644 --- a/trimage +++ b/bin/trimage @@ -1,5 +1,4 @@ -#!/usr/bin/env python -#coding: utf-8 +#!/usr/bin/env python3 # #Copyright (c) 2010 Kilian Valkhof, Paul Chaplin, Tarnay Kálmán # diff --git a/debian/changelog b/debian/changelog index 30f9a17..fa8c6f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +trimage (1.0.6-0ubuntu1) bionic; urgency=low + + * Migrate to python 3 and python-qt 5 + * fix bug with hanging thread + * remove hurry.filesize package + + -- Kilian Valkhof Tue, 12 Mar 2019 11:54:00 +0200 + trimage (1.0.5-0ubuntu1) jaunty; urgency=low * prevent images from becoming larger after recompression @@ -70,4 +78,3 @@ trimage (1.0.0b-0ubuntu1) jaunty; urgency=low * Trimage image compressor -- Kilian Valkhof Tue, 23 Mar 2010 20:18:17 +0100 - diff --git a/debian/compat b/debian/compat index 7f8f011..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +11 diff --git a/debian/control b/debian/control index 68bdb14..7396a46 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,13 @@ Source: trimage Section: graphics Priority: optional Maintainer: Kilian Valkhof -Build-Depends: debhelper (>=7), python-support (>=0.8.7), python -XS-Python-Version: >=2.6 -Standards-Version: 3.9.1 +Build-Depends: debhelper (>=7), python3 +Standards-Version: 4.3.0 Homepage: http://trimage.org Package: trimage Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-qt4 (>=4.4), optipng (>=0.6.2.1), advancecomp (>=1.15), jpegoptim (>=1.2.2), pngcrush (>=1.6.7) -XB-Python-Version: ${python:Versions} +Depends: ${misc:Depends}, ${python:Depends}, python-pyqt5 (>=5.7), optipng (>=0.6.2.1), advancecomp (>=1.15), jpegoptim (>=1.2.2), pngcrush (>=1.6.7) Description: GUI and command-line interface to optimize image files Trimage is a cross-platform GUI and command-line interface to optimize image files via optipng, advpng, pngcrush and jpegoptim, depending on the filetype @@ -18,4 +16,3 @@ Description: GUI and command-line interface to optimize image files compressed on the highest available compression levels. Trimage gives you various input functions to fit your own workflow: A regular file dialog, dragging and dropping and various command line options. - diff --git a/debian/copyright b/debian/copyright index 2a6f587..a9897e2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -39,49 +39,6 @@ The Debian packaging is: and is licensed under the MIT license, see above. -hurry.filesize is: - - Copyright (C) Martijn Faassen, Startifact - -License: - - Zope Public License (ZPL) Version 2.1 - A copyright notice accompanies this license document that identifies the - copyright holders. This license has been certified as open source. It has - also been designated as GPL compatible by the Free Software Foundation (FSF). - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions in source code must retain the accompanying copyright - notice, this list of conditions, and the following disclaimer. - 2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - 3. Names of the copyright holders must not be used to endorse or promote - products derived from this software without prior written permission from - the copyright holders. - 4. The right to distribute this software or to use it for any purpose does - not give you the right to use Servicemarks (sm) or Trademarks (tm) of the - copyright holders. Use of them is covered by separate agreement with the - copyright holders. - 5. If any files are modified, you must cause the modified files to carry - prominent notices stating that you changed the files and the date of any - change. - - Disclaimer - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY - EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ThreadPool is: Copyright (c) Morten Holdflod Moeller @@ -253,4 +210,3 @@ License: apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf08..0000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 4f2c774..cbe925d --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,3 @@ #!/usr/bin/make -f %: dh $@ - diff --git a/desktop/trimage.desktop b/desktop/trimage.desktop index 2cf870a..8b48fa6 100644 --- a/desktop/trimage.desktop +++ b/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; diff --git a/doc/trimage.1 b/doc/trimage.1 index 501742d..0907c27 100644 --- a/doc/trimage.1 +++ b/doc/trimage.1 @@ -3,7 +3,7 @@ .\" This manual page is distributed under the terms .\" of the GNU Free Documentation License version 1.3. .\" -.TH TRIMAGE "1" "2011-07-11" "trimage 1.0.5" "User Commands" +.TH TRIMAGE "1" "2019-03-12" "trimage 1.0.6" "User Commands" .SH NAME trimage \- losslessly optimizing png and jpeg liles diff --git a/resources/todo b/resources/todo deleted file mode 100644 index a61422c..0000000 --- a/resources/todo +++ /dev/null @@ -1,37 +0,0 @@ -========================================== -todo app wise -- general refactoring -- sys.exit(1) for errors -- how to handle? Not good to simply sys.exit() from - any random part of code (can leave things in a mess) -- consider context managers for handling compression, so as to keep operations - atomic and/or rollback-able - -- add a recursive option on the command-line for use with -d -- make -f accept a list of files -- make the current verbose be "normal", and make -verbose print the commandline - app prints as well - -- find a way to specify the version once for everywhere -- notification area drag/drop widget - -> probably need gtk for gnome - -todo else -- figure out how to make mac and win versions (someone else :) <- via gui2exe - - -=========================================== -later versions: - animate compressing.gif - allow selection/deletion of rows from table (and subsequently the imagelist) - punypng api? http://www.gracepointafterfive.com/punypng/api - imagemagick/graphicsmagick? - always on top option - intelligently recompress, i.e. go through the list of files, recompress - each until no more gains are seen (and a sensible number-of-tries limit - isn't exceeded), and flag that file as fully-optimised. Repeat for each - file in the list, until all are done. Saves pointlessly trying to - optimise files. Consider the case of a directory of 100 files, already - optimised once. Recompressing maximally compresses 90. Recompressing - again would currently try to recompress all 100, when only 10 would be - worthy of trying to compress further. - diff --git a/setup.py b/setup.py index bae6f17..2ba0a6f 100644 --- a/setup.py +++ b/setup.py @@ -1,41 +1,22 @@ -#!/usr/bin/env python - -import sys -win=(sys.platform == "win32") -if win: - import py2exe - sys.path.append("src/trimage") +#!/usr/bin/env python3 from distutils.core import setup + setup(name = "trimage", - version = "1.0.2", + version = "1.0.6", description = "Trimage image compressor - A cross-platform tool for optimizing PNG and JPG files", author = "Kilian Valkhof, Paul Chaplin", author_email = "help@trimage.org", url = "http://trimage.org", license = "MIT license", - package_dir = {'trimage' : 'src/trimage'}, packages = ["trimage", - "trimage.filesize", - "trimage.ThreadPool",], + "trimage.ThreadPool"], package_data = {"trimage" : ["pixmaps/*.*"] }, data_files=[('share/icons/hicolor/scalable/apps', ['desktop/trimage.svg']), ('share/applications', ['desktop/trimage.desktop']), ('share/man/man1', ['doc/trimage.1'])], - scripts = ["trimage"], - long_description = """Trimage is a cross-platform GUI and command-line interface to optimize image files via optipng, advpng and jpegoptim, depending on the filetype (currently, PNG and JPG files are supported). It was inspired by imageoptim. All image files are losslessy compressed on the highest available compression levels. Trimage gives you various input functions to fit your own workflow: A regular file dialog, dragging and dropping and various command line options.""", - requires = ["PyQt4 (>=4.4)"], - - #for py2exe - windows=[r'src\trimage\trimage.py'], - zipfile=None, - options={"py2exe":{ - "optimize":2, - "compressed":1, - "bundle_files":1, - "includes":["sip",], - "excludes":['email'], - }, - }, + scripts = ["bin/trimage"], + long_description = """Trimage is a cross-platform GUI and command-line interface to optimize image files via advpng, jpegoptim, optipng and pngcrush, depending on the filetype (currently, PNG and JPG files are supported). It was inspired by imageoptim. All image files are losslessy compressed on the highest available compression levels. Trimage gives you various input functions to fit your own workflow: A regular file dialog, dragging and dropping and various command line options.""", + requires = ["PyQt5"] ) diff --git a/src/trimage/ThreadPool/__init__.py b/src/trimage/ThreadPool/__init__.py deleted file mode 100644 index 727a8b3..0000000 --- a/src/trimage/ThreadPool/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from ThreadPool import ThreadPool, ThreadPoolMixIn \ No newline at end of file diff --git a/src/trimage/filesize/PKG-INFO b/src/trimage/filesize/PKG-INFO deleted file mode 100644 index fe3aadb..0000000 --- a/src/trimage/filesize/PKG-INFO +++ /dev/null @@ -1,71 +0,0 @@ -Metadata-Version: 1.0 -Name: hurry.filesize -Version: 0.9 -Summary: A simple Python library for human readable file sizes (or anything sized in bytes). -Home-page: UNKNOWN -Author: Martijn Faassen, Startifact -Author-email: faassen@startifact.com -License: ZPL 2.1 -Description: hurry.filesize - ============== - - hurry.filesize a simple Python library that can take a number of bytes and - returns a human-readable string with the size in it, in kilobytes (K), - megabytes (M), etc. - - The default system it uses is "traditional", where multipliers of 1024 - increase the unit size:: - - >>> from hurry.filesize import size - >>> size(1024) - '1K' - - An alternative, slightly more verbose system:: - - >>> from hurry.filesize import alternative - >>> size(1, system=alternative) - '1 byte' - >>> size(10, system=alternative) - '10 bytes' - >>> size(1024, system=alternative) - '1 KB' - - A verbose system:: - - >>> from hurry.filesize import verbose - >>> size(10, system=verbose) - '10 bytes' - >>> size(1024, system=verbose) - '1 kilobyte' - >>> size(2000, system=verbose) - '1 kilobyte' - >>> size(3000, system=verbose) - '2 kilobytes' - >>> size(1024 * 1024, system=verbose) - '1 megabyte' - >>> size(1024 * 1024 * 3, system=verbose) - '3 megabytes' - - You can also use the SI system, where multipliers of 1000 increase the unit - size:: - - >>> from hurry.filesize import si - >>> size(1000, system=si) - '1K' - - - Changes - ======= - - 0.9 (2009-03-11) - ---------------- - - * Initial public release. - - Download - ======== - -Keywords: file size bytes -Platform: UNKNOWN -Classifier: Programming Language :: Python -Classifier: Topic :: Software Development :: Libraries :: Python Modules diff --git a/src/trimage/filesize/README.txt b/src/trimage/filesize/README.txt deleted file mode 100644 index 6a0fad6..0000000 --- a/src/trimage/filesize/README.txt +++ /dev/null @@ -1,50 +0,0 @@ -hurry.filesize -============== - -hurry.filesize a simple Python library that can take a number of bytes and -returns a human-readable string with the size in it, in kilobytes (K), -megabytes (M), etc. - -The default system it uses is "traditional", where multipliers of 1024 -increase the unit size:: - - >>> from hurry.filesize import size - >>> size(1024) - '1K' - -An alternative, slightly more verbose system:: - - >>> from hurry.filesize import alternative - >>> size(1, system=alternative) - '1 byte' - >>> size(10, system=alternative) - '10 bytes' - >>> size(1024, system=alternative) - '1 KB' - -A verbose system:: - - >>> from hurry.filesize import verbose - >>> size(10, system=verbose) - '10 bytes' - >>> size(1024, system=verbose) - '1 kilobyte' - >>> size(2000, system=verbose) - '1 kilobyte' - >>> size(3000, system=verbose) - '2 kilobytes' - >>> size(1024 * 1024, system=verbose) - '1 megabyte' - >>> size(1024 * 1024 * 3, system=verbose) - '3 megabytes' - -You can also use the SI system, where multipliers of 1000 increase the unit -size:: - - >>> from hurry.filesize import si - >>> size(1000, system=si) - '1K' - - -http://pypi.python.org/pypi/hurry.filesize - diff --git a/src/trimage/filesize/__init__.py b/src/trimage/filesize/__init__.py deleted file mode 100644 index 68d9fc2..0000000 --- a/src/trimage/filesize/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from filesize import size -from filesize import traditional, alternative, verbose, iec, si diff --git a/src/trimage/filesize/filesize.py b/src/trimage/filesize/filesize.py deleted file mode 100644 index db3e1ba..0000000 --- a/src/trimage/filesize/filesize.py +++ /dev/null @@ -1,115 +0,0 @@ -''' -hurry.filesize - -@author: Martijn Faassen, Startifact -@license: ZPL 2.1 -''' - -traditional = [ - (1024 ** 5, 'P'), - (1024 ** 4, 'T'), - (1024 ** 3, 'G'), - (1024 ** 2, 'M'), - (1024 ** 1, 'K'), - (1024 ** 0, 'B'), - ] - -alternative = [ - (1024 ** 5, ' PB'), - (1024 ** 4, ' TB'), - (1024 ** 3, ' GB'), - (1024 ** 2, ' MB'), - (1024 ** 1, ' KB'), - (1024 ** 0, (' byte', ' bytes')), - ] - -verbose = [ - (1024 ** 5, (' petabyte', ' petabytes')), - (1024 ** 4, (' terabyte', ' terabytes')), - (1024 ** 3, (' gigabyte', ' gigabytes')), - (1024 ** 2, (' megabyte', ' megabytes')), - (1024 ** 1, (' kilobyte', ' kilobytes')), - (1024 ** 0, (' byte', ' bytes')), - ] - -iec = [ - (1024 ** 5, 'Pi'), - (1024 ** 4, 'Ti'), - (1024 ** 3, 'Gi'), - (1024 ** 2, 'Mi'), - (1024 ** 1, 'Ki'), - (1024 ** 0, ''), - ] - -si = [ - (1000 ** 5, 'P'), - (1000 ** 4, 'T'), - (1000 ** 3, 'G'), - (1000 ** 2, 'M'), - (1000 ** 1, 'K'), - (1000 ** 0, 'B'), - ] - - - -def size(bytes, system=traditional): - """Human-readable file size. - - Using the traditional system, where a factor of 1024 is used:: - - >>> size(10) - '10B' - >>> size(100) - '100B' - >>> size(1000) - '1000B' - >>> size(2000) - '1K' - >>> size(10000) - '9K' - >>> size(20000) - '19K' - >>> size(100000) - '97K' - >>> size(200000) - '195K' - >>> size(1000000) - '976K' - >>> size(2000000) - '1M' - - Using the SI system, with a factor 1000:: - - >>> size(10, system=si) - '10B' - >>> size(100, system=si) - '100B' - >>> size(1000, system=si) - '1K' - >>> size(2000, system=si) - '2K' - >>> size(10000, system=si) - '10K' - >>> size(20000, system=si) - '20K' - >>> size(100000, system=si) - '100K' - >>> size(200000, system=si) - '200K' - >>> size(1000000, system=si) - '1M' - >>> size(2000000, system=si) - '2M' - - """ - for factor, suffix in system: - if bytes >= factor: - break - amount = int(bytes/factor) - if isinstance(suffix, tuple): - singular, multiple = suffix - if amount == 1: - suffix = singular - else: - suffix = multiple - return str(amount) + suffix diff --git a/src/trimage/ThreadPool/ThreadPool.py b/trimage/ThreadPool/ThreadPool.py similarity index 81% rename from src/trimage/ThreadPool/ThreadPool.py rename to trimage/ThreadPool/ThreadPool.py index 5c64409..17e55e4 100644 --- a/src/trimage/ThreadPool/ThreadPool.py +++ b/trimage/ThreadPool/ThreadPool.py @@ -1,14 +1,16 @@ +#!/usr/bin/env python3 + ''' ThreadPool Implementation @author: Morten Holdflod Moeller - morten@holdflod.dk -@license: LGPL v3 +@license: LGPL v3 ''' from __future__ import with_statement from threading import Thread, RLock from time import sleep -from Queue import Queue, Empty +from queue import Queue, Empty import logging import sys @@ -28,10 +30,7 @@ class ThreadPoolMixIn: def __init__(self, threadpool=None): if (threadpool == None): threadpool = ThreadPool() - self.__private_threadpool = True - else: - self.__private_threadpool = False - + self.__threadpool = threadpool def process_request_thread(self, request, client_address): @@ -48,11 +47,7 @@ class ThreadPoolMixIn: self.close_request(request) 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() - + self.__threadpool.add_job(self.process_request_thread, [request, client_address]) class AddJobException(Exception): ''' @@ -61,64 +56,64 @@ class AddJobException(Exception): ''' def __init__(self, msg): Exception.__init__(self, msg) - + class ThreadPool: ''' The class implementing the ThreadPool. - - Instantiate and add jobs using add_job(func, args_list) + + Instantiate and add jobs using add_job(func, args_list) ''' class Job: #IGNORE:R0903 ''' Class encapsulating a job to be handled - by ThreadPool workers + by ThreadPool workers ''' def __init__(self, function, args, return_callback=None): self.callable = function self.arguments = args self.return_callback = return_callback - + def execute(self): ''' Called to execute the function ''' try: return_value = self.callable(*self.arguments) #IGNORE:W0142 - except Exception, excep: #IGNORE:W0703 + except Exception as excep: #IGNORE:W0703 logger = logging.getLogger("threadpool.worker") - logger.warning("A job in the ThreadPool raised an exception: " + excep) + logger.warning("A job in the ThreadPool raised an exception: ", excep) #else do nothing cause we don't know what to do... - return - + return + try: if (self.return_callback != None): self.return_callback(return_value) - except Exception, _: #IGNORE:W0703 everything could go wrong... + except Exception as _: #IGNORE:W0703 everything could go wrong... logger = logging.getLogger('threadpool') logger.warning('Error while delivering return value to callback function') class Worker(Thread): ''' - A worker thread handling jobs in the thread pool + A worker thread handling jobs in the thread pool job queue ''' - + def __init__(self, pool): Thread.__init__(self) - + if (not isinstance(pool, ThreadPool)): raise TypeError("pool is not a ThreadPool instance") - + self.pool = pool - + self.alive = True self.start() - + def run(self): ''' - The workers main-loop getting jobs from queue + The workers main-loop getting jobs from queue and executing them ''' while self.alive: @@ -130,83 +125,83 @@ class ThreadPool: self.pool.worker_inactive() else: self.alive = False - + self.pool.punch_out() - + def __init__(self, max_workers = 5, kill_workers_after = 3): if (not isinstance(max_workers, int)): raise TypeError("max_workers is not an int") if (max_workers < 1): raise ValueError('max_workers must be >= 1') - + if (not isinstance(kill_workers_after, int)): raise TypeError("kill_workers_after is not an int") - + self.__max_workers = max_workers self.__kill_workers_after = kill_workers_after - + # This Queue is assumed Thread Safe self.__jobs = Queue() - - self.__worker_count_lock = RLock() + + self.__worker_count_lock = RLock() self.__worker_count = 0 self.__active_worker_count = 0 - + self.__shutting_down = False logger = logging.getLogger('threadpool') logger.info('started') - + def shutdown(self, wait_for_workers_period = 1, clean_shutdown_reties = 5): if (not isinstance(clean_shutdown_reties, int)): raise TypeError("clean_shutdown_reties is not an int") if (not clean_shutdown_reties >= 0): raise ValueError('clean_shutdown_reties must be >= 0') - + if (not isinstance(wait_for_workers_period, int)): raise TypeError("wait_for_workers_period is not an int") if (not wait_for_workers_period >= 0): raise ValueError('wait_for_workers_period must be >= 0') - + logger = logging.getLogger("threadpool") logger.info("shutting down") - + with self.__worker_count_lock: self.__shutting_down = True self.__max_workers = 0 self.__kill_workers_after = 0 - + retries_left = clean_shutdown_reties while (retries_left > 0): - + with self.__worker_count_lock: logger.info("waiting for workers to shut down (%i), %i workers left"%(retries_left, self.__worker_count)) if (self.__worker_count > 0): retries_left -= 1 else: retries_left = 0 - + sleep(wait_for_workers_period) - - + + with self.__worker_count_lock: if (self.__worker_count > 0): logger.warning("shutdown stopped waiting. Still %i active workers"%self.__worker_count) clean_shutdown = False else: clean_shutdown = True - + logger.info("shutdown complete") - + return clean_shutdown - + def punch_out(self): ''' - Called by worker to update worker count + Called by worker to update worker count when the worker is shutting down ''' with self.__worker_count_lock: self.__worker_count -= 1 - + def __new_worker(self): ''' Adding a new worker thread to the thread pool @@ -214,58 +209,58 @@ class ThreadPool: with self.__worker_count_lock: ThreadPool.Worker(self) self.__worker_count += 1 - + def worker_active(self): with self.__worker_count_lock: self.__active_worker_count = self.__active_worker_count + 1 - + def worker_inactive(self): with self.__worker_count_lock: self.__active_worker_count = self.__active_worker_count - 1 - + def add_job(self, function, args = None, return_callback=None): ''' Put new job into queue ''' - + if (not callable(function)): raise TypeError("function is not a callable") if (not ( args == None or isinstance(args, list))): raise TypeError("args is not a list") if (not (return_callback == None or callable(return_callback))): raise TypeError("return_callback is not a callable") - + if (args == None): args = [] - + job = ThreadPool.Job(function, args, return_callback) - + with self.__worker_count_lock: if (self.__shutting_down): raise AddJobException("ThreadPool is shutting down") - + try: start_new_worker = False if (self.__worker_count < self.__max_workers): if (self.__active_worker_count == self.__worker_count): start_new_worker = True - + self.__jobs.put(job) - - if (start_new_worker): + + if (start_new_worker): self.__new_worker() - + except Exception: raise AddJobException("Could not add job") - - + + def get_job(self): ''' - Retrieve next job from queue - workers die (and should) when - returning None + Retrieve next job from queue + workers die (and should) when + returning None ''' - + job = None try: if (self.__kill_workers_after < 0): @@ -276,5 +271,5 @@ class ThreadPool: job = self.__jobs.get(True, self.__kill_workers_after) except Empty: job = None - + return job diff --git a/trimage/ThreadPool/__init__.py b/trimage/ThreadPool/__init__.py new file mode 100644 index 0000000..86974f0 --- /dev/null +++ b/trimage/ThreadPool/__init__.py @@ -0,0 +1 @@ +from .ThreadPool import ThreadPool, ThreadPoolMixIn diff --git a/src/trimage/__init__.py b/trimage/__init__.py similarity index 100% rename from src/trimage/__init__.py rename to trimage/__init__.py diff --git a/src/trimage/pixmaps/compressing.gif b/trimage/pixmaps/compressing.gif similarity index 100% rename from src/trimage/pixmaps/compressing.gif rename to trimage/pixmaps/compressing.gif diff --git a/src/trimage/pixmaps/list-add.png b/trimage/pixmaps/list-add.png similarity index 100% rename from src/trimage/pixmaps/list-add.png rename to trimage/pixmaps/list-add.png diff --git a/src/trimage/pixmaps/trimage-icon.png b/trimage/pixmaps/trimage-icon.png similarity index 100% rename from src/trimage/pixmaps/trimage-icon.png rename to trimage/pixmaps/trimage-icon.png diff --git a/src/trimage/pixmaps/view-refresh.png b/trimage/pixmaps/view-refresh.png similarity index 100% rename from src/trimage/pixmaps/view-refresh.png rename to trimage/pixmaps/view-refresh.png diff --git a/trimage/tools.py b/trimage/tools.py new file mode 100644 index 0000000..98e0218 --- /dev/null +++ b/trimage/tools.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 + +import sys +import errno +from subprocess import call, PIPE + + +def check_dependencies(): + """Check if the required command line apps exist.""" + status = True + dependencies = { + "jpegoptim": "--version", + "optipng": "-v", + "advpng": "--version", + "pngcrush": "-version" + } + + for elt in dependencies: + retcode = safe_call(elt + " " + dependencies[elt]) + if retcode != 0: + status = False + print("[error] please install {}".format(elt), file=sys.stderr) + + return status + + +def safe_call(command): + """Cross-platform command-line check.""" + while True: + try: + return call(command, shell=True, stdout=PIPE) + except OSError as e: + if e.errno == errno.EINTR: + continue + else: + raise + + +def human_readable_size(num, suffix="B"): + """Bytes to a readable size format""" + for unit in ["", "K", "M", "G", "T", "P", "E", "Z"]: + if abs(num) < 1024.0: + return "%3.1f%s%s" % (num, unit, suffix) + num /= 1024.0 + return "%.1f%s%s" % (num, "Y", suffix) diff --git a/src/trimage/trimage.py b/trimage/trimage.py similarity index 70% rename from src/trimage/trimage.py rename to trimage/trimage.py index 84b13a0..b618b4b 100644 --- a/src/trimage/trimage.py +++ b/trimage/trimage.py @@ -1,32 +1,27 @@ -#!/usr/bin/python +#!/usr/bin/env python3 + import time import sys -import errno -from os import listdir -from os import path -from os import remove -from os import access -from os import W_OK as WRITEABLE +from os import listdir, path, remove, access, W_OK from shutil import copy -from subprocess import call, PIPE + from optparse import OptionParser - -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from filesize import * -from imghdr import what as determinetype - -from Queue import Queue -from ThreadPool import ThreadPool from multiprocessing import cpu_count +from queue import Queue +from PyQt5.QtCore import * +from PyQt5.QtGui import * +from PyQt5.QtWidgets import * + +from ThreadPool import ThreadPool from ui import Ui_trimage - -VERSION = "1.0.5" +from tools import * -class StartQT4(QMainWindow): +VERSION = "1.0.6" + +class StartQt(QMainWindow): def __init__(self, parent=None): QWidget.__init__(self, parent) self.ui = Ui_trimage() @@ -40,13 +35,14 @@ class StartQT4(QMainWindow): QCoreApplication.setOrganizationDomain("trimage.org") QCoreApplication.setApplicationName("Trimage") self.settings = QSettings() - self.restoreGeometry(self.settings.value("geometry").toByteArray()) + if self.settings.value("geometry"): + self.restoreGeometry(self.settings.value("geometry")) - # check if apps are installed - if self.checkapps(): + # check if dependencies are installed + if not check_dependencies(): quit() - #add quit shortcut + # add quit shortcut if hasattr(QKeySequence, "Quit"): self.quit_shortcut = QShortcut(QKeySequence(QKeySequence.Quit), self) @@ -55,23 +51,17 @@ class StartQT4(QMainWindow): # disable recompress self.ui.recompress.setEnabled(False) - #self.ui.recompress.hide() # make a worker thread self.thread = Worker() # connect signals with slots - QObject.connect(self.ui.addfiles, SIGNAL("clicked()"), - self.file_dialog) - QObject.connect(self.ui.recompress, SIGNAL("clicked()"), - self.recompress_files) - QObject.connect(self.quit_shortcut, SIGNAL("activated()"), - qApp, SLOT('quit()')) - QObject.connect(self.ui.processedfiles, SIGNAL("fileDropEvent"), - self.file_drop) - QObject.connect(self.thread, SIGNAL("finished()"), self.update_table) - QObject.connect(self.thread, SIGNAL("terminated()"), self.update_table) - QObject.connect(self.thread, SIGNAL("updateUi"), self.update_table) + self.ui.addfiles.clicked.connect(self.file_dialog) + self.ui.recompress.clicked.connect(self.recompress_files) + self.quit_shortcut.activated.connect(self.close) + self.ui.processedfiles.drop_event_signal.connect(self.file_drop) + self.thread.finished.connect(self.update_table) + self.thread.update_ui_signal.connect(self.update_table) self.compressing_icon = QIcon(QPixmap(self.ui.get_image("pixmaps/compressing.gif"))) @@ -82,11 +72,11 @@ class StartQT4(QMainWindow): self.systemtray = Systray(self) def commandline_options(self): - self.cli = False """Set up the command line options.""" + self.cli = False parser = OptionParser(version="%prog " + VERSION, description="GUI front-end to compress png and jpg images via " - "optipng, advpng and jpegoptim") + "advpng, jpegoptim, optipng and pngcrush") parser.set_defaults(verbose=True) parser.add_option("-v", "--verbose", action="store_true", @@ -103,14 +93,14 @@ class StartQT4(QMainWindow): # make sure we quit after processing finished if using cli if options.filename or options.directory: - QObject.connect(self.thread, SIGNAL("finished()"), quit) + self.thread.finished.connect(quit) self.cli = True # send to correct function if options.filename: - self.file_from_cmd(options.filename.decode("utf-8")) + self.file_from_cmd(options.filename) if options.directory: - self.dir_from_cmd(options.directory.decode("utf-8")) + self.dir_from_cmd(options.directory) self.verbose = options.verbose @@ -143,11 +133,12 @@ class StartQT4(QMainWindow): def file_dialog(self): """Open a file dialog and send the selected images to compress_file.""" fd = QFileDialog(self) - fd.restoreState(self.settings.value("fdstate").toByteArray()) - directory = self.settings.value("directory", QVariant("")).toString() + if (self.settings.value("fdstate")): + fd.restoreState(self.settings.value("fdstate")) + directory = self.settings.value("directory", QVariant("")) fd.setDirectory(directory) - images = fd.getOpenFileNames(self, + images, _ = fd.getOpenFileNames(self, "Select one or more image files to compress", directory, # this is a fix for file dialog differentiating between cases @@ -155,8 +146,8 @@ class StartQT4(QMainWindow): self.settings.setValue("fdstate", QVariant(fd.saveState())) if images: - self.settings.setValue("directory", QVariant(path.dirname(unicode(images[0])))) - self.delegator([unicode(fullpath) for fullpath in images]) + self.settings.setValue("directory", QVariant(path.dirname(images[0]))) + self.delegator([fullpath for fullpath in images]) def recompress_files(self): """Send each file in the current file list to compress_file again.""" @@ -173,15 +164,15 @@ class StartQT4(QMainWindow): delegatorlist = [] for fullpath in images: try: # recompress images already in the list - image = (i.image for i in self.imagelist - if i.image.fullpath == fullpath).next() + image = next(i.image for i in self.imagelist + if i.image.fullpath == fullpath) if image.compressed: image.reset() image.recompression = True delegatorlist.append(image) except StopIteration: - if not path.isdir(fullpath): - self. add_image(fullpath, delegatorlist) + if not path.isdir(fullpath): + self.add_image(fullpath, delegatorlist) else: self.walk(fullpath, delegatorlist) @@ -191,7 +182,7 @@ class StartQT4(QMainWindow): def walk(self, dir, delegatorlist): """ - Walks a directory, and executes a callback on each file + Walks a directory, and executes a callback on each file. """ dir = path.abspath(dir) for file in [file for file in listdir(dir) if not file in [".","..",".svn",".git",".hg",".bzr",".cvs"]]: @@ -204,7 +195,7 @@ class StartQT4(QMainWindow): def add_image(self, fullpath, delegatorlist): """ - Adds an image file to the delegator list and update the tray and the title of the window + Adds an image file to the delegator list and update the tray and the title of the window. """ image = Image(fullpath) if image.valid: @@ -214,7 +205,7 @@ class StartQT4(QMainWindow): self.systemtray.trayIcon.setToolTip("Trimage image compressor (" + str(len(self.imagelist)) + " files)") self.setWindowTitle("Trimage image compressor (" + str(len(self.imagelist)) + " files)") else: - print >> sys.stderr, u"[error] %s not a supported image file and/or not writeable" % image.fullpath + print("[error] {} not a supported image file and/or not writable".format(image.fullpath), file=sys.stderr) """ UI Functions @@ -247,52 +238,12 @@ class StartQT4(QMainWindow): # enable recompress button self.enable_recompress() - """ - Helper functions - """ - def enable_recompress(self): """Enable the recompress button.""" self.ui.recompress.setEnabled(True) if QSystemTrayIcon.isSystemTrayAvailable() and not self.cli: self.systemtray.recompress.setEnabled(True) - def checkapps(self): - """Check if the required command line apps exist.""" - exe = ".exe" if (sys.platform == "win32") else "" - status = False - retcode = self.safe_call("jpegoptim" + exe + " --version") - if retcode != 0: - status = True - sys.stderr.write("[error] please install jpegoptim") - - retcode = self.safe_call("optipng" + exe + " -v") - if retcode != 0: - status = True - sys.stderr.write("[error] please install optipng") - - retcode = self.safe_call("advpng" + exe + " --version") - if retcode != 0: - status = True - sys.stderr.write("[error] please install advancecomp") - - retcode = self.safe_call("pngcrush" + exe + " -version") - if retcode != 0: - status = True - sys.stderr.write("[error] please install pngcrush") - return status - - def safe_call(self, command): - """ cross-platform command-line check """ - while True: - try: - return call(command, shell=True, stdout=PIPE) - except OSError, e: - if e.errno == errno.EINTR: - continue - else: - raise - def hide_main_window(self): if self.isVisible(): self.hide() @@ -309,7 +260,6 @@ class StartQT4(QMainWindow): class TriTableModel(QAbstractTableModel): - def __init__(self, parent, imagelist, header, *args): """ @param parent Qt parent object. @@ -351,15 +301,15 @@ class TriTableModel(QAbstractTableModel): class ImageRow: - def __init__(self, image, waitingIcon=None): - """ Build the information visible in the table image row. """ + """Build the information visible in the table image row.""" self.image = image + d = { - 'shortname': lambda i: self.statusStr() % i.shortname, - 'oldfilesizestr': lambda i: size(i.oldfilesize, system=alternative) + '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: size(i.newfilesize, system=alternative) + 'newfilesizestr': lambda i: human_readable_size(i.newfilesize) if i.compressed else "", 'ratiostr': lambda i: "%.1f%%" % (100 - (float(i.newfilesize) / i.oldfilesize * 100)) @@ -367,7 +317,7 @@ class ImageRow: 'icon': lambda i: i.icon if i.compressed else waitingIcon, 'fullpath': lambda i: i.fullpath, #only used by cli } - names = ['shortname', 'oldfilesizestr', 'newfilesizestr', + names = ['filename_w_ext', 'oldfilesizestr', 'newfilesizestr', 'ratiostr', 'icon'] for i, n in enumerate(names): d[i] = d[n] @@ -375,47 +325,40 @@ class ImageRow: self.d = d def statusStr(self): - """ Set the status message. """ + """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 "%s" + return "Queued {0}..." + return "{0}" def __getitem__(self, key): return self.d[key](self.image) class Image: - def __init__(self, fullpath): - """ gather image information. """ + """Gather image information.""" self.valid = False self.reset() self.fullpath = fullpath - if path.isfile(self.fullpath) and access(self.fullpath, WRITEABLE): - self.filetype = determinetype(self.fullpath) + self.filename_w_ext = path.basename(self.fullpath) + self.filename, self.filetype = path.splitext(self.filename_w_ext) + if path.isfile(self.fullpath) and access(self.fullpath, W_OK): + self.filetype = self.filetype[1:].lower() + if self.filetype == "jpg": + self.filetype = "jpeg" if self.filetype in ["jpeg", "png"]: oldfile = QFileInfo(self.fullpath) - self.shortname = oldfile.fileName() self.oldfilesize = oldfile.size() self.icon = QIcon(self.fullpath) self.valid = True - #def _determinetype(self): - # """ Determine the filetype of the file using imghdr. """ - # filetype = determinetype(self.fullpath) - # if filetype in ["jpeg", "png"]: - # self.filetype = filetype - # else: - # self.filetype = None - # return self.filetype - def reset(self): self.failed = False self.compressed = False @@ -423,19 +366,19 @@ class Image: self.recompression = False def compress(self): - """ Compress the image and return it to the thread. """ + """Compress the image and return it to the thread.""" if not self.valid: raise "Tried to compress invalid image (unsupported format or not \ file)" self.reset() self.compressing = True - exe = ".exe" if (sys.platform == "win32") else "" runString = { - "jpeg": u"jpegoptim" + exe + " -f --strip-all '%(file)s'", - "png": u"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'" + "jpeg": "jpegoptim -f --strip-all '%(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 - copy(self.fullpath, self.fullpath + '~') + # create a backup file + backupfullpath = '/tmp/' + self.filename_w_ext + copy(self.fullpath, backupfullpath) try: retcode = call(runString[self.filetype] % {"file": self.fullpath}, shell=True, stdout=PIPE) @@ -445,13 +388,13 @@ class Image: self.newfilesize = QFile(self.fullpath).size() self.compressed = True - # Checks the new file and copy the backup + # checks the new file and copy the backup if self.newfilesize >= self.oldfilesize: - copy(self.fullpath + '~', self.fullpath) + copy(backupfullpath, self.fullpath) self.newfilesize = self.oldfilesize - # Removes the backup file - remove(self.fullpath + '~') + # removes the backup file + remove(backupfullpath) else: self.failed = True self.compressing = False @@ -460,15 +403,13 @@ class Image: class Worker(QThread): + update_ui_signal = pyqtSignal() def __init__(self, parent=None): QThread.__init__(self, parent) 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: @@ -488,7 +429,7 @@ class Worker(QThread): tp._ThreadPool__jobs.empty()): image = self.toDisplay.get() - self.emit(SIGNAL("updateUi")) + self.update_ui_signal.emit() if not self.showapp and self.verbose: # we work via the commandline if image.retcode == 0: @@ -497,11 +438,10 @@ class Worker(QThread): + ir['oldfilesizestr'] + ", New Size: " + ir['newfilesizestr'] + ", Ratio: " + ir['ratiostr']) else: - print >> sys.stderr, u"[error] %s could not be compressed" % image.fullpath + print("[error] {} could not be compressed".format(image.fullpath), file=sys.stderr) class Systray(QWidget): - def __init__(self, parent): QWidget.__init__(self) self.parent = parent @@ -511,15 +451,14 @@ class Systray(QWidget): def createActions(self): self.quitAction = QAction(self.tr("&Quit"), self) - QObject.connect(self.quitAction, SIGNAL("triggered()"), - qApp, SLOT("quit()")) + self.quitAction.triggered.connect(self.parent.close) self.addFiles = QAction(self.tr("&Add and compress"), self) icon = QIcon() icon.addPixmap(QPixmap(self.parent.ui.get_image(("pixmaps/list-add.png"))), QIcon.Normal, QIcon.Off) self.addFiles.setIcon(icon) - QObject.connect(self.addFiles, SIGNAL("triggered()"), self.parent.file_dialog) + self.addFiles.triggered.connect(self.parent.file_dialog) self.recompress = QAction(self.tr("&Recompress"), self) icon2 = QIcon() @@ -527,10 +466,11 @@ class Systray(QWidget): QIcon.Normal, QIcon.Off) self.recompress.setIcon(icon2) self.recompress.setDisabled(True) - QObject.connect(self.addFiles, SIGNAL("triggered()"), self.parent.recompress_files) + + self.addFiles.triggered.connect(self.parent.recompress_files) self.hideMain = QAction(self.tr("&Hide window"), self) - QObject.connect(self.hideMain, SIGNAL("triggered()"), self.parent.hide_main_window) + self.hideMain.triggered.connect(self.parent.hide_main_window) def createTrayIcon(self): self.trayIconMenu = QMenu(self) @@ -550,7 +490,7 @@ class Systray(QWidget): if __name__ == "__main__": app = QApplication(sys.argv) - myapp = StartQT4() + myapp = StartQt() if myapp.showapp: myapp.show() diff --git a/src/trimage/ui.py b/trimage/ui.py similarity index 81% rename from src/trimage/ui.py rename to trimage/ui.py index 47937da..6544c58 100644 --- a/src/trimage/ui.py +++ b/trimage/ui.py @@ -1,8 +1,16 @@ -from PyQt4.QtCore import * -from PyQt4.QtGui import * +#!/usr/bin/env python3 + from os import path +from PyQt5.QtCore import * +from PyQt5.QtGui import * +from PyQt5.QtWidgets import * + + class TrimageTableView(QTableView): + + drop_event_signal = pyqtSignal(list) + """Init the table drop event.""" def __init__(self, parent=None): super(TrimageTableView, self).__init__(parent) @@ -21,19 +29,19 @@ class TrimageTableView(QTableView): event.accept() filelist = [] for url in event.mimeData().urls(): - filelist.append(unicode(url.toLocalFile())) + filelist.append(url.toLocalFile()) - self.emit(SIGNAL("fileDropEvent"), (filelist)) + self.drop_event_signal.emit(filelist) -class Ui_trimage(object): +class Ui_trimage(): def get_image(self, image): - """ Get the correct link to the images used in the UI """ + """Get the correct link to the images used in the UI.""" imagelink = path.join(path.dirname(path.dirname(path.realpath(__file__))), "trimage/" + image) return imagelink def setupUi(self, trimage): - """ Setup the entire UI """ + """Setup the entire UI.""" trimage.setObjectName("trimage") trimage.resize(600, 170) @@ -44,7 +52,7 @@ class Ui_trimage(object): self.centralwidget.setObjectName("centralwidget") self.gridLayout_2 = QGridLayout(self.centralwidget) - self.gridLayout_2.setMargin(0) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setSpacing(0) self.gridLayout_2.setObjectName("gridLayout_2") @@ -60,7 +68,7 @@ class Ui_trimage(object): self.verticalLayout = QVBoxLayout(self.widget) self.verticalLayout.setSpacing(0) - self.verticalLayout.setMargin(0) + self.verticalLayout.setContentsMargins(0, 0, 0, 0) self.verticalLayout.setObjectName("verticalLayout") self.frame = QFrame(self.widget) @@ -68,12 +76,12 @@ class Ui_trimage(object): self.verticalLayout_2 = QVBoxLayout(self.frame) self.verticalLayout_2.setSpacing(0) - self.verticalLayout_2.setMargin(0) + self.verticalLayout_2.setContentsMargins(0, 0, 0, 0) self.verticalLayout_2.setObjectName("verticalLayout_2") self.horizontalLayout = QHBoxLayout() self.horizontalLayout.setSpacing(0) - self.horizontalLayout.setMargin(10) + self.horizontalLayout.setContentsMargins(10, 10, 10, 10) self.horizontalLayout.setObjectName("horizontalLayout") self.addfiles = QPushButton(self.frame) @@ -93,7 +101,7 @@ class Ui_trimage(object): font.setPointSize(8) self.label.setFont(font) self.label.setFrameShadow(QFrame.Plain) - self.label.setMargin(1) + self.label.setContentsMargins(1, 1, 1, 1) self.label.setIndent(10) self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) @@ -141,26 +149,24 @@ class Ui_trimage(object): QMetaObject.connectSlotsByName(trimage) def retranslateUi(self, trimage): - """ Fill in the texts for all UI elements """ + """Fill in the texts for all UI elements.""" trimage.setWindowTitle(QApplication.translate("trimage", - "Trimage image compressor", None, QApplication.UnicodeUTF8)) + "Trimage image compressor", None)) self.addfiles.setToolTip(QApplication.translate("trimage", - "Add file to the compression list", None, - QApplication.UnicodeUTF8)) + "Add file to the compression list", None)) self.addfiles.setText(QApplication.translate("trimage", - "&Add and compress", None, QApplication.UnicodeUTF8)) + "&Add and compress", None)) self.addfiles.setShortcut(QApplication.translate("trimage", - "Alt+A", None, QApplication.UnicodeUTF8)) + "Alt+A", None)) self.label.setText(QApplication.translate("trimage", - "Drag and drop images onto the table", None, - QApplication.UnicodeUTF8)) + "Drag and drop images onto the table", None)) self.recompress.setToolTip(QApplication.translate("trimage", - "Recompress all images", None, QApplication.UnicodeUTF8)) + "Recompress all images", None)) self.recompress.setText(QApplication.translate("trimage", - "&Recompress", None, QApplication.UnicodeUTF8)) + "&Recompress", None)) self.recompress.setShortcut(QApplication.translate("trimage", - "Alt+R", None, QApplication.UnicodeUTF8)) + "Alt+R", None)) self.processedfiles.setToolTip(QApplication.translate("trimage", - "Drag files in here", None, QApplication.UnicodeUTF8)) + "Drag files in here", None)) self.processedfiles.setWhatsThis(QApplication.translate("trimage", - "Drag files in here", None, QApplication.UnicodeUTF8)) + "Drag files in here", None)) diff --git a/website/index.html b/website/index.html index beada69..0e7995a 100644 --- a/website/index.html +++ b/website/index.html @@ -1,13 +1,18 @@ - + Trimage (lossless) image compressor - + - -
-

Trimage image compressor – 1.0.5

- A cross-platform tool for losslessly optimizing PNG and JPG files. -

Trimage is a cross-platform GUI and command-line interface to optimize image - files for websites, using optipng, pngcrush, - advpng and - jpegoptim, depending on the filetype - (currently, PNG and JPG files are supported). It was inspired by - imageoptim. All image files are losslessy compressed - on the highest available compression levels, and EXIF and other metadata is removed. Trimage gives you various input functions to fit your - own workflow: A regular file dialog, dragging and dropping and various command line options.

+ +
+

+ Trimage image compressor – + 1.0.6 +

+ A cross-platform tool for losslessly optimizing PNG and JPG files for + web. +

+ Trimage is a cross-platform GUI and command-line interface to optimize + image files for websites, using + optipng, + pngcrush, + advpng + and jpegoptim, + depending on the filetype (currently, PNG and JPG files are supported). + It was inspired by + imageoptim. All image files + are losslessy compressed on the highest available compression levels, + and EXIF and other metadata is removed. Trimage gives you various input + functions to fit your own workflow: A regular file dialog, dragging and + dropping and various command line options. +

-

Trimage in action

- a screenshot of Trimage +

Trimage in action

+ a screenshot of Trimage -
-

Download

+
+

Download

-

Debian (sid)

-

Trimage is available in the official Debian Sid repositories:

-
    -
  1. sudo apt-get install trimage
    2. -
+

Debian (sid)

+

Trimage is available in the official Debian Sid repositories:

+
    +
  1. sudo apt-get install trimage
    2. +
-

Ubuntu

-

If you're on Natty (11.04), Trimage is available in the official repositories:

- Download for Ubuntu button -

Alternatively:

-
    -
  1. sudo apt-get install trimage
    2. -
-

If you're on Maveric (10.10), Karmic (9.10) or Lucid (10.04), type the following commands into your console:

-
    -
  1. sudo add-apt-repository ppa:kilian/trimage
    2. -
  2. sudo apt-get update
    3. -
  3. sudo apt-get install trimage
    4. -
-

If you are still on Jaunty, read this guide on installing PPA's.

+

Ubuntu

+

Trimage is available in the official repositories:

+ Download for Ubuntu +

Alternatively:

+
    +
  1. sudo apt-get install trimage
    2. +
-

Arch Linux

- Trimage is available from AUR, to install, type: -
    -
  1. yaourt -S trimage-git
    2. -
-

Mandriva Linux 2010.1

- Trimage is available Via two RPMs provided by Mandriva international backports -
    -
  1. Trimage 1.0.5 32bit
    2. -
  2. Trimage 1.0.5 63bit
    3. -
-

OpenSuse

-

Trimage is available for a variety of versions: 11.3, 11.4 and Factory and SLE. You can find them on software.opensuse.org.

+

Arch Linux

+ Trimage is available from AUR, to install, type: +
    +
  1. yaourt -S trimage
    2. +
-

Other *nix

-
    -
  1. Download the source via git or bzr (see repositories)
    2. -
  2. Make sure you have all the requirements installed (see requirements)
    3. -
  3. Enter python setup.py install into your console
    4. -
  4. Launch by executing trimage
    5. -
-

Help us make .deb's, rpms's etc: contact us

-

Mac

-

Trimage should be able to run on Mac. Help us with this

-

Windows

-

Trimage should be able to run on Windows. Help us with this

+

macOS

+ Trimage is available from Homebrew, to install, type: +
    +
  1. brew install trimage
    2. +
+

Launch by executing trimage in Terminal.app

+ +

Other *nix

+
    +
  1. Download the source via git or bzr (see repositories)
    2. +
  2. + Make sure you have all the requirements installed (see requirements) +
    3. +
  3. Enter python setup.py install into your console
    4. +
  4. Launch by executing trimage
    5. +
+

+ Help us make .snaps, .appimages etc: + contact us or + open a pull request +

+ +
+
+

Repositories

+

+ Git: Trimage is primarily developed on + GitHub. +

+

+ Bzr: Trimage is also available on + Launchpad. +

+

Trimage is MIT licenced. We encourage contributions via GitHub.

+
+
+

Thanks

+

The following people helped develop Trimage:

+
    +
  • Hugo Posnic
    • +
  • Neil Wallace
    • +
  • Jeroen Goudsmit
    • +
  • Tarnay Kálmán
    • +
  • Thomas Lété
    • +
  • Kyrill Detinov
    • +
+
+
+

Requirements

+
    +
  • python 3
    • +
  • python-qt5 5
    • +
  • optipng 0.6.2.1
    • +
  • pngcrush 1.6.7
    • +
  • advancecomp 1.15
    • +
  • jpegoptim 1.2.2
    • +
+
+ +
+

Command line options

+
+
--version
+
show program's version number and exit
+
-h, --help
+
show this help message and exit
+
-v, --verbose
+
Verbose mode (default)
+
-q, --quiet
+
Quiet mode
+
-f FILENAME, --file=FILENAME
+
compresses image and exit
+
-d DIRECTORY, --directory=DIRECTORY
+
compresses images in directory and exit
+
+
+
+

Help

+

+ Please use GitHub for + reporting bugs and email + help@trimage.org for general + questions (though we are not a helpdesk!) +

+
+

+ Trimage is © 2010–2019 + Kilian Valkhof, + Paul Chaplin +

-
-

Repositories

-

Git: Trimage is primarily developed on GitHub.

-

Bzr: Trimage is also available on Launchpad.

-

Trimage is MIT licenced. We encourage contributions via GitHub.

-
-
-

Thanks

-

The following people helped develop Trimage:

-
    -
  • Neil Wallace
    • -
  • Jeroen Goudsmit
    • -
  • Tarnay Kálmán
    • -
  • Thomas Lété
    • -
  • Kyrill Detinov
    • -
-
-
-

Donate

-

If you enjoy using Trimage, please buy us a coffee or a beer :)

- Click here to lend your support to: Trimage and make a donation at www.pledgie.com ! - - -
-
-

Requirements

-
    -
  • python 2.6
    • -
  • python-qt4 4.4
    • -
  • optipng 0.6.2.1
    • -
  • pngcrush 1.6.7
    • -
  • advancecomp 1.15
    • -
  • jpegoptim 1.2.2
    • -
-
- -
-

Command line options

-
-
--version
-
show program's version number and exit
-
-h, --help
-
show this help message and exit
-
-v, --verbose
-
Verbose mode (default)
-
-q, --quiet
-
Quiet mode
-
-f FILENAME, --file=FILENAME
-
compresses image and exit
-
-d DIRECTORY, --directory=DIRECTORY
-
compresses images in directory and exit
-
-
-
-

Help

-

Please use GitHub for reporting bugs and email help@trimage.org for general questions (though we are not a helpdesk!)

-
- -

Planned features

-

Version 1.1.0 final:

-
    -
  • Expand command line options
    • -
  • General refactoring
    • -
-

Version 1.1.1 final:

-
    -
  • Use multiprocessing instead of threads
    • -
- -

Beyond that

-
    -
  • Deletion of rows in the table view
    • -
  • Integration with online services such as punypng
    • -
  • Suggest something
    • -
-

Trimage is © 2010 Kilian Valkhof, Paul Chaplin -

- diff --git a/website/mac.png b/website/mac.png deleted file mode 100644 index d25935a..0000000 Binary files a/website/mac.png and /dev/null differ diff --git a/website/macos.png b/website/macos.png new file mode 100644 index 0000000..120e1fd Binary files /dev/null and b/website/macos.png differ diff --git a/website/mandriva.png b/website/mandriva.png deleted file mode 100644 index b75f0e7..0000000 Binary files a/website/mandriva.png and /dev/null differ diff --git a/website/opensuse.png b/website/opensuse.png deleted file mode 100644 index 46dea9b..0000000 Binary files a/website/opensuse.png and /dev/null differ diff --git a/website/windows.png b/website/windows.png deleted file mode 100644 index 1b24e92..0000000 Binary files a/website/windows.png and /dev/null differ