phub 4.8.7__tar.gz → 4.8.8__tar.gz

phub-4.8.8/PKG-INFO

@@ -0,0 +1,23 @@
+Metadata-Version: 2.4
+Name: phub
+Version: 4.8.8
+Summary: An API for Pornhub
+Keywords: pornhub,phub,porn,api,web scrapper,api wrapper
+Author: Egsagon, EchterAlsFake
+Author-email: Egsagon <egsagon.git@gmail.com>, EchterAlsFake <EchterAlsFake@proton.me>
+License-Expression: LGPL-3.0-only
+License-File: LICENSE
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Requires-Dist: eaf-base-api
+Requires-Dist: m3u8
+Requires-Dist: lxml
+Requires-Dist: av ; python_full_version >= '3.10' and extra == 'av'
+Requires-Dist: httpx[http2] ; extra == 'full'
+Requires-Dist: httpx[socks] ; extra == 'full'
+Requires-Python: >=3.9
+Project-URL: Documentation, https://phub.readthedocs.io
+Project-URL: Documentation_Updated, https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/PHUB.md
+Project-URL: Repository, https://github.com/EchterAlsFake/PHUB
+Provides-Extra: av
+Provides-Extra: full

{phub-4.8.7 → phub-4.8.8}/pyproject.toml

@@ -1,21 +1,33 @@
+[build-system]
+requires = ["uv_build>=0.9.18,<0.10.0"]
+build-backend = "uv_build"
+
 [project]
 name = "phub"
-version = "4.8.7"
+version = "4.8.8"
 description = "An API for Pornhub"
 authors = [
   {name = 'Egsagon', email = "egsagon.git@gmail.com"},
   {name = "EchterAlsFake", email = "EchterAlsFake@proton.me"}
 ]
-license = {file = "LICENSE"}
-readme = {file = "pypi.md", content-type = "text/markdown"}
+requires-python = ">=3.9"
+license = "LGPL-3.0-only"
+license-files = ["LICENSE"]
 keywords = ["pornhub", "phub", "porn", "api", "web scrapper", "api wrapper"]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python"
 ]
-dependencies = ["httpx[brotli,socks]", "eaf_base_api", "h2"]
-requires-python = ">=3.9"
+dependencies = [
+  "eaf_base_api",
+  "m3u8",
+  "lxml"
 
+  ]
+
+[project.optional-dependencies]
+av = ["av; python_version >= '3.10'"]
+full = ["httpx[http2]", "httpx[socks]"] # H2 for HTTP 2.0 support, LXML for faster parsing speed, though optional :)
 
 [project.scripts]
 phub = "phub.__main__:main"
@@ -25,9 +37,5 @@ Documentation = "https://phub.readthedocs.io"
 Documentation_Updated = "https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/PHUB.md"
 Repository = "https://github.com/EchterAlsFake/PHUB"
 
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
-
 [tool.setuptools.packages.find]
 where = ["src"]

{phub-4.8.7 → phub-4.8.8}/src/phub/consts.py

@@ -19,7 +19,9 @@ HEADERS = {
     'Accept': '*/*',
     'Accept-Language': 'en,en-US',
     'Connection': 'keep-alive',
-    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/114.0'
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/114.0',
+    'Referer': 'https://www.pornhub.com/',
+    'Origin': 'https://www.pornhub.com',
 }
 
 COOKIES = {

{phub-4.8.7 → phub-4.8.8}/src/phub/objects/video.py

@@ -4,6 +4,7 @@ import html
 import os
 import random
 import logging
+import traceback
 from functools import cached_property
 
 import httpx
@@ -266,7 +267,8 @@ class Video:
                                       remux=remux, callback_remux=display_remux)
 
         except Exception as e:
-            self.logger.error(f"An error occurred while downloading video {e}")
+            error = traceback.format_exc()
+            self.logger.error(f"An error occurred while downloading video {error}")
 
         return path
 

{phub-4.8.7 → phub-4.8.8}/src/phub/utils.py

@@ -254,4 +254,8 @@ def fix_url(url: str):
             url = url.replace(language, "www", 1)
             return url
 
+
+    if "#" in url: # Some URLs have a # at the end and some number, idk why but yeah, fixing that here...
+        url = url.split("#")[0]
+
     return url  # Sometimes URL doesn't need to be changed. In this case, just return it.