arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

Removed dependencies on PIL. Man, I wish I had known about QImageReader sooner... That was a little stupid on my part not to look further than QImage.

Browse Source
This commit is contained in:
Virgil Dupras 2010-08-17 09:38:58 +02:00
parent e2f240ebc9
commit 89409c22d1
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -46,7 +46,6 @@ Windows prerequisites
- Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/) - Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
- PyQt 4.7 (http://www.riverbankcomputing.co.uk/news) - PyQt 4.7 (http://www.riverbankcomputing.co.uk/news)
- Python Imaging Library for dupeGuru PE. (http://www.pythonware.com/products/pil/)
- cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/) - cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/)
- Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/) - Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)

2
qt/me/start.py
View File

@ -6,6 +6,8 @@
# http://www.hardcoded.net/licenses/hs_license # http://www.hardcoded.net/licenses/hs_license
import sys import sys
import sip
sip.setapi('QVariant', 1)
from PyQt4.QtCore import QCoreApplication from PyQt4.QtCore import QCoreApplication
from PyQt4.QtGui import QApplication, QIcon, QPixmap from PyQt4.QtGui import QApplication, QIcon, QPixmap

13
qt/pe/app.py
View File

@ -9,8 +9,7 @@
import os.path as op import os.path as op
import logging import logging
from PyQt4.QtGui import QImage from PyQt4.QtGui import QImage, QImageReader
import PIL.Image
from hsutil.str import get_file_ext from hsutil.str import get_file_ext
@ -41,9 +40,13 @@ class File(fs.File):
fs.File._read_info(self, field) fs.File._read_info(self, field)
if field == 'dimensions': if field == 'dimensions':
try: try:
im = PIL.Image.open(str(self.path)) ir = QImageReader(str(self.path))
self.dimensions = im.size size = ir.size()
except IOError: if size.isValid():
self.dimensions = (size.width(), size.height())
else:
self.dimensions = (0, 0)
except EnvironmentError:
self.dimensions = (0, 0) self.dimensions = (0, 0)
logging.warning("Could not read image '%s'", str(self.path)) logging.warning("Could not read image '%s'", str(self.path))

4
qt/pe/start.py
View File

@ -6,6 +6,8 @@
# http://www.hardcoded.net/licenses/hs_license # http://www.hardcoded.net/licenses/hs_license
import sys import sys
import sip
sip.setapi('QVariant', 1)
from PyQt4.QtCore import QCoreApplication from PyQt4.QtCore import QCoreApplication
from PyQt4.QtGui import QApplication, QIcon, QPixmap from PyQt4.QtGui import QApplication, QIcon, QPixmap
@ -16,8 +18,6 @@ from app import DupeGuru
if sys.platform == 'win32': if sys.platform == 'win32':
import base.cxfreeze_fix import base.cxfreeze_fix
# This is a workaround for a cxfreeze problem where compiled dupeguru can't read tiff files
from PIL import TiffImagePlugin, TiffTags
if __name__ == "__main__": if __name__ == "__main__":
app = QApplication(sys.argv) app = QApplication(sys.argv)