nhpdf 1.6__py3-none-any.whl → 1.8__py3-none-any.whl

nhpdf/nhpdf.py

@@ -1,5 +1,5 @@
-import img2pdf # type: ignore
-import requests
+import img2pdf
+import cloudscraper
 from typing import NoReturn
 from bs4 import BeautifulSoup
 from concurrent.futures import ThreadPoolExecutor
@@ -9,10 +9,19 @@ import time
 import threading
 from pathlib import Path
 from math import trunc
+import io
+from PIL import Image
 
 nhpdf_dir = Path.home()/"Documents"/"nhpdf"
 nhpdf_dir.mkdir(parents=True, exist_ok=True) 
 
+scraper = cloudscraper.create_scraper(
+    browser={
+        "browser": "chrome",
+        "platform": "windows",
+    }
+)
+
 def loading_animation() -> NoReturn:
     global la, pages, page
     spinner = ['|', '/', '-', '\\']
@@ -31,18 +40,34 @@ def download_image(raw_url: str) -> bytes:
     page += 1
     img_code, f_type = re.search(r'/(\d+)', raw_url['data-src']).group(), re.search(r'\b(.(jpg|jpeg|png|webp|gif|tiff|svg))\b', raw_url['data-src']).group()
     url = f'https://i3.nhentai.net/galleries{img_code}/{page}{f_type}'
-    response = requests.get(url)
+    response = scraper.get(url)
     if response.status_code == 200:
-        return response.content
+        content = check_alpha(response.content)
+        return content
     return None
 
 def compile_images(raw: list, name: str) -> NoReturn:
     with ThreadPoolExecutor(max_workers=10) as executor:
         raw_images = list(executor.map(download_image, raw))
+    for img in raw_images:
+        check_alpha(img)
     nhpdf = nhpdf_dir/f"{name}.pdf"
     with open(nhpdf, "wb") as file:
         file.write(img2pdf.convert(raw_images))
 
+def check_alpha(image: bytes) -> bytes:
+    try:
+        img2pdf.convert(image)
+    except img2pdf.AlphaChannelError:
+        buffered = io.BytesIO(image)
+        img = Image.open(buffered)
+        converted: Image = img.convert('RGB')
+        buf = io.BytesIO()
+        converted.save(buf, format='PNG')
+        image = buf.getvalue() 
+    return image
+
+
 def start_nhpdf():
     global la, page, pages
     if len(sys.argv) < 2:
@@ -61,7 +86,7 @@ def start_nhpdf():
             print("\nThe code needs to be numbers (Ex: 177013) :) \n\ngoing to the next code...")
             continue
         url = f'https://nhentai.net/g/{code}/'
-        response = requests.get(url)
+        response = scraper.get(url)
         try: 
             soup = BeautifulSoup(response.text, "html.parser")
             pages = len(soup.find_all(class_='gallerythumb'))

{nhpdf-1.6.dist-info → nhpdf-1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nhpdf
-Version: 1.6
+Version: 1.8
 Summary: Download NHentai doujins as PDF
 Project-URL: Homepage, https://github.com/Aze543/NhentaiDoujinToPDFMaker
 Project-URL: Issues, https://github.com/Aze543/NhentaiDoujinToPDFMaker/issues
@@ -12,6 +12,7 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4
+Requires-Dist: cloudscraper
 Requires-Dist: img2pdf
 Requires-Dist: requests
 Description-Content-Type: text/markdown

nhpdf-1.8.dist-info/RECORD

@@ -0,0 +1,6 @@
+nhpdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nhpdf/nhpdf.py,sha256=JecJnkqs_vqf9kekuXXDzlawfbo-kcgKw9HjtyECx7M,3853
+nhpdf-1.8.dist-info/METADATA,sha256=hK6ndatQvzByFGN12DAIjltPsE0N9_oFaRFe51Od6QA,2901
+nhpdf-1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nhpdf-1.8.dist-info/entry_points.txt,sha256=Dn0ISURSvQrGZMCOxYEA5ocSWU5DUOiT50J7FHZk5Xs,50
+nhpdf-1.8.dist-info/RECORD,,

nhpdf-1.6.dist-info/RECORD

@@ -1,6 +0,0 @@
-nhpdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nhpdf/nhpdf.py,sha256=-o0ryeh69xNosrLmP8SD_MIOawLXvKb6x3vo1oFmpPw,3265
-nhpdf-1.6.dist-info/METADATA,sha256=wqI6ZqBEwE6Vc2SSGehddMfwqH10JeaLObON9venzD8,2873
-nhpdf-1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nhpdf-1.6.dist-info/entry_points.txt,sha256=Dn0ISURSvQrGZMCOxYEA5ocSWU5DUOiT50J7FHZk5Xs,50
-nhpdf-1.6.dist-info/RECORD,,