phub 4.8.6__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.6 → 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.6"
+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.6 → 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 = {
@@ -227,7 +229,7 @@ class re:
     container                = find( engine.DOTALL,              r'class=\"container(.*)'                                                      ) # Get the page container
     document                 = find( engine.DOTALL,              r'.*'                                                                         ) # Match a whole document
     get_playlist_unavailable = find( engine.DOTALL,              r': (\d+)</h5'                                                                ) # Get playlist unavailable videos amount
-    get_playlist_size        = find( engine.DOTALL,              r'var itemsCount = (.*?) ||'                                                 ) # Get playlist video amount
+    get_playlist_size        = find( engine.DOTALL,              r'var itemsCount = (.*?) ||'                                                  ) # Get playlist video amount
     get_playlist_likes       = find( engine.DOTALL,              r'<span class="votesUp">(.*?)</span>'                                         ) # Get playlist likes
     get_playlist_dislikes    = find( engine.DOTALL,              r'<span class="votesDown">(.*?)</span>'                                       ) # Get playlist dislikes
     get_playlist_ratings     = find( engine.DOTALL,              r'<span class="percent">(.*?)%</span>'                                        ) # Get paylist like/dislike ratio

{phub-4.8.6 → phub-4.8.8}/src/phub/core.py

@@ -5,6 +5,8 @@ import re
 import time
 import logging
 import random
+import traceback
+
 import httpx
 
 from functools import cached_property
@@ -117,6 +119,7 @@ class Client:
              headers: dict = None,
              throw: bool = True,
              silent: bool = False,
+             params: dict = None,
              get_response = True) -> httpx.Response:
         '''
         Used internally to send a request or an API call.
@@ -156,6 +159,7 @@ class Client:
                     method = method,
                     url = url,
                     data = data,
+                    params = params,
                     get_response=get_response)
 
                 # Silent 429 errors
@@ -175,6 +179,7 @@ class Client:
                 break
 
             except Exception as err:
+                print(traceback.format_exc())
                 self.logger.log(logging.DEBUG if silent else logging.WARNING,
                            f'Call failed: {repr(err)}. Retrying (attempt {i + 1}/{self.core.config.max_retries})')
                 continue

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

@@ -4,11 +4,16 @@ import html
 import os
 import random
 import logging
+import traceback
 from functools import cached_property
+
+import httpx
 from base_api.base import setup_logger
 from datetime import datetime, timedelta
 from typing import TYPE_CHECKING, Iterator, Literal, Callable, Any, Union
 
+from httpx import request
+
 from . import Tag, Like, User, Image
 from .. import utils
 from .. import errors
@@ -262,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
 
@@ -383,7 +389,7 @@ class Video:
 
         self._assert_internal_success(res.json())
 
-    def watch_later(self, toggle: bool = True) -> None:
+    def watch_later(self, toggle: bool = True) -> bool:
         '''
         Add or remove the video to the watch later playlist.
 
@@ -391,14 +397,22 @@ class Video:
             toggle (bool): The toggle value.
         '''
 
-        mod = 'add' if toggle else 'remove'
+        if toggle:
+            res = self.client.call(f'api/v1/playlist/video_add_watchlater', 'POST', dict(
+                vid=self.id,
+                token=self.client._granted_token
+            ))
+            return res.is_success
 
-        res = self.client.call(f'playlist/video_{mod}_watchlater', 'POST', dict(
-            vid=self.id,
-            token=self.client._granted_token
-        ))
+        else:
+            res = self.client.call(
+                "api/v1/playlist/video_remove_watchlater",
+                method="DELETE",
+                params={"vid": str(self.id), "token": str(self.client._granted_token)},
+                headers={"Accept": "application/json"},
+            )
+            return res.is_success
 
-        self._assert_internal_success(res.json())
 
     # === Data properties === #
 

{phub-4.8.6 → 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.