fix #349

RicterZ · Jan 11, 2025 · 803957b · 803957b
1 parent 13b584a
commit 803957b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/nhentai/constant.py b/nhentai/constant.py
@@ -38,8 +38,12 @@ def get_nhentai_home() -> str:
 
 IMAGE_URL = f'{urlparse(BASE_URL).scheme}://i.{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}',
     f'{urlparse(BASE_URL).scheme}://i5.{urlparse(BASE_URL).hostname}',
+    f'{urlparse(BASE_URL).scheme}://i6.{urlparse(BASE_URL).hostname}',
     f'{urlparse(BASE_URL).scheme}://i7.{urlparse(BASE_URL).hostname}',
 ]
 

diff --git a/nhentai/downloader.py b/nhentai/downloader.py
@@ -47,7 +47,10 @@ async def fiber(self, tasks):
         for completed_task in asyncio.as_completed(tasks):
             try:
                 result = await completed_task
-                logger.info(f'{result[1]} download completed')
+                if result[1]:
+                    logger.info(f'{result[1]} download completed')
+                else:
+                    logger.warning(f'{result[1]} download failed, return value {result[0]}')
             except Exception as e:
                 logger.error(f'An error occurred: {e}')
 
@@ -85,11 +88,11 @@ async def download(self, url, folder='', filename='', retried=0, proxy=None, len
 
             if not await self.save(filename, response):
                 logger.error(f'Can not download image {url}')
-                return 1, None
+                return 1, url
 
         except (httpx.HTTPStatusError, httpx.TimeoutException, httpx.ConnectError) as e:
             if retried < 3:
-                logger.info(f'Download {filename} failed, retrying({retried + 1}) times...')
+                logger.warning(f'Download {filename} failed, retrying({retried + 1}) times...')
                 return await self.download(
                     url=url,
                     folder=folder,
@@ -98,7 +101,8 @@ async def download(self, url, folder='', filename='', retried=0, proxy=None, len
                     proxy=proxy,
                 )
             else:
-                return 0, None
+                logger.warning(f'Download {filename} failed with 3 times retried, skipped')
+                return 0, url
 
         except NHentaiImageNotExistException as e:
             os.remove(save_file_path)
@@ -110,10 +114,10 @@ async def download(self, url, folder='', filename='', retried=0, proxy=None, len
             logger.error(f"Exception type: {type(e)}")
             traceback.print_stack()
             logger.critical(str(e))
-            return 0, None
+            return 0, url
 
         except KeyboardInterrupt:
-            return -3, None
+            return -3, url
 
         return 1, url
 

diff --git a/nhentai/parser.py b/nhentai/parser.py
@@ -157,8 +157,12 @@ def doujinshi_parser(id_, counter=0):
 
     ext = []
     for i in html.find_all('div', attrs={'class': 'thumb-container'}):
-        _, ext_name = os.path.basename(i.img.attrs['data-src']).rsplit('.', 1)
-        ext.append(ext_name)
+        base_name = os.path.basename(i.img.attrs['data-src'])
+        ext_name = base_name.split('.')
+        if len(ext_name) == 2:
+            ext.append(ext_name[-1])
+        elif len(ext_name) == 3:
+            ext.append(ext_name[1])
 
     if not img_id:
         logger.critical(f'Tried yo get image id failed of id: {id_}')