From 878e92b5278085c3b09939cdc0dd8ff162147a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Wed, 15 Jan 2014 10:22:54 +0100 Subject: [PATCH] Added proper startup scripts Hacks that allow standalone startup of script inside module are messy. --- kcc-c2e.py | 33 +++++++++++++++++++++++++++++++++ kcc-c2p.py | 33 +++++++++++++++++++++++++++++++++ kcc.py | 2 +- kcc/__main__.py | 2 -- kcc/comic2ebook.py | 10 +--------- kcc/comic2panel.py | 10 +--------- kcc/kindlesplit.py | 7 ------- 7 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 kcc-c2e.py create mode 100644 kcc-c2p.py delete mode 100644 kcc/__main__.py diff --git a/kcc-c2e.py b/kcc-c2e.py new file mode 100644 index 0000000..744555b --- /dev/null +++ b/kcc-c2e.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# Copyright (c) 2012-2013 Ciro Mattia Gonano +# Copyright (c) 2013 Pawel Jastrzebski +# +# Permission to use, copy, modify, and/or distribute this software for +# any purpose with or without fee is hereby granted, provided that the +# above copyright notice and this permission notice appear in all +# copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL +# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE +# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA +# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +__version__ = '4.0' +__license__ = 'ISC' +__copyright__ = '2012-2013, Ciro Mattia Gonano , Pawel Jastrzebski ' +__docformat__ = 'restructuredtext en' + +import sys +from multiprocessing import freeze_support +from kcc.comic2ebook import main, Copyright + +freeze_support() +Copyright() +main(sys.argv[1:]) +sys.exit(0) \ No newline at end of file diff --git a/kcc-c2p.py b/kcc-c2p.py new file mode 100644 index 0000000..87bcd1c --- /dev/null +++ b/kcc-c2p.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# Copyright (c) 2012-2013 Ciro Mattia Gonano +# Copyright (c) 2013 Pawel Jastrzebski +# +# Permission to use, copy, modify, and/or distribute this software for +# any purpose with or without fee is hereby granted, provided that the +# above copyright notice and this permission notice appear in all +# copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL +# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE +# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA +# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +__version__ = '4.0' +__license__ = 'ISC' +__copyright__ = '2012-2013, Ciro Mattia Gonano , Pawel Jastrzebski ' +__docformat__ = 'restructuredtext en' + +import sys +from multiprocessing import freeze_support +from kcc.comic2panel import main, Copyright + +freeze_support() +Copyright() +main(sys.argv[1:]) +sys.exit(0) \ No newline at end of file diff --git a/kcc.py b/kcc.py index f7bd864..4ebd829 100644 --- a/kcc.py +++ b/kcc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright (c) 2012-2013 Ciro Mattia Gonano diff --git a/kcc/__main__.py b/kcc/__main__.py deleted file mode 100644 index 03034f1..0000000 --- a/kcc/__main__.py +++ /dev/null @@ -1,2 +0,0 @@ -from kcc.comic2ebook import main -main() \ No newline at end of file diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py index 38bc07c..a0d8d15 100755 --- a/kcc/comic2ebook.py +++ b/kcc/comic2ebook.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python2 # -*- coding: utf-8 -*- # # Copyright (c) 2012-2013 Ciro Mattia Gonano @@ -1110,11 +1109,4 @@ def checkOptions(): (int(X*1.5), int(Y*1.5))) image.ProfileData.Profiles["Custom"] = newProfile options.profile = "Custom" - options.profileData = image.ProfileData.Profiles[options.profile] - - -if __name__ == "__main__": - freeze_support() - Copyright() - main(sys.argv[1:]) - sys.exit(0) + options.profileData = image.ProfileData.Profiles[options.profile] \ No newline at end of file diff --git a/kcc/comic2panel.py b/kcc/comic2panel.py index 592db77..2716a3b 100644 --- a/kcc/comic2panel.py +++ b/kcc/comic2panel.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python2 # -*- coding: utf-8 -*- # # Copyright (c) 2012-2013 Ciro Mattia Gonano @@ -343,11 +342,4 @@ def main(argv=None, qtGUI=None): else: raise UserWarning("Provided path is not a directory.") else: - raise UserWarning("Target height is not set.") - - -if __name__ == "__main__": - freeze_support() - Copyright() - main(sys.argv[1:]) - sys.exit(0) \ No newline at end of file + raise UserWarning("Target height is not set.") \ No newline at end of file diff --git a/kcc/kindlesplit.py b/kcc/kindlesplit.py index e6b7841..fac6253 100644 --- a/kcc/kindlesplit.py +++ b/kcc/kindlesplit.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Based on initial version of KindleUnpack. Copyright (C) 2009 Charles M. Hannum @@ -382,9 +381,3 @@ class mobi_split: def getResult(self): return self.result_file - - -if __name__ == "__main__": - import sys - mobi_split(sys.argv[1], False) - sys.exit(0)