phub 4.8.5__tar.gz → 4.8.7__tar.gz

{phub-4.8.5 → phub-4.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.8.5
+Version: 4.8.7
 Summary: An API for Pornhub
 Author-email: Egsagon <egsagon.git@gmail.com>, EchterAlsFake <EchterAlsFake@proton.me>
 License:                     GNU GENERAL PUBLIC LICENSE

{phub-4.8.5 → phub-4.8.7}/README.md

@@ -5,7 +5,7 @@
 <div align="center">
     <a href="https://pepy.tech/project/phub"><img src="https://static.pepy.tech/badge/phub" alt="Downloads"></a>
     <a href="https://badge.fury.io/py/phub"><img src="https://badge.fury.io/py/phub.svg" alt="PyPI version" height="18"></a>
-    <a href="https://github.com/EchterAlsFake/PHUB/workflows/"><img src="https://github.com/EchterAlsFake/PHUB/actions/workflows/tests.yml/badge.svg" alt="API Tests"/></a>
+    <a href="https://echteralsfake.duckdns.org/ci/PHUB/badge.svg"><img src="https://echteralsfake.duckdns.org/ci/PHUB/badge.svg" alt="API Tests"/></a>
 </div>
 
 <br>

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

@@ -1,6 +1,6 @@
 [project]
 name = "phub"
-version = "4.8.5"
+version = "4.8.7"
 description = "An API for Pornhub"
 authors = [
   {name = 'Egsagon', email = "egsagon.git@gmail.com"},

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

@@ -227,7 +227,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.5 → phub-4.8.7}/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
@@ -61,7 +63,7 @@ class Client:
         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)
+        self.core.session.cookies.update(consts.COOKIES)
         # Applying PornHub specific cookies and headers to base API
         self.logger.debug('Initialised new Client %s', self)
 
@@ -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.5 → phub-4.8.7}/src/phub/modules/parser.py

@@ -80,6 +80,6 @@ def challenge(client: Client, challenge: str, token: str) -> None:
     # Build and inject cookie
     cookie = f'{n}*{p // n}:{s}:{token}:1'
     client.core.config.cookies = {'KEY': cookie}
-    client.core.update_cookies()
+    client.core.session.cookies.update({'KEY': cookie})
     logger.info('Injected cookie %s', cookie)
 # EOF

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

@@ -5,10 +5,14 @@ import os
 import random
 import logging
 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
@@ -383,7 +387,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 +395,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.5 → phub-4.8.7}/src/phub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.8.5
+Version: 4.8.7
 Summary: An API for Pornhub
 Author-email: Egsagon <egsagon.git@gmail.com>, EchterAlsFake <EchterAlsFake@proton.me>
 License:                     GNU GENERAL PUBLIC LICENSE