public/kcc
1
0
Fork 0
mirror of https://github.com/ciromattia/kcc synced 2026-07-11 07:23:21 +00:00
Code Issues Releases Wiki Activity

Fixed merge

Browse Source
This commit is contained in:
Paweł Jastrzębski
2013-05-16 11:49:49 +02:00
parent 348dcc4275
commit b3681a3ceb
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -1
View File
@@ -134,7 +134,8 @@ The app relies and includes the following scripts/binaries:
Rarfile library updated to 2.6 Rarfile library updated to 2.6
Added GIF, TIFF and BMP to supported formats (#42) Added GIF, TIFF and BMP to supported formats (#42)
Filenames slugifications (#28, #31, #9, #8) Filenames slugifications (#28, #31, #9, #8)
- 2.10: Kindle Fire support (color ePub/Mobi) - 2.10: Kindle Fire support (color ePub/Mobi)
Panel View support for horizontal content
## COPYRIGHT ## COPYRIGHT
kcc/comic2ebook.py
+12 -5
View File
@@ -365,17 +365,17 @@ def dirImgProcess(path):
facing = "left" facing = "left"
img0 = image.ComicPage(split[0], options.profile) img0 = image.ComicPage(split[0], options.profile)
applyImgOptimization(img0, True, toRight1) applyImgOptimization(img0, True, toRight1)
img0.saveToDir(dirpath, options.forcepng) img0.saveToDir(dirpath, options.forcepng, options.forcecolor)
img1 = image.ComicPage(split[1], options.profile) img1 = image.ComicPage(split[1], options.profile)
applyImgOptimization(img1, True, toRight2) applyImgOptimization(img1, True, toRight2)
img1.saveToDir(dirpath, options.forcepng) img1.saveToDir(dirpath, options.forcepng, options.forcecolor)
else: else:
if facing == "right": if facing == "right":
facing = "left" facing = "left"
else: else:
facing = "right" facing = "right"
applyImgOptimization(img) applyImgOptimization(img)
img.saveToDir(dirpath, options.forcepng) img.saveToDir(dirpath, options.forcepng, options.forcecolor)
def genEpubStruct(path): def genEpubStruct(path):
@@ -609,7 +609,8 @@ def main(argv=None):
usage = "Usage: %prog [options] comic_file|comic_folder" usage = "Usage: %prog [options] comic_file|comic_folder"
parser = OptionParser(usage=usage, version=__version__) parser = OptionParser(usage=usage, version=__version__)
parser.add_option("-p", "--profile", action="store", dest="profile", default="KHD", parser.add_option("-p", "--profile", action="store", dest="profile", default="KHD",
help="Device profile (Choose one among K1, K2, K3, K4NT, K4T, KDX, KDXG or KHD) [Default=KHD]") help="Device profile (Choose one among K1, K2, K3, K4NT, K4T, KDX, KDXG, KHD, KF, KFHD, KFHD8) "
"[Default=KHD]")
parser.add_option("-t", "--title", action="store", dest="title", default="defaulttitle", parser.add_option("-t", "--title", action="store", dest="title", default="defaulttitle",
help="Comic title [Default=filename]") help="Comic title [Default=filename]")
parser.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False, parser.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
@@ -703,8 +704,14 @@ def checkOptions():
else: else:
#Virtual Panel View #Virtual Panel View
options.panelview = False options.panelview = False
if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX' or options.profile == 'KDXG': if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX' or options.profile == 'KDXG'\
or options.profile == 'KF' or options.profile == 'KFHD' or options.profile == 'KFHD8':
options.nopanelviewhq = True options.nopanelviewhq = True
if options.profile == 'KF' or options.profile == 'KFHD' or options.profile == 'KFHD8':
options.forcecolor = True
options.forcepng = False
else:
options.forcecolor = False
if options.panelviewhorizontal: if options.panelviewhorizontal:
options.panelview = True options.panelview = True
options.landscapemode = False options.landscapemode = False