nhpdf 1.5__tar.gz → 1.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nhpdf
-Version: 1.5
+Version: 1.7
 Summary: Download NHentai doujins as PDF
 Project-URL: Homepage, https://github.com/Aze543/NhentaiDoujinToPDFMaker
 Project-URL: Issues, https://github.com/Aze543/NhentaiDoujinToPDFMaker/issues

nhpdf-1.7/org_settings.json

@@ -0,0 +1,24 @@
+{
+    "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",
+}

{nhpdf-1.5 → nhpdf-1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nhpdf"
-version = "1.5"
+version = "1.7"
 dependencies = [
   "beautifulsoup4",
   "img2pdf",

{nhpdf-1.5 → nhpdf-1.7}/src/nhpdf/nhpdf.py

@@ -9,6 +9,8 @@ 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) 
@@ -29,20 +31,36 @@ def loading_animation() -> NoReturn:
 def download_image(raw_url: str) -> bytes:
     global pages, page
     page += 1
-    img_code, f_type = re.search(r'/(\d+)', raw_url['data-src']).group(), re.search(r'\b(.(jpg|jpeg|png|webp))\b', raw_url['data-src']).group()
+    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)
     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 as alphaError:
+        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: