Merge branch 'master' of git@host.fluxility.com:optimg

This commit is contained in:
Kilian Valkhof 2010-02-02 20:59:19 +01:00
commit fd4cdac0ba

View file

@ -1,6 +1,7 @@
import sys import sys
from os import system from os import system
from os import listdir from os import listdir
from os import path
from PyQt4.QtCore import * from PyQt4.QtCore import *
from PyQt4.QtGui import * from PyQt4.QtGui import *
from hurry.filesize import * from hurry.filesize import *
@ -54,7 +55,7 @@ class StartQT4(QMainWindow):
self.showapp = False self.showapp = False
imagedir = listdir(directory) imagedir = listdir(directory)
for image in imagedir: for image in imagedir:
image = directory + "/" + image image = path.join(directory, image)
name = QFileInfo(image).fileName() name = QFileInfo(image).fileName()
if self.checkname(name): if self.checkname(name):
self.compress_file(image) self.compress_file(image)