mirror of
https://github.com/Kilian/Trimage.git
synced 2026-01-26 18:08:42 -05:00
pep8 rewriting, version update, todo editing
This commit is contained in:
Kilian Valkhof
parent
0f5092e10b
commit
1106ca482c
4 changed files with 73 additions and 52 deletions
|
|
@ -33,3 +33,11 @@ later versions:
|
|||
again would currently try to recompress all 100, when only 10 would be
|
||||
worthy of trying to compress further.
|
||||
|
||||
|
||||
1.1.0 changes:
|
||||
- use multiprocessing for images
|
||||
- more robust file handling
|
||||
- re-adding images now results in recompressing them
|
||||
- compressing message now shows filename
|
||||
- wider array of status messages in the table
|
||||
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -3,7 +3,7 @@
|
|||
from distutils.core import setup
|
||||
|
||||
setup(name = "trimage",
|
||||
version = "1.0.0b3",
|
||||
version = "1.1.0b",
|
||||
description = "Trimage image compressor - A cross-platform tool for optimizing PNG and JPG files",
|
||||
author = "Kilian Valkhof, Paul Chaplin",
|
||||
author_email = "help@trimage.org",
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ from multiprocessing import cpu_count
|
|||
|
||||
from ui import Ui_trimage
|
||||
|
||||
VERSION = "1.0.0b3"
|
||||
VERSION = "1.1.0b"
|
||||
|
||||
|
||||
class StartQT4(QMainWindow):
|
||||
|
|
@ -148,7 +148,7 @@ class StartQT4(QMainWindow):
|
|||
"""
|
||||
delegatorlist = []
|
||||
for fullpath in images:
|
||||
try: # do not add already existing images again, recompress them instead
|
||||
try: # recompress images already in the list
|
||||
image = (i.image for i in self.imagelist
|
||||
if i.image.fullpath == fullpath).next()
|
||||
if image.compressed:
|
||||
|
|
@ -159,7 +159,8 @@ class StartQT4(QMainWindow):
|
|||
image = Image(fullpath)
|
||||
if image.valid:
|
||||
delegatorlist.append(image)
|
||||
self.imagelist.append(ImageRow(image,QIcon(QPixmap(self.ui.get_image("pixmaps/compressing.gif")))))
|
||||
icon = QIcon(QPixmap(self.ui.get_image("pixmaps/compressing.gif")))
|
||||
self.imagelist.append(ImageRow(image, icon))
|
||||
else:
|
||||
print >> sys.stderr, u"[error] %s not a supported image file" % image.fullpath
|
||||
|
||||
|
|
@ -237,6 +238,7 @@ class StartQT4(QMainWindow):
|
|||
else:
|
||||
raise
|
||||
|
||||
|
||||
class TriTableModel(QAbstractTableModel):
|
||||
|
||||
def __init__(self, parent, imagelist, header, *args):
|
||||
|
|
@ -278,29 +280,38 @@ class TriTableModel(QAbstractTableModel):
|
|||
return QVariant(self.header[col])
|
||||
return QVariant()
|
||||
|
||||
|
||||
class ImageRow:
|
||||
|
||||
def __init__(self, image, waitingIcon=None):
|
||||
""" 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) if i.compressed else "",
|
||||
'newfilesizestr': lambda i: size(i.newfilesize, system=alternative) if i.compressed else "",
|
||||
'oldfilesizestr': lambda i: size(i.oldfilesize, system=alternative)
|
||||
if i.compressed else "",
|
||||
'newfilesizestr': lambda i: size(i.newfilesize, system=alternative)
|
||||
if i.compressed else "",
|
||||
'ratiostr': lambda i:
|
||||
"%.1f%%" % (100 - (float(i.newfilesize) / i.oldfilesize * 100)) if i.compressed else "",
|
||||
"%.1f%%" % (100 - (float(i.newfilesize) / i.oldfilesize * 100))
|
||||
if i.compressed else "",
|
||||
'icon': lambda i: i.icon if i.compressed else waitingIcon,
|
||||
|
||||
'fullpath': lambda i: i.fullpath, #only used by cli
|
||||
}
|
||||
for i,n in enumerate(['shortname','oldfilesizestr','newfilesizestr','ratiostr','icon']):
|
||||
names = ['shortname', 'oldfilesizestr', 'newfilesizestr',
|
||||
'ratiostr', 'icon']
|
||||
for i, n in enumerate(names):
|
||||
d[i] = d[n]
|
||||
|
||||
self.d = d
|
||||
|
||||
def statusStr(self):
|
||||
""" Set the status message. """
|
||||
if self.image.failed:
|
||||
return "ERROR: %s"
|
||||
if self.image.compressing:
|
||||
return "In Progress..."
|
||||
message = "Compressing %s..."
|
||||
return message
|
||||
if not self.image.compressed and self.image.recompression:
|
||||
return "Queued for recompression..."
|
||||
if not self.image.compressed:
|
||||
|
|
@ -310,7 +321,9 @@ class ImageRow:
|
|||
def __getitem__(self, key):
|
||||
return self.d[key](self.image)
|
||||
|
||||
|
||||
class Image:
|
||||
|
||||
def __init__(self, fullpath):
|
||||
""" gather image information. """
|
||||
self.valid = False
|
||||
|
|
@ -343,7 +356,8 @@ class Image:
|
|||
def compress(self):
|
||||
""" Compress the image and return it to the thread. """
|
||||
if not self.valid:
|
||||
raise "Tried to compress invalid image (unsupported format or not file)"
|
||||
raise "Tried to compress invalid image (unsupported format or not \
|
||||
file)"
|
||||
self.reset()
|
||||
self.compressing = True
|
||||
runString = {
|
||||
|
|
@ -377,8 +391,10 @@ class Worker(QThread):
|
|||
def compress_file(self, images, showapp, verbose, imagelist):
|
||||
"""Start the worker thread."""
|
||||
for image in images:
|
||||
time.sleep(0.05) #FIXME: Workaround http://code.google.com/p/pythonthreadpool/issues/detail?id=5
|
||||
self.threadpool.add_job(image.compress, None, return_callback=self.toDisplay.put)
|
||||
#FIXME:http://code.google.com/p/pythonthreadpool/issues/detail?id=5
|
||||
time.sleep(0.05)
|
||||
self.threadpool.add_job(image.compress, None,
|
||||
return_callback=self.toDisplay.put)
|
||||
self.showapp = showapp
|
||||
self.verbose = verbose
|
||||
self.imagelist = imagelist
|
||||
|
|
@ -387,7 +403,8 @@ class Worker(QThread):
|
|||
def run(self):
|
||||
"""Compress the given file, get data from it and call update_table."""
|
||||
tp = self.threadpool
|
||||
while self.showapp or not (tp._ThreadPool__active_worker_count==0 and tp._ThreadPool__jobs.empty()):
|
||||
while self.showapp or not (tp._ThreadPool__active_worker_count == 0 and
|
||||
tp._ThreadPool__jobs.empty()):
|
||||
image = self.toDisplay.get()
|
||||
|
||||
self.emit(SIGNAL("updateUi"))
|
||||
|
|
@ -396,8 +413,8 @@ class Worker(QThread):
|
|||
if image.retcode == 0:
|
||||
ir = ImageRow(image)
|
||||
print("File: " + ir['fullpath'] + ", Old Size: "
|
||||
+ ir['oldfilesizestr'] + ", New Size: " + ir['newfilesizestr']
|
||||
+ ", Ratio: " + ir['ratiostr'])
|
||||
+ ir['oldfilesizestr'] + ", New Size: "
|
||||
+ ir['newfilesizestr'] + ", Ratio: " + ir['ratiostr'])
|
||||
else:
|
||||
print >> sys.stderr, u"[error] %s could not be compressed" % image.fullpath
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
|
||||
<body>
|
||||
<div id="wrap">
|
||||
<h1><img src="trimage-icon.png" alt=""> Trimage image compressor – 1.0.0b3 (beta)</h1>
|
||||
<h1><img src="trimage-icon.png" alt=""> Trimage image compressor – 1.1.0b (beta)</h1>
|
||||
<span class="subtitle">A cross-platform tool for losslessly optimizing PNG and JPG files.</span>
|
||||
<p class="tri">Trimage is a cross-platform GUI and command-line interface to optimize image
|
||||
files via <a href="http://optipng.sourceforge.net/">optipng</a>,
|
||||
|
|
@ -165,16 +165,12 @@
|
|||
</div>
|
||||
|
||||
<h2>Planned features</h2>
|
||||
<p>Version 1.0.0 final:</p>
|
||||
<p>Version 1.1.0 final:</p>
|
||||
<ul>
|
||||
<li>Expand command line options</li>
|
||||
<li>Make sure a compressed file is always smaller than the original one, or don't compress</li>
|
||||
<li>General refactoring</li>
|
||||
</ul>
|
||||
<p>Version 1.1.0</p>
|
||||
<ul>
|
||||
<li>Use multiprocessing instead of threading</li>
|
||||
</ul>
|
||||
<p>Beyond that</p>
|
||||
<ul>
|
||||
<li>Deletion of rows in the table view</li>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue