add %ag %g formatter #269

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/doujinshi.py

@@ -39,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))
@@ -48,15 +52,16 @@ class Doujinshi(object):
         self.filename = format_filename(name_format, 255, True)
 
         self.table = [
-            ["Parodies", self.info.parodies],
-            ["Doujinshi", self.name],
-            ["Subtitle", self.info.subtitle],
-            ["Characters", self.info.characters],
-            ["Authors", self.info.artists],
-            ["Languages", self.info.languages],
-            ["Tags", self.info.tags],
-            ["URL", self.url],
-            ["Pages", self.pages],
+            ['Parodies', self.info.parodies],
+            ['Doujinshi', self.name],
+            ['Subtitle', self.info.subtitle],
+            ['Characters', self.info.characters],
+            ['Authors', self.info.artists],
+            ['Groups', self.info.groups],
+            ['Languages', self.info.languages],
+            ['Tags', self.info.tags],
+            ['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)