0.5.19

fix favorite_counts output in metadata

nhentai/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.5.17.2'
+__version__ = '0.5.19'
 __author__ = 'RicterZ'
 __email__ = 'ricterzheng@gmail.com'

nhentai/cmdline.py

@@ -11,6 +11,7 @@ from optparse import OptionParser
 from nhentai import __version__
 from nhentai.utils import generate_html, generate_main_html, DB
 from nhentai.logger import logger
+from nhentai.constant import PATH_SEPARATOR
 
 
 def banner():
@@ -64,7 +65,8 @@ def cmd_parser():
     # operation options
     parser.add_option('--download', '-D', dest='is_download', action='store_true',
                       help='download doujinshi (for search results)')
-    parser.add_option('--show', '-S', dest='is_show', action='store_true', help='just show the doujinshi information')
+    parser.add_option('--show', '-S', dest='is_show', action='store_true',
+                      help='just show the doujinshi information')
 
     # doujinshi options
     parser.add_option('--id', dest='id', action='callback', callback=callback,
@@ -86,7 +88,8 @@ def cmd_parser():
                       choices=['recent', 'popular', 'popular-today', 'popular-week', 'date'])
 
     # download options
-    parser.add_option('--output', '-o', type='string', dest='output_dir', action='store', default='./',
+    parser.add_option('--output', '-o', type='string', dest='output_dir', action='store',
+                      default=f'.{PATH_SEPARATOR}',
                       help='output dir')
     parser.add_option('--threads', '-t', type='int', dest='threads', action='store', default=5,
                       help='thread count for downloading doujinshi')
@@ -96,7 +99,8 @@ def cmd_parser():
                       help='slow down between downloading every doujinshi')
     parser.add_option('--proxy', type='string', dest='proxy', action='store',
                       help='store a proxy, for example: -p "http://127.0.0.1:1080"')
-    parser.add_option('--file', '-f', type='string', dest='file', action='store', help='read gallery IDs from file.')
+    parser.add_option('--file', '-f', type='string', dest='file', action='store',
+                      help='read gallery IDs from file.')
     parser.add_option('--format', type='string', dest='name_format', action='store',
                       help='format the saved folder name', default='[%i][%a][%t]')
     parser.add_option('--dry-run', action='store_true', dest='dryrun', help='Dry run, skip file download')

nhentai/constant.py

@@ -35,10 +35,11 @@ LOGIN_URL = f'{BASE_URL}/login/'
 CHALLENGE_URL = f'{BASE_URL}/challenge'
 FAV_URL = f'{BASE_URL}/favorites/'
 
+PATH_SEPARATOR = os.path.sep
 
-IMAGE_URL = f'{urlparse(BASE_URL).scheme}://i.{urlparse(BASE_URL).hostname}/galleries'
+
+IMAGE_URL = f'{urlparse(BASE_URL).scheme}://i1.{urlparse(BASE_URL).hostname}/galleries'
 IMAGE_URL_MIRRORS = [
-    f'{urlparse(BASE_URL).scheme}://i1.{urlparse(BASE_URL).hostname}',
     f'{urlparse(BASE_URL).scheme}://i2.{urlparse(BASE_URL).hostname}',
     f'{urlparse(BASE_URL).scheme}://i3.{urlparse(BASE_URL).hostname}',
     f'{urlparse(BASE_URL).scheme}://i4.{urlparse(BASE_URL).hostname}',

nhentai/doujinshi.py

@@ -65,7 +65,7 @@ class Doujinshi(object):
             ['Groups', self.info.groups],
             ['Languages', self.info.languages],
             ['Tags', self.info.tags],
-            ['Favorite Counts', self.info.favorite_counts],
+            ['Favorite Counts', self.favorite_counts],
             ['URL', self.url],
             ['Pages', self.pages],
         ]

nhentai/parser.py

@@ -141,14 +141,12 @@ def doujinshi_parser(id_, counter=0):
     title = doujinshi_info.find('h1').text
     pretty_name = doujinshi_info.find('h1').find('span', attrs={'class': 'pretty'}).text
     subtitle = doujinshi_info.find('h2')
-    favorite_counts = str(doujinshi_info.find('span', class_='nobold').find('span', class_='count'))
+    favorite_counts = doujinshi_info.find('span', class_='nobold').find('span', class_='count')
-    if favorite_counts is None:
-        favorite_counts = '0'
 
     doujinshi['name'] = title
     doujinshi['pretty_name'] = pretty_name
     doujinshi['subtitle'] = subtitle.text if subtitle else ''
-    doujinshi['favorite_counts'] = favorite_counts.strip()
+    doujinshi['favorite_counts'] = int(favorite_counts.text.strip()) if favorite_counts else 0
 
     doujinshi_cover = html.find('div', attrs={'id': 'cover'})
     # img_id = re.search('/galleries/([0-9]+)/cover.(jpg|png|gif|webp)$',

nhentai/serializer.py

@@ -1,6 +1,8 @@
 # coding: utf-8
 import json
 import os
+
+from nhentai.constant import PATH_SEPARATOR
 from xml.sax.saxutils import escape
 from nhentai.constant import LANGUAGE_ISO
 
@@ -82,7 +84,7 @@ def xml_write_simple_tag(f, name, val, indent=1):
 
 def merge_json():
     lst = []
-    output_dir = "./"
+    output_dir = f".{PATH_SEPARATOR}"
     os.chdir(output_dir)
     doujinshi_dirs = next(os.walk('.'))[1]
     for folder in doujinshi_dirs:

nhentai/utils.py

@@ -14,6 +14,7 @@ from typing import Tuple
 from requests.structures import CaseInsensitiveDict
 
 from nhentai import constant
+from nhentai.constant import PATH_SEPARATOR
 from nhentai.logger import logger
 from nhentai.serializer import serialize_json, serialize_comic_xml, set_js_database
 
@@ -100,7 +101,7 @@ def parse_doujinshi_obj(
         file_type: str = ''
 ) -> Tuple[str, str]:
 
-    filename = f'./doujinshi.{file_type}'
+    filename = f'.{PATH_SEPARATOR}doujinshi.{file_type}'
     if doujinshi_obj is not None:
         doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
         _filename = f'{doujinshi_obj.filename}.{file_type}'
@@ -113,7 +114,7 @@ def parse_doujinshi_obj(
 
         filename = os.path.join(output_dir, _filename)
     else:
-        doujinshi_dir = './'
+        doujinshi_dir = f'.{PATH_SEPARATOR}'
 
     return doujinshi_dir, filename
 
@@ -178,7 +179,7 @@ def move_to_folder(output_dir='.', doujinshi_obj=None, file_type=None):
     shutil.move(filename, os.path.join(doujinshi_dir, os.path.basename(filename)))
 
 
-def generate_main_html(output_dir='./'):
+def generate_main_html(output_dir=f'.{PATH_SEPARATOR}'):
     """
     Generate a main html to show all the contains doujinshi.
     With a link to their `index.html`.
@@ -337,7 +338,7 @@ def generate_metadata_file(output_dir, doujinshi_obj):
 
     fields = ['TITLE', 'ORIGINAL TITLE', 'AUTHOR', 'ARTIST', 'GROUPS', 'CIRCLE', 'SCANLATOR',
               'TRANSLATOR', 'PUBLISHER', 'DESCRIPTION', 'STATUS', 'CHAPTERS', 'PAGES',
-              'TAGS', 'TYPE', 'LANGUAGE', 'RELEASED', 'READING DIRECTION', 'CHARACTERS',
+              'TAGS',  'FAVORITE COUNTS', 'TYPE', 'LANGUAGE', 'RELEASED', 'READING DIRECTION', 'CHARACTERS',
               'SERIES', 'PARODY', 'URL']
 
     temp_dict = CaseInsensitiveDict(dict(doujinshi_obj.table))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nhentai"
-version = "0.5.17.2"
+version = "0.5.19"
 description = "nhentai doujinshi downloader"
 authors = ["Ricter Z <ricterzheng@gmail.com>"]
 license = "MIT"
@@ -22,4 +22,4 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-nhentai = 'nhentai.command:main'
+nhentai = 'nhentai.command:main'