move ComicInfo.xml behind the --comic-info flag

diff --git a/nhentai/cmdline.py b/nhentai/cmdline.py
index 9decc8810c77407dabdcff7068152a772a04589c..13a869260f7bc8e994defc0ccbbbb14667dbf7aa 100644 (file)
--- a/nhentai/cmdline.py
+++ b/nhentai/cmdline.py
@@ -38,7 +38,7 @@ def banner():
 def cmd_parser():
     parser = OptionParser('\n  nhentai --search [keyword] --download'
                           '\n  NHENTAI=http://h.loli.club nhentai --id [ID ...]'
-                          '\n  nhentai --file [filename]'    
+                          '\n  nhentai --file [filename]'
                           '\n\nEnvironment Variable:\n'
                           '  NHENTAI                 nhentai mirror url')
     # operation options
@@ -95,6 +95,8 @@ def cmd_parser():
                       help='generate a main viewer contain all the doujin in the folder')
     parser.add_option('--cbz', '-C', dest='is_cbz', action='store_true',
                       help='generate Comic Book CBZ File')
+    parser.add_option('--comic-info', dest='write_comic_info', action='store_true',
+                      help='when generating Comic Book CBZ File, also write ComicInfo.xml')
     parser.add_option('--rm-origin-dir', dest='rm_origin_dir', action='store_true', default=False,
                       help='remove downloaded doujinshi dir when generated CBZ file.')
 

diff --git a/nhentai/command.py b/nhentai/command.py
index ff962d720d4d602cd4c0d6b95b48693a711a4039..6f821d347e16dbf6cf2d9463280018e22868f9ef 100644 (file)
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -109,7 +109,7 @@ def main():
             if not options.is_nohtml and not options.is_cbz:
                 generate_html(options.output_dir, doujinshi)
             elif options.is_cbz:
-                generate_cbz(options.output_dir, doujinshi, options.rm_origin_dir)
+                generate_cbz(options.output_dir, doujinshi, options.rm_origin_dir, options.write_comic_info)
 
         if options.main_viewer:
             generate_main_html(options.output_dir)

diff --git a/nhentai/utils.py b/nhentai/utils.py
index 421abb84d3e7fa7f5092fa43025cd0e6f9706904..6a22d659ea996f8b199d2f9bf80e068de9bd67bc 100644 (file)
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -168,10 +168,11 @@ def generate_main_html(output_dir='./'):
         logger.warning('Writing Main Viewer failed ({})'.format(str(e)))
 
 
-def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False):
+def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=False):
     if doujinshi_obj is not None:
         doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
-        serialize_comicxml(doujinshi_obj, doujinshi_dir)
+        if write_comic_info:
+            serialize_comicxml(doujinshi_obj, doujinshi_dir)
         cbz_filename = os.path.join(os.path.join(doujinshi_dir, '..'), '{}.cbz'.format(doujinshi_obj.filename))
     else:
         cbz_filename = './doujinshi.cbz'