alex/mangle
1
Fork 0
Code Releases 1 Activity

Add: some code styling

Browse Source
This commit is contained in:
Gabès Jean 2015-10-07 21:50:47 +02:00
parent 1608f10fbd
commit 83251909b3
4 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mangle/book.py
View File

@ -36,21 +36,21 @@ def natural_key(string_):
class Book(object): class Book(object):
DefaultDevice = 'Kindle Paperwhite' DefaultDevice = 'Kindle Paperwhite'
DefaultOutputFormat = 'CBZ only' DefaultOutputFormat = 'CBZ only'
DefaultOverwrite = True DefaultOverwrite = True
DefaultImageFlags = ImageFlags.Orient | ImageFlags.Resize | ImageFlags.Quantize DefaultImageFlags = ImageFlags.Orient | ImageFlags.Resize | ImageFlags.Quantize
def __init__(self): def __init__(self):
self.images = [] self.images = []
self.filename = None self.filename = None
self.modified = False self.modified = False
self.title = None self.title = None
self.titleSet = False self.titleSet = False
self.device = Book.DefaultDevice self.device = Book.DefaultDevice
self.overwrite = Book.DefaultOverwrite self.overwrite = Book.DefaultOverwrite
self.imageFlags = Book.DefaultImageFlags self.imageFlags = Book.DefaultImageFlags
self.outputFormat = Book.DefaultOutputFormat self.outputFormat = Book.DefaultOutputFormat
@ -101,14 +101,14 @@ class Book(object):
if root.tagName() != 'book': if root.tagName() != 'book':
raise RuntimeError('Unexpected book format in file %s' % filename) raise RuntimeError('Unexpected book format in file %s' % filename)
self.title = root.attribute('title', 'Untitled') self.title = root.attribute('title', 'Untitled')
self.overwrite = root.attribute('overwrite', 'true' if Book.DefaultOverwrite else 'false') == 'true' self.overwrite = root.attribute('overwrite', 'true' if Book.DefaultOverwrite else 'false') == 'true'
self.device = root.attribute('device', Book.DefaultDevice) self.device = root.attribute('device', Book.DefaultDevice)
self.outputFormat = root.attribute('outputFormat', Book.DefaultOutputFormat) self.outputFormat = root.attribute('outputFormat', Book.DefaultOutputFormat)
self.imageFlags = int(root.attribute('imageFlags', str(Book.DefaultImageFlags))) self.imageFlags = int(root.attribute('imageFlags', str(Book.DefaultImageFlags)))
self.filename = filename self.filename = filename
self.modified = False self.modified = False
self.images = [] self.images = []
items = root.elementsByTagName('image') items = root.elementsByTagName('image')
if items is None: if items is None:

6
mangle/cbz.py
View File

@ -21,9 +21,9 @@ from zipfile import ZipFile, ZIP_STORED
class Archive(object): class Archive(object):
def __init__(self, path): def __init__(self, path):
outputDirectory = os.path.dirname(path) outputDirectory = os.path.dirname(path)
outputFileName = '%s.cbz' % os.path.basename(path) outputFileName = '%s.cbz' % os.path.basename(path)
outputPath = os.path.join(outputDirectory, outputFileName) outputPath = os.path.join(outputDirectory, outputFileName)
self.zipfile = ZipFile(outputPath, 'w', ZIP_STORED) self.zipfile = ZipFile(outputPath, 'w', ZIP_STORED)
def addFile(self, filename): def addFile(self, filename):

11
mangle/convert.py
View File

@ -16,10 +16,10 @@
import os import os
import shutil import shutil
from PyQt4 import QtGui, QtCore from PyQt4 import QtGui, QtCore
from image import ImageFlags
from image import ImageFlags
import cbz import cbz
import image import image
import pdfimage import pdfimage
@ -29,7 +29,7 @@ class DialogConvert(QtGui.QProgressDialog):
def __init__(self, parent, book, directory): def __init__(self, parent, book, directory):
QtGui.QProgressDialog.__init__(self) QtGui.QProgressDialog.__init__(self)
self.book = book self.book = book
self.bookPath = os.path.join(unicode(directory), unicode(self.book.title)) self.bookPath = os.path.join(unicode(directory), unicode(self.book.title))
self.timer = None self.timer = None
@ -121,7 +121,6 @@ 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 # Maybe the user ask for a split, but the picture is not a large one, so skip
# it but only for this picture # it but only for this picture
if (flags & ImageFlags.Split) or (flags & ImageFlags.SplitInverse): if (flags & ImageFlags.Split) or (flags & ImageFlags.SplitInverse):
@ -132,7 +131,7 @@ class DialogConvert(QtGui.QProgressDialog):
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.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)
@ -140,7 +139,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(flags & 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)

23
mangle/options.py
View File

@ -35,6 +35,7 @@ class DialogOptions(QtGui.QDialog):
self.moveDialogToOptions() self.moveDialogToOptions()
# Get options from current book (like a loaded one) and set the dialog values
def moveOptionsToDialog(self): def moveOptionsToDialog(self):
self.lineEditTitle.setText(self.book.title or 'Untitled') self.lineEditTitle.setText(self.book.title or 'Untitled')
self.comboBoxDevice.setCurrentIndex(max(self.comboBoxDevice.findText(self.book.device), 0)) self.comboBoxDevice.setCurrentIndex(max(self.comboBoxDevice.findText(self.book.device), 0))
@ -47,12 +48,15 @@ class DialogOptions(QtGui.QDialog):
self.checkboxFrame.setChecked(self.book.imageFlags & ImageFlags.Frame) self.checkboxFrame.setChecked(self.book.imageFlags & ImageFlags.Frame)
# Save parameters set on the dialogs to the book object if need
def moveDialogToOptions(self): def moveDialogToOptions(self):
title = self.lineEditTitle.text() # First get dialog values
device = self.comboBoxDevice.currentText() title = self.lineEditTitle.text()
device = self.comboBoxDevice.currentText()
outputFormat = self.comboBoxFormat.currentText() outputFormat = self.comboBoxFormat.currentText()
overwrite = self.checkboxOverwrite.isChecked() overwrite = self.checkboxOverwrite.isChecked()
# Now compute flags
imageFlags = 0 imageFlags = 0
if self.checkboxOrient.isChecked(): if self.checkboxOrient.isChecked():
imageFlags |= ImageFlags.Orient imageFlags |= ImageFlags.Orient
@ -69,6 +73,9 @@ class DialogOptions(QtGui.QDialog):
if self.checkboxSplitInverse.isChecked(): if self.checkboxSplitInverse.isChecked():
imageFlags |= ImageFlags.SplitInverse imageFlags |= ImageFlags.SplitInverse
# If we did modified a value, update the book
# and only if we did change something to not
# warn for nothing the user
modified = ( modified = (
self.book.title != title or self.book.title != title or
self.book.device != device or self.book.device != device or
@ -78,9 +85,9 @@ class DialogOptions(QtGui.QDialog):
) )
if modified: if modified:
self.book.modified = True self.book.modified = True
self.book.title = title self.book.title = title
self.book.device = device self.book.device = device
self.book.overwrite = overwrite self.book.overwrite = overwrite
self.book.imageFlags = imageFlags self.book.imageFlags = imageFlags
self.book.outputFormat = outputFormat self.book.outputFormat = outputFormat