nhpdf 1.7__tar.gz → 1.8__tar.gz

{nhpdf-1.7 → nhpdf-1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nhpdf
-Version: 1.7
+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.7 → nhpdf-1.8}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nhpdf"
-version = "1.7"
+version = "1.8"
 dependencies = [
   "beautifulsoup4",
   "img2pdf",
   "requests",
+  "cloudscraper",
 ]
 requires-python = ">=3.8"
 authors = [

{nhpdf-1.7 → nhpdf-1.8}/src/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
@@ -15,6 +15,13 @@ 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 = ['|', '/', '-', '\\']
@@ -33,7 +40,7 @@ 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:
         content = check_alpha(response.content)
         return content
@@ -51,7 +58,7 @@ def compile_images(raw: list, name: str) -> NoReturn:
 def check_alpha(image: bytes) -> bytes:
     try:
         img2pdf.convert(image)
-    except img2pdf.AlphaChannelError as alphaError:
+    except img2pdf.AlphaChannelError:
         buffered = io.BytesIO(image)
         img = Image.open(buffered)
         converted: Image = img.convert('RGB')
@@ -79,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.7/org_settings.json

@@ -1,24 +0,0 @@
-{
-    "terminal.external.osxExec": "iTerm.app",
-
-    "background.fullscreen": {
-
-
-      // Local images can be dragged into the browser to quickly get the file protocol address from the address bar
-      "images": ["file:///Users/eizen/Documents/papelnapader/+9999Aura.png"],
-      "opacity": 0.1,
-      "size": "cover",
-      "position": "center",
-      "interval": 0,
-      "random": false
-    },
-    // `sidebar` and `panel` have the same config as `fullscreen`
-    "background.sidebar": {},
-    "background.panel": {},
-    "background.enabled": true,
-    "workbench.colorTheme": "dragan",
-    "editor.fontFamily": "JetBrains Mono",
-    "editor.fontLigatures": true,
-    "terminal.integrated.fontLigatures.enabled": true,
-    "terminal.integrated.fontFamily": "monospace",
-}