phub 4.8.2__tar.gz → 4.8.4__tar.gz

{phub-4.8.2 → phub-4.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.8.2
+Version: 4.8.4
 Summary: An API for Pornhub
 Author-email: Egsagon <egsagon.git@gmail.com>, EchterAlsFake <EchterAlsFake@proton.me>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -689,6 +689,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx[brotli,socks]
 Requires-Dist: eaf_base_api
+Requires-Dist: h2
 Dynamic: license-file
 
 <p align="center">

{phub-4.8.2 → phub-4.8.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "phub"
-version = "4.8.2"
+version = "4.8.4"
 description = "An API for Pornhub"
 authors = [
   {name = 'Egsagon', email = "egsagon.git@gmail.com"},
@@ -13,7 +13,7 @@ classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python"
 ]
-dependencies = ["httpx[brotli,socks]", "eaf_base_api"]
+dependencies = ["httpx[brotli,socks]", "eaf_base_api", "h2"]
 requires-python = ">=3.9"
 
 

{phub-4.8.2 → phub-4.8.4}/src/phub/__main__.py

@@ -4,8 +4,9 @@ PHUB built-in CLI.
 
 import os
 import argparse
-import re
 
+from typing import Union
+from base_api import BaseCore
 from phub import Client, Video
 
 
@@ -22,7 +23,7 @@ def text_progress_bar(downloaded, total, title=False):
         print(f"\r | {title} | -->: [{bar}] {percents}%", end='')
 
 
-def download_video(client: Client, url: [str, Video], output: str, quality: str, downloader: str):
+def download_video(client: Client, url: Union[str | Video], output: str, quality: str, downloader: str, use_video_id=False):
     if not isinstance(url, Video):
         video = client.get(url)
 
@@ -33,10 +34,15 @@ def download_video(client: Client, url: [str, Video], output: str, quality: str,
     else:
         raise "Some error happened here, please report on GitHub, thank you :) "
 
-    title =  re.sub(r'[<>:"/\\|?*]', '', video.title)
+    if use_video_id:
+        title = video.id
+
+    else:
+        title = BaseCore().strip_title(title=video.title)
+
     final_output_path = os.path.join(output, title + ".mp4")
 
-    print(f"Downloading: {title} to: {final_output_path}")
+    print(f"Downloading: {video.title} to: {final_output_path}")
     video.download(path=final_output_path, quality=quality, downloader=downloader, display=text_progress_bar)
     print(f"Successfully downloaded: {title}")
 
@@ -47,6 +53,7 @@ def main():
     group.add_argument("-url", type=str, help="a PornHub Video URL", default="")
     group.add_argument("-model", type=str, help="a Pornhub Model URL", default="")
     parser.add_argument("-video_limit", type=int, help="the maximum number of videos to download from a model (Default: all)", default=100000)
+    parser.add_argument("--use-video-id", action="store_true", help="uses video ID as the title instead of the original video title")
     group.add_argument("-file", type=str, help="List to a file with Video URLs (separated by new lines)", default="")
     parser.add_argument("-downloader", type=str, help="The threading (download backend) to use", choices=[
         "threaded", "default", "ffmpeg"], default="threaded")
@@ -64,11 +71,12 @@ def main():
     model = args.model
     video_limit = args.video_limit
     file = args.file
+    use_video_id = args.use_video_id
 
     client = Client()
 
     if len(url) >= 3:  # Comparison with not == "" doesn't work, don't ask me why I have no fucking idea...
-        download_video(client=client, url=url, output=output, quality=quality, downloader=downloader)
+        download_video(client=client, url=url, output=output, quality=quality, downloader=downloader, use_video_id=use_video_id)
 
     elif len(model) >= 3:
         model_videos = client.get_user(model).videos
@@ -78,7 +86,7 @@ def main():
             if idx >= video_limit:
                 break
 
-            download_video(client=client, url=video, output=output, quality=quality, downloader=downloader)
+            download_video(client=client, url=video, output=output, quality=quality, downloader=downloader, use_video_id=use_video_id)
             idx += 1
 
     elif len(file) >= 1:
@@ -95,7 +103,7 @@ def main():
 
         for idx, url in enumerate(urls, start=1):
             print(f"[{idx}|{len(urls)}] Downloading: {url}")
-            download_video(client=client, url=url, output=output, quality=quality, downloader=downloader)
+            download_video(client=client, url=url, output=output, quality=quality, downloader=downloader, use_video_id=use_video_id)
 
 
 if __name__ == '__main__':

{phub-4.8.2 → phub-4.8.4}/src/phub/core.py

@@ -7,9 +7,10 @@ import logging
 import random
 import httpx
 
-from typing import Iterable, Union
 from functools import cached_property
+from typing import Iterable, Union, Optional
 from base_api.base import BaseCore, setup_logger
+from base_api.modules.config import RuntimeConfig
 
 from . import utils
 from . import consts
@@ -39,7 +40,7 @@ class Client:
                  bypass_geo_blocking: bool = False,
                  change_title_language: bool = True,
                  use_webmaster_api: bool = True,
-                 core=None) -> None:
+                 core: Optional[BaseCore] = None) -> None:
         '''
         Initialises a new client.
         
@@ -57,9 +58,10 @@ class Client:
         '''
 
         self.logger = setup_logger(name="PHUB API - [Client]", log_file=None, level=logging.ERROR)
-        self.core = core or BaseCore()
-        self.core.config.cookies = consts.COOKIES
-        self.core.config.headers = consts.HEADERS
+        self.core = core or BaseCore(config=RuntimeConfig())
+        self.core.initialize_session()
+        self.core.session.headers.update(consts.HEADERS)
+        self.core.session.cookies.update(consts.HEADERS)
         # Applying PornHub specific cookies and headers to base API
         self.logger.debug('Initialised new Client %s', self)
 
@@ -71,8 +73,7 @@ class Client:
 
         self.reset()
 
-        self.core.config.headers.update({"Accept-Language": language})
-        self.core.update_headers({"Accept-Language": language})
+        self.core.session.headers.update({"Accept-Language": language})
         self.credentials = {'email': email,
                             'password': password}
 
@@ -102,11 +103,11 @@ class Client:
             language_code = "fr"
 
             # Faking the X-Forwarded-For header (Fake IP source)
-            self.core.config.headers.update({"X-Forwarded-For": f"{ip}"})
+            self.core.session.headers.update({"X-Forwarded-For": f"{ip}"})
             # Setting the Accept-Language tag to French, because the faked IP comes from france
-            self.core.config.headers.update({"Accept-Language": f"{language_code}"})
+            self.core.session.headers.update({"Accept-Language": f"{language_code}"})
             # Setting the country code also to french
-            self.core.config.headers.update({"CF-IPCountry": f"{language_code}"})
+            self.core.session.headers.update({"CF-IPCountry": f"{language_code}"})
             logging.debug(f"Using faked headers for geo-bypass: {self.core.config.session.headers}")
 
     def call(self,
@@ -139,7 +140,7 @@ class Client:
         self.logger.log(logging.DEBUG if silent else logging.INFO, 'Fetching %s', func or '/')
 
         if headers:
-            self.core.config.headers = headers
+            self.core.session.headers = headers
 
         if not self.language == "en":
             host = consts.LANGUAGE_MAPPING.get(self.language)

{phub-4.8.2 → phub-4.8.4}/src/phub/modules/display.py

@@ -20,7 +20,7 @@ def progress(color: Union[dict, None] = dict(c1=30, c2=33, c3=34, c4=36), desc:
     color['c0'] = 0
     color = {k: '' if v == '' else f'\033[{v}m' for k, v in color.items()}
     
-    tem = '\r{c1}' + desc + ' {c2}{percent}%{c0} - {c3}{cur}{c0}/{c3}{total}i{c0}' # ({c4}{speed}ips{c0})
+    tem = '\r{c1}' + desc + ' {c2}{percent}%{c0} - {c3}{cur}{c0}/{c3}{total}{c0}' # ({c4}{speed}ips{c0})
     done = False
     start = time.time()
     

{phub-4.8.2 → phub-4.8.4}/src/phub/objects/video.py

@@ -262,7 +262,7 @@ class Video:
                                       remux=remux, callback_remux=display_remux)
 
         except Exception as e:
-            self.logger.error(f"An error occured while downloading video {e}")
+            self.logger.error(f"An error occurred while downloading video {e}")
 
         return path
 

{phub-4.8.2 → phub-4.8.4}/src/phub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.8.2
+Version: 4.8.4
 Summary: An API for Pornhub
 Author-email: Egsagon <egsagon.git@gmail.com>, EchterAlsFake <EchterAlsFake@proton.me>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -689,6 +689,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx[brotli,socks]
 Requires-Dist: eaf_base_api
+Requires-Dist: h2
 Dynamic: license-file
 
 <p align="center">

{phub-4.8.2 → phub-4.8.4}/src/phub.egg-info/requires.txt

@@ -1,2 +1,3 @@
 httpx[brotli,socks]
 eaf_base_api
+h2