alex/mangle
1
Fork 0
Code Releases 1 Activity

Fix bug where splitting pages resulted in out-of-order and over-written pages, rename imageFlags variables to be more intuitive

Browse Source
This commit is contained in:
Thomas Sullivan 2016-08-17 21:15:24 -04:00
parent d9a78e3379
commit 442662e65c
3 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mangle/convert.py
View File

@ -36,6 +36,7 @@ class DialogConvert(QtGui.QProgressDialog):
self.setWindowTitle('Exporting book...') self.setWindowTitle('Exporting book...')
self.setMaximum(len(self.book.images)) self.setMaximum(len(self.book.images))
self.setValue(0) self.setValue(0)
self.increment = 0
self.archive = None self.archive = None
if 'CBZ' in self.book.outputFormat: if 'CBZ' in self.book.outputFormat:
@ -79,7 +80,8 @@ class DialogConvert(QtGui.QProgressDialog):
def onTimer(self): def onTimer(self):
index = self.value() index = self.value()
target = os.path.join(self.bookPath, '%05d.png' % index) pages_split = self.increment
target = os.path.join(self.bookPath, '%05d.png' % (index + pages_split))
source = unicode(self.book.images[index]) source = unicode(self.book.images[index])
if index == 0: if index == 0:
@ -121,30 +123,34 @@ class DialogConvert(QtGui.QProgressDialog):
archive = self.archive archive = self.archive
pdf = self.pdf pdf = self.pdf
# Maybe the user ask for a split, but the picture is not a large one, so skip # Check if page wide enough to split
# it but only for this picture if (flags & ImageFlags.SplitRightLeft) or (flags & ImageFlags.SplitLeftRight):
if (flags & ImageFlags.Split) or (flags & ImageFlags.SplitInverse):
if not image.isSplitable(source): if not image.isSplitable(source):
# remove split flags # remove split flags
splitFlags= [ImageFlags.Split, ImageFlags.SplitInverse, ImageFlags.SplitRight, ImageFlags.SplitLeft] splitFlags = [ImageFlags.SplitRightLeft, ImageFlags.SplitLeftRight, ImageFlags.SplitRight,
ImageFlags.SplitLeft]
for f in splitFlags: for f in splitFlags:
flags &= ~f flags &= ~f
# For right page (if requested in options and need for this image) # For right page (if requested in options and need for this image)
if (flags & ImageFlags.Split): if flags & ImageFlags.SplitRightLeft:
# New path based on modified index self.convertAndSave(source, target, device,
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 0)) flags ^ ImageFlags.SplitRightLeft | ImageFlags.SplitRight,
self.convertAndSave(source, target, device, flags ^ ImageFlags.Split | ImageFlags.SplitRight, archive, pdf) archive, pdf)
# Change target once again for left page
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 1)) # Change target for left page
target = os.path.join(self.bookPath, '%05d.png' % (index + pages_split + 1))
self.increment += 1
# For right page (if requested), but in inverted mode # For right page (if requested), but in inverted mode
if (flags & ImageFlags.SplitInverse): if flags & ImageFlags.SplitLeftRight:
# New path based on modified index self.convertAndSave(source, target, device,
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 0)) flags ^ ImageFlags.SplitLeftRight | ImageFlags.SplitLeft,
self.convertAndSave(source, target, device, flags ^ ImageFlags.SplitInverse | ImageFlags.SplitLeft, archive, pdf) archive, pdf)
# Change target once again for left page
target = os.path.join(self.bookPath, '%05d.png' % (index * 2 + 1)) # Change target for left page
target = os.path.join(self.bookPath, '%05d.png' % (index + pages_split + 1))
self.increment += 1
# Convert page # Convert page
self.convertAndSave(source, target, device, flags, archive, pdf) self.convertAndSave(source, target, device, flags, archive, pdf)

25
mangle/image.py
View File

@ -25,11 +25,11 @@ class ImageFlags:
Frame = 1 << 2 Frame = 1 << 2
Quantize = 1 << 3 Quantize = 1 << 3
Stretch = 1 << 4 Stretch = 1 << 4
Split = 1 << 5 # split right then left SplitRightLeft = 1 << 5 # split right then left
SplitRight = 1 << 6 # split only the right page SplitRight = 1 << 6 # split only the right page
SplitLeft = 1 << 7 # split only the left page SplitLeft = 1 << 7 # split only the left page
SplitInverse = 1 << 8 # split left then right page SplitLeftRight = 1 << 8 # split left then right page
AutoCrop = 1 << 9 # split left then right page AutoCrop = 1 << 9
class KindleData: class KindleData:
@ -103,12 +103,14 @@ def protect_bad_image(func):
return func(*args, **kwargs) return func(*args, **kwargs)
except IOError: # Exception from PIL about bad image except IOError: # Exception from PIL about bad image
return args[0] return args[0]
return func_wrapper return func_wrapper
@protect_bad_image @protect_bad_image
def splitLeft(image): def splitLeft(image):
widthImg, heightImg = image.size widthImg, heightImg = image.size
return image.crop((0, 0, widthImg / 2, heightImg)) return image.crop((0, 0, widthImg / 2, heightImg))
@ -189,6 +191,7 @@ def autoCropImage(image):
except TypeError: # bad image, specific to chops except TypeError: # bad image, specific to chops
return image return image
image = image.crop((x0, y0, xend, yend)) image = image.crop((x0, y0, xend, yend))
return image return image
@ -254,29 +257,22 @@ def convertImage(source, target, device, flags):
# Load image from source path # Load image from source path
image = loadImage(source) image = loadImage(source)
# Format according to palette # Format according to palette
image = formatImage(image) image = formatImage(image)
# Apply flag transforms
# Second pass of first split # Apply flag transforms
if flags & ImageFlags.SplitRight: if flags & ImageFlags.SplitRight:
image = splitRight(image) image = splitRight(image)
# First pass of first split option if flags & ImageFlags.SplitRightLeft:
if (flags & ImageFlags.Split):
image = splitLeft(image) image = splitLeft(image)
# First pass of second splitting option
if flags & ImageFlags.SplitLeft: if flags & ImageFlags.SplitLeft:
image = splitLeft(image) image = splitLeft(image)
# second pass of second splitting option if flags & ImageFlags.SplitLeftRight:
if (flags & ImageFlags.SplitInverse):
image = splitRight(image) image = splitRight(image)
# Auto crop the image, but before manage size and co, clean the source so # Auto crop the image, but before manage size and co, clean the source so
if flags & ImageFlags.AutoCrop: if flags & ImageFlags.AutoCrop:
image = autoCropImage(image) image = autoCropImage(image)
if flags & ImageFlags.Orient: if flags & ImageFlags.Orient:
image = orientImage(image, size) image = orientImage(image, size)
if flags & ImageFlags.Resize: if flags & ImageFlags.Resize:
@ -285,9 +281,6 @@ def convertImage(source, target, device, flags):
image = stretchImage(image, size) image = stretchImage(image, size)
if flags & ImageFlags.Frame: if flags & ImageFlags.Frame:
image = frameImage(image, tuple(palette[:3]), tuple(palette[-3:]), size) image = frameImage(image, tuple(palette[:3]), tuple(palette[-3:]), size)
if flags & ImageFlags.Quantize: if flags & ImageFlags.Quantize:
image = quantizeImage(image, palette) image = quantizeImage(image, palette)

4
mangle/options.py
View File

@ -69,9 +69,9 @@ class DialogOptions(QtGui.QDialog):
if self.checkboxFrame.isChecked(): if self.checkboxFrame.isChecked():
imageFlags |= ImageFlags.Frame imageFlags |= ImageFlags.Frame
if self.checkboxSplit.isChecked(): if self.checkboxSplit.isChecked():
imageFlags |= ImageFlags.Split imageFlags |= ImageFlags.SplitRightLeft
if self.checkboxSplitInverse.isChecked(): if self.checkboxSplitInverse.isChecked():
imageFlags |= ImageFlags.SplitInverse imageFlags |= ImageFlags.SplitLeftRight
if self.checkboxAutoCrop.isChecked(): if self.checkboxAutoCrop.isChecked():
imageFlags |= ImageFlags.AutoCrop imageFlags |= ImageFlags.AutoCrop