nhpdf 1.0__tar.gz → 1.2__tar.gz

nhpdf-1.2/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Jack Maney
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{nhpdf-1.0 → nhpdf-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nhpdf
-Version: 1.0
+Version: 1.2
 Summary: Download NHentai doujins as PDF
 Project-URL: Homepage, https://github.com/Aze543/NhentaiDoujinToPDFMaker
 Project-URL: Issues, https://github.com/Aze543/NhentaiDoujinToPDFMaker/issues
@@ -8,7 +8,7 @@ Author-email: Aze543 <eizen.9258437663@gmail.com>
 Maintainer-email: Aze543 <eizen.9258437663@gmail.com>
 License-Expression: MIT
 Keywords: goon,pdf,scraper
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4
@@ -42,23 +42,12 @@ nhpdf 566212 563102 345987
 
 ### 🔧 How to Install (CLI Version)
 
-You can install the CLI tool in two ways:
-
-#### Option 1: From PyPI
+You can install the CLI tool directly from the PyPI as long as you have Python (Refer to the 2nd flavors first step to install it):
 
 ```bash
 pip install nhpdf
 ```
 
-#### Option 2: Locally (Development)
-
-If you’ve cloned this repo:
-
-```bash
-cd NhentaiDoujinToPDFMaker
-pip install .
-```
-
 Now you can run it with:
 
 ```bash
@@ -79,13 +68,13 @@ python3 main.py
 
 ---
 
-### 📥 How to Set Up (Script Version)
+### 📥 How to Set Up the Script
 
 > These instructions focus on **macOS**, but should work on **Windows** too (with small changes).
 
 #### 1. Install Python
 
-Search how to install Python for your OS.
+Go to the [PythonWebsite](https://www.python.org/downloads/) to install Python for your OS.
 
 Check if Python is installed:
 
@@ -94,7 +83,7 @@ Check if Python is installed:
   python
   ```
 
-- **macOS**:
+- **macOS/Linux**:
   ```bash
   python3
   ```
@@ -135,7 +124,7 @@ python main.py
 python3 main.py
 ```
 
-You should see:
+You should see an ascii logo:
 
 ```
 NHENTAI DOUJIN-TO-PDF MAKER

{nhpdf-1.0 → nhpdf-1.2}/README.md

@@ -24,23 +24,12 @@ nhpdf 566212 563102 345987
 
 ### 🔧 How to Install (CLI Version)
 
-You can install the CLI tool in two ways:
-
-#### Option 1: From PyPI
+You can install the CLI tool directly from the PyPI as long as you have Python (Refer to the 2nd flavors first step to install it):
 
 ```bash
 pip install nhpdf
 ```
 
-#### Option 2: Locally (Development)
-
-If you’ve cloned this repo:
-
-```bash
-cd NhentaiDoujinToPDFMaker
-pip install .
-```
-
 Now you can run it with:
 
 ```bash
@@ -61,13 +50,13 @@ python3 main.py
 
 ---
 
-### 📥 How to Set Up (Script Version)
+### 📥 How to Set Up the Script
 
 > These instructions focus on **macOS**, but should work on **Windows** too (with small changes).
 
 #### 1. Install Python
 
-Search how to install Python for your OS.
+Go to the [PythonWebsite](https://www.python.org/downloads/) to install Python for your OS.
 
 Check if Python is installed:
 
@@ -76,7 +65,7 @@ Check if Python is installed:
   python
   ```
 
-- **macOS**:
+- **macOS/Linux**:
   ```bash
   python3
   ```
@@ -117,7 +106,7 @@ python main.py
 python3 main.py
 ```
 
-You should see:
+You should see an ascii logo:
 
 ```
 NHENTAI DOUJIN-TO-PDF MAKER

{nhpdf-1.0 → nhpdf-1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nhpdf"
-version = "1.0"
+version = "1.2"
 dependencies = [
   "beautifulsoup4",
   "img2pdf",
@@ -23,7 +23,7 @@ license = "MIT"
 license-files = ["LICEN[CS]E.*"]
 keywords = ["pdf", "scraper", "goon"]
 classifiers = [
-  "Development Status :: 5 - Production/Stable",
+  "Development Status :: 4 - Beta",
   "Programming Language :: Python"
 ]
 

{nhpdf-1.0 → nhpdf-1.2}/src/nhpdf/nhpdf.py

@@ -2,37 +2,43 @@ import img2pdf # type: ignore
 import requests
 from typing import NoReturn
 from bs4 import BeautifulSoup
+from concurrent.futures import ThreadPoolExecutor
 import re
 import sys
 import time
 import threading
 from pathlib import Path
+from math import trunc
 
 nhpdf_dir = Path.home()/"Documents"/"nhpdf"
 nhpdf_dir.mkdir(parents=True, exist_ok=True) 
 
-def loading_animation():
+def loading_animation() -> NoReturn:
     global la, pages, page
     spinner = ['|', '/', '-', '\\']
     while not la:
         for frame in spinner:
-            sys.stdout.write(f'\rDownloading the pages ({page}/{pages})...{frame}')
+            sys.stdout.write(f'\rDownloading the pages ({trunc(((page-1)/pages)*100)}%/{100}%)...{frame}')
             sys.stdout.flush()
             time.sleep(0.1)
             if la:  
+                sys.stdout.write(f'\rDownloading the pages (100%/100%)...{frame}')
+                sys.stdout.flush()
                 break
-        
-def compile_images(raw: list, name: str) -> NoReturn:
+
+def download_image(raw_url: str) -> bytes:
     global pages, page
-    raw_images = []
-    for item in raw:
-        page += 1
-        img_code, f_type = re.search(r'/(\d+)', item['data-src']).group(), re.search(r'\.([a-zA-Z0-9]+)$', item['data-src']).group()
-        url = f'https://i3.nhentai.net/galleries{img_code}/{page}{f_type}'
-        response = requests.get(url)
-        raw_images.append(response.content)
-        if page == pages:
-            break
+    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()
+    url = f'https://i3.nhentai.net/galleries{img_code}/{page}{f_type}'
+    response = requests.get(url)
+    if response.status_code == 200:
+        return response.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))
     nhpdf = nhpdf_dir/f"{name}.pdf"
     with open(nhpdf, "wb") as file:
         file.write(img2pdf.convert(raw_images))
@@ -68,9 +74,10 @@ def start_nhpdf():
             print("\n[ERROR]: The code cannot be found in the website.\n\ngoing to the next code...")
             continue
         print(f"\nH-Doujin Details:\nname: {name}\nauthor: {author}\npages: {pages}\n")
+        raw_data.remove(raw_data[0])
         function_thread = threading.Thread(target=loading_animation)
         function_thread.start()
-        compile_images(raw_data, name)
+        compile_images(raw_data[:pages], name)
         la = True
         function_thread.join()
         if item != items:

nhpdf-1.2/test.py

@@ -0,0 +1,40 @@
+import requests
+from concurrent.futures import ThreadPoolExecutor
+import time
+import img2pdf
+
+
+
+
+
+def download_image(url):
+    response = requests.get(url)
+    if response.status_code == 200:
+        return response.content  # or save to file here
+ 
+
+
+
+
+image_urls = [
+    "https://i3.nhentai.net/galleries/3311475/1.webp", 
+    "https://i3.nhentai.net/galleries/3311475/2.webp",
+    "https://i3.nhentai.net/galleries/3311475/3.webp",
+    "https://i3.nhentai.net/galleries/3311475/4.webp",
+    "https://i3.nhentai.net/galleries/3311475/5.webp",
+    "https://i3.nhentai.net/galleries/3311475/6.webp",
+    "https://i3.nhentai.net/galleries/3311475/7.webp",
+    "https://i3.nhentai.net/galleries/3311475/8.webp",
+    "https://i3.nhentai.net/galleries/3311475/9.webp",
+    "https://i3.nhentai.net/galleries/3311475/10.webp",   
+    "https://i3.nhentai.net/galleries/3311475/11.webp", 
+    "https://i3.nhentai.net/galleries/3311475/12.webp",  
+    "https://i3.nhentai.net/galleries/3311475/13.webp", 
+    "https://i3.nhentai.net/galleries/3285893/21.jpg",           
+    ]
+
+with ThreadPoolExecutor(max_workers=10) as executor:
+        results = list(executor.map(download_image, image_urls))
+
+with open("test.pdf", "wb") as file:
+     file.write(img2pdf.convert(results))