fixed download threads not finishing causing the program to stall by …

…adding a download timeout
9-FS · Nov 2, 2023 · 6c07925 · 6c07925
1 parent 2758e1d
commit 6c07925
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,13 +5,13 @@ license     = "MIT"
 name        = "x"                                                 # can't leave empty because of bug with `poetry install` from poetry.lock file
 readme      = "readme.md"
 repository  = "https://github.com/9-FS/2021-11-15-nHentai-to-PDF"
-version     = "1.4.1"
+version     = "1.4.2"
 
 [tool.poetry.dependencies]
 kfsconfig = "^1.0.0"
 kfsfstr   = "^1.0.0"
 kfslog    = "^1.0.0"
-kfsmedia  = "^2.1.0"
+kfsmedia  = "^2.2.0"
 python    = "^3.11.0"
 
 [tool.poetry.group.dev.dependencies]

diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,8 @@ kfsconfig==1.0.2 ; python_full_version >= "3.11.0" and python_full_version < "4.
 kfsfstr==1.1.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
 kfslog==1.0.1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
 kfsmath==1.0.1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
-kfsmedia==2.1.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
+kfsmedia==2.2.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
+pebble==5.0.3 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
 pillow==10.1.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
 requests==2.31.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
 urllib3==2.0.7 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
diff --git a/src/Hentai.py b/src/Hentai.py
@@ -196,6 +196,7 @@ def download(self, dest_path: str) -> list[PIL.Image.Image]:
         pages_URL: list[str]=[]                             # URL to individual pages to download
         PDF: list[PIL.Image.Image]                          # finished PDF
         PDF_filepath: str                                   # where to save downloaded result, ID title pdf, but title maximum 140 characters and without illegal filename characters
+        TIMEOUT=100                                         # timeout for downloading images
         TITLE_CHARACTERS_FORBIDDEN: str="\\/:*?\"<>|\t\n"   # in title forbidden characters
 
 
@@ -221,11 +222,11 @@ def download(self, dest_path: str) -> list[PIL.Image.Image]:
             raise KFSmedia.DownloadError(f"Error in {self.download.__name__}{inspect.signature(self.download)}: \"{PDF_filepath}\" already exists as directory. Skipped download.")
 
 
-        while self._give_up==False:                                     # while not giving up: try to download and convert
+        while self._give_up==False:                                                     # while not giving up: try to download and convert
             try:
-                KFSmedia.download_medias(pages_URL, images_filepath)    # download images # type:ignore
+                KFSmedia.download_medias(pages_URL, images_filepath, timeout=TIMEOUT)   # download images # type:ignore
             except KFSmedia.DownloadError as e:
-                self._increment_fails(e.args[0])                        # increment fails, may trigger giving up
+                self._increment_fails(e.args[0])                                        # increment fails, may trigger giving up
                 continue
 
             try: