alex/mangle
1
Fork 0
Code Releases 1 Activity

Merge pull request #23 from naparuba/master

Browse Source 
Add: do not split images that are not "double page"
This commit is contained in:
Alex Yatskov 2015-10-06 15:11:04 +09:00
commit e2f96a6271
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mangle/convert.py
View File

@ -121,8 +121,18 @@ class DialogConvert(QtGui.QProgressDialog):
archive = self.archive archive = self.archive
pdf = self.pdf pdf = self.pdf
# For right page (if requested)
if(self.book.imageFlags & ImageFlags.Split): # Maybe the user ask for a split, but the picture is not a large one, so skip
# it but only for this picture
if (flags & ImageFlags.Split) or (flags & ImageFlags.SplitInverse):
if not image.isSplitable(source):
# remove split flags
splitFlags= [ImageFlags.Split, ImageFlags.SplitInverse, ImageFlags.SplitRight, ImageFlags.SplitLeft]
for f in splitFlags:
flags &= ~f
# For right page (if requested in options and need for this image)
if(flags & ImageFlags.Split):
# New path based on modified index # New path based on modified index
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 0)) target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 0))
self.convertAndSave(source, target, device, flags ^ ImageFlags.Split | ImageFlags.SplitRight, archive, pdf) self.convertAndSave(source, target, device, flags ^ ImageFlags.Split | ImageFlags.SplitRight, archive, pdf)
@ -130,7 +140,7 @@ class DialogConvert(QtGui.QProgressDialog):
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 1)) target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 1))
# For right page (if requested), but in inverted mode # For right page (if requested), but in inverted mode
if(self.book.imageFlags & ImageFlags.SplitInverse): if(flags & ImageFlags.SplitInverse):
# New path based on modified index # New path based on modified index
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 0)) target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 0))
self.convertAndSave(source, target, device, flags ^ ImageFlags.SplitInverse | ImageFlags.SplitLeft, archive, pdf) self.convertAndSave(source, target, device, flags ^ ImageFlags.SplitInverse | ImageFlags.SplitLeft, archive, pdf)

12
mangle/image.py
View File

@ -221,6 +221,18 @@ def saveImage(image, target):
raise RuntimeError('Cannot write image file %s' % target) raise RuntimeError('Cannot write image file %s' % target)
# Look if the image is more width than hight, if not, means
# it's should not be split (like the front page of a manga,
# when all the inner pages are double)
def isSplitable(source):
image = loadImage(source)
try:
widthImg, heightImg = image.size
return widthImg > heightImg
except IOError:
raise RuntimeError('Cannot read image file %s' % source)
def convertImage(source, target, device, flags): def convertImage(source, target, device, flags):
try: try:
size, palette = KindleData.Profiles[device] size, palette = KindleData.Profiles[device]