Merge pull request #280 from RicterZ/dev

0.5.3

README.rst

@@ -141,7 +141,9 @@ Supported doujinshi folder formatter:
 - %t: Doujinshi name
 - %s: Doujinshi subtitle (translated name)
 - %a: Doujinshi authors' name
+- %g: Doujinshi groups name
 - %p: Doujinshi pretty name
+- %ag: Doujinshi authors name or groups name
 
 
 Other options:

nhentai/cmdline.py

@@ -73,17 +73,15 @@ def cmd_parser():
                       help='search doujinshi by keyword')
     parser.add_option('--favorites', '-F', action='store_true', dest='favorites',
                       help='list or download your favorites')
-    parser.add_option('--artist', '-a', action='store', dest='artist',
-                      help='list doujinshi by artist name')
 
     # page options
     parser.add_option('--page-all', dest='page_all', action='store_true', default=False,
                       help='all search results')
     parser.add_option('--page', '--page-range', type='string', dest='page', action='store', default='1',
                       help='page number of search results. e.g. 1,2-5,14')
-    parser.add_option('--sorting', '--sort', dest='sorting', action='store', default='popular-all',
+    parser.add_option('--sorting', '--sort', dest='sorting', action='store', default='popular',
-                      help='sorting of doujinshi (recent / popular-all / popular-[today|week])',
+                      help='sorting of doujinshi (recent / popular / popular-[today|week])',
-                      choices=['recent', 'popular-all', 'popular-today', 'popular-week', 'date'])
+                      choices=['recent', 'popular', 'popular-today', 'popular-week', 'date'])
 
     # download options
     parser.add_option('--output', '-o', type='string', dest='output_dir', action='store', default='./',
@@ -114,8 +112,6 @@ def cmd_parser():
                       help='generate PDF file')
     parser.add_option('--rm-origin-dir', dest='rm_origin_dir', action='store_true', default=False,
                       help='remove downloaded doujinshi dir when generated CBZ or PDF file')
-    parser.add_option('--move-to-folder', dest='move_to_folder', action='store_true', default=False,
-                      help='remove files in doujinshi dir then move new file to folder when generated CBZ or PDF file')
     parser.add_option('--meta', dest='generate_metadata', action='store_true',
                       help='generate a metadata file in doujinshi format')
     parser.add_option('--regenerate-cbz', dest='regenerate_cbz', action='store_true', default=False,
@@ -213,12 +209,12 @@ def cmd_parser():
             _ = [i.strip() for i in f.readlines()]
             args.id = set(int(i) for i in _ if i.isdigit())
 
-    if (args.is_download or args.is_show) and not args.id and not args.keyword and not args.favorites and not args.artist:
+    if (args.is_download or args.is_show) and not args.id and not args.keyword and not args.favorites:
         logger.critical('Doujinshi id(s) are required for downloading')
         parser.print_help()
         sys.exit(1)
 
-    if not args.keyword and not args.id and not args.favorites and not args.artist:
+    if not args.keyword and not args.id and not args.favorites:
         parser.print_help()
         sys.exit(1)
 

nhentai/doujinshi.py

@@ -20,9 +20,10 @@ class DoujinshiInfo(dict):
 
     def __getattr__(self, item):
         try:
-            return dict.__getitem__(self, item)
+            ret = dict.__getitem__(self, item)
+            return ret if ret else 'Unknown'
         except KeyError:
-            return ''
+            return 'Unknown'
 
 
 class Doujinshi(object):
@@ -38,8 +39,12 @@ class Doujinshi(object):
         self.url = f'{DETAIL_URL}/{self.id}'
         self.info = DoujinshiInfo(**kwargs)
 
+        ag_value = self.info.groups if self.info.artists == 'Unknown' else self.info.artists
+        name_format = name_format.replace('%ag', format_filename(ag_value))
+
         name_format = name_format.replace('%i', format_filename(str(self.id)))
         name_format = name_format.replace('%a', format_filename(self.info.artists))
+        name_format = name_format.replace('%g', format_filename(self.info.groups))
 
         name_format = name_format.replace('%t', format_filename(self.name))
         name_format = name_format.replace('%p', format_filename(self.pretty_name))
@@ -47,15 +52,16 @@ class Doujinshi(object):
         self.filename = format_filename(name_format, 255, True)
 
         self.table = [
-            ["Parodies", self.info.parodies],
+            ['Parodies', self.info.parodies],
-            ["Doujinshi", self.name],
+            ['Doujinshi', self.name],
-            ["Subtitle", self.info.subtitle],
+            ['Subtitle', self.info.subtitle],
-            ["Characters", self.info.characters],
+            ['Characters', self.info.characters],
-            ["Authors", self.info.artists],
+            ['Authors', self.info.artists],
-            ["Languages", self.info.languages],
+            ['Groups', self.info.groups],
-            ["Tags", self.info.tags],
+            ['Languages', self.info.languages],
-            ["URL", self.url],
+            ['Tags', self.info.tags],
-            ["Pages", self.pages],
+            ['URL', self.url],
+            ['Pages', self.pages],
         ]
 
     def __repr__(self):

nhentai/downloader.py

@@ -123,6 +123,7 @@ class Downloader(Singleton):
                 logger.warning(f'CBZ file "{folder}.cbz" exists, ignored download request')
                 return
 
+        logger.info(f'Doujinshi will be saved at "{folder}"')
         if not os.path.exists(folder):
             try:
                 os.makedirs(folder)

nhentai/utils.py

@@ -166,9 +166,6 @@ def generate_main_html(output_dir='./'):
 def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=True):
     if doujinshi_obj is not None:
         doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
-        if os.path.exists(doujinshi_dir+".cbz"):
-            logger.warning(f'Comic Book CBZ file exists, skip "{doujinshi_dir}"')
-            return
         if write_comic_info:
             serialize_comic_xml(doujinshi_obj, doujinshi_dir)
         cbz_filename = os.path.join(os.path.join(doujinshi_dir, '..'), f'{doujinshi_obj.filename}.cbz')
@@ -290,11 +287,11 @@ def generate_metadata_file(output_dir, table, doujinshi_obj=None):
 
     f = open(os.path.join(doujinshi_dir, 'info.txt'), 'w', encoding='utf-8')
 
-    fields = ['TITLE', 'ORIGINAL TITLE', 'AUTHOR', 'ARTIST', 'CIRCLE', 'SCANLATOR',
+    fields = ['TITLE', 'ORIGINAL TITLE', 'AUTHOR', 'ARTIST', 'GROUPS', 'CIRCLE', 'SCANLATOR',
               'TRANSLATOR', 'PUBLISHER', 'DESCRIPTION', 'STATUS', 'CHAPTERS', 'PAGES',
               'TAGS', 'TYPE', 'LANGUAGE', 'RELEASED', 'READING DIRECTION', 'CHARACTERS',
               'SERIES', 'PARODY', 'URL']
-    special_fields = ['PARODY', 'TITLE', 'ORIGINAL TITLE', 'CHARACTERS', 'AUTHOR',
+    special_fields = ['PARODY', 'TITLE', 'ORIGINAL TITLE', 'CHARACTERS', 'AUTHOR', 'GROUPS',
                       'LANGUAGE', 'TAGS', 'URL', 'PAGES']
 
     for i in range(len(fields)):