diff --git a/KindleComicConverter.app/Contents/Info.plist b/KindleComicConverter.app/Contents/Info.plist
index 2115763..dde0c5b 100644
--- a/KindleComicConverter.app/Contents/Info.plist
+++ b/KindleComicConverter.app/Contents/Info.plist
@@ -59,7 +59,7 @@
savedFrame
144 338 889 690 0 0 1680 1028
selectedTabView
- result
+ event log
diff --git a/KindleComicConverter.app/Contents/Resources/Scripts/main.scpt b/KindleComicConverter.app/Contents/Resources/Scripts/main.scpt
index edd25dd..33780b1 100644
Binary files a/KindleComicConverter.app/Contents/Resources/Scripts/main.scpt and b/KindleComicConverter.app/Contents/Resources/Scripts/main.scpt differ
diff --git a/KindleComicConverter.app/Contents/Resources/comic2ebook.py b/KindleComicConverter.app/Contents/Resources/comic2ebook.py
index 0ccd616..2bef978 100755
--- a/KindleComicConverter.app/Contents/Resources/comic2ebook.py
+++ b/KindleComicConverter.app/Contents/Resources/comic2ebook.py
@@ -239,7 +239,7 @@ def Usage():
parser.print_help()
def main(argv=None):
- global parser, options
+ global parser, options, epub_path
usage = "Usage: %prog [options] comic_file|comic_folder"
parser = OptionParser(usage=usage, version=__version__)
parser.add_option("-p", "--profile", action="store", dest="profile", default="KHD",
@@ -250,14 +250,14 @@ def main(argv=None):
help="Split pages 'manga style' (right-to-left reading) [default=False]")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
help="Verbose output [default=False]")
- parser.add_option("-i", "--image-processing", action="store_false", dest="imgproc", default=True,
- help="Apply image preprocessing (page splitting and optimizations) [default=True]")
+ parser.add_option("--no-image-processing", action="store_false", dest="imgproc", default=True,
+ help="Do not apply image preprocessing (page splitting and optimizations) [default=True]")
parser.add_option("--upscale-images", action="store_true", dest="upscale", default=False,
help="Resize images smaller than device's resolution [default=False]")
parser.add_option("--stretch-images", action="store_true", dest="stretch", default=False,
help="Stretch images to device's resolution [default=False]")
- parser.add_option("--cut-page-numbers", action="store_false", dest="cutpagenumbers", default=True,
- help="Try to cut page numbering on images [default=True]")
+ parser.add_option("--no-cut-page-numbers", action="store_false", dest="cutpagenumbers", default=True,
+ help="Do not try to cut page numbering on images [default=True]")
options, args = parser.parse_args(argv)
if len(args) != 1:
parser.print_help()
@@ -269,7 +269,11 @@ def main(argv=None):
dirImgProcess(path)
print "Creating ePub structure..."
genEpubStruct(path)
+ epub_path = path
+def getEpubPath():
+ global epub_path
+ return epub_path
if __name__ == "__main__":
Copyright()
diff --git a/KindleComicConverter.app/Contents/Resources/kindlestrip.py b/KindleComicConverter.app/Contents/Resources/kindlestrip.py
index 234afc0..4aea003 100755
--- a/KindleComicConverter.app/Contents/Resources/kindlestrip.py
+++ b/KindleComicConverter.app/Contents/Resources/kindlestrip.py
@@ -206,6 +206,20 @@ class SectionStripper:
def getHeader(self):
return self.stripped_data_header
+def main(argv=None):
+ infile = argv[0]
+ outfile = argv[1]
+ data_file = file(infile, 'rb').read()
+ try:
+ strippedFile = SectionStripper(data_file)
+ file(outfile, 'wb').write(strippedFile.getResult())
+ print "Header Bytes: " + binascii.b2a_hex(strippedFile.getHeader())
+ if len(argv)==3:
+ file(argv[2], 'wb').write(strippedFile.getStrippedData())
+ except StripException, e:
+ print "Error: %s" % e
+ sys.exit(1)
+
if __name__ == "__main__":
sys.stdout=Unbuffered(sys.stdout)
print ('KindleStrip v%(__version__)s. '
@@ -218,16 +232,5 @@ if __name__ == "__main__":
print " is optional."
sys.exit(1)
else:
- infile = sys.argv[1]
- outfile = sys.argv[2]
- data_file = file(infile, 'rb').read()
- try:
- strippedFile = SectionStripper(data_file)
- file(outfile, 'wb').write(strippedFile.getResult())
- print "Header Bytes: " + binascii.b2a_hex(strippedFile.getHeader())
- if len(sys.argv)==4:
- file(sys.argv[3], 'wb').write(strippedFile.getStrippedData())
- except StripException, e:
- print "Error: %s" % e
- sys.exit(1)
+ main(sys.argv[1:])
sys.exit(0)
diff --git a/resources/Info.plist b/resources/Info.plist
index 2115763..dde0c5b 100644
--- a/resources/Info.plist
+++ b/resources/Info.plist
@@ -59,7 +59,7 @@
savedFrame
144 338 889 690 0 0 1680 1028
selectedTabView
- result
+ event log
diff --git a/resources/Scripts/main.scpt b/resources/Scripts/main.scpt
index edd25dd..33780b1 100644
Binary files a/resources/Scripts/main.scpt and b/resources/Scripts/main.scpt differ