Merge branch 'master' of github.com:RicterZ/nhentai

nhentai/__init__.py

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

nhentai/constant.py

@@ -38,9 +38,9 @@ FAV_URL = f'{BASE_URL}/favorites/'
 
 IMAGE_URL = f'{urlparse(BASE_URL).scheme}://i.{urlparse(BASE_URL).hostname}/galleries'
 IMAGE_URL_MIRRORS = [
-    f'{urlparse(BASE_URL).scheme}://i3.{urlparse(BASE_URL).hostname}'
+    f'{urlparse(BASE_URL).scheme}://i3.{urlparse(BASE_URL).hostname}',
-    f'{urlparse(BASE_URL).scheme}://i5.{urlparse(BASE_URL).hostname}'
+    f'{urlparse(BASE_URL).scheme}://i5.{urlparse(BASE_URL).hostname}',
-    f'{urlparse(BASE_URL).scheme}://i7.{urlparse(BASE_URL).hostname}'
+    f'{urlparse(BASE_URL).scheme}://i7.{urlparse(BASE_URL).hostname}',
 ]
 
 NHENTAI_HOME = get_nhentai_home()

nhentai/doujinshi.py

@@ -89,7 +89,8 @@ class Doujinshi(object):
         if options.is_cbz:
             ret_cbz = os.path.exists(f'{base_path}.cbz') or os.path.exists(f'{base_path}/{self.filename}.cbz')
 
-        if all(filter(lambda s: s is not None, [ret_cbz, ret_pdf])):
+        ret = list(filter(lambda s: s is not None, [ret_cbz, ret_pdf]))
+        if ret and all(ret):
             return False
 
         # doujinshi directory doesn't exist, re-download

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nhentai"
-version = "0.5.9"
+version = "0.5.10"
 description = "nhentai doujinshi downloader"
 authors = ["Ricter Z <ricterzheng@gmail.com>"]
 license = "MIT"

setup.cfg

@@ -1,3 +1,3 @@
 [metadata]
-description-file = README.rst
+description_file = README.rst