phub 4.8.5__py3-none-any.whl → 4.8.7__py3-none-any.whl

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/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/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/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.dist-info → phub-4.8.7.dist-info}/METADATA

@@ -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.dist-info → phub-4.8.7.dist-info}/RECORD

@@ -1,13 +1,13 @@
 phub/__init__.py,sha256=tEWpP7XSkDB9_M5iJ1XHSgpJ6g4olWqYTX8f9IBpIAA,635
 phub/__main__.py,sha256=nP5IffsxbcFzPdGkMWky4fs647NOswW9DT-S5AcLQtU,4028
-phub/consts.py,sha256=a-okcZtwtSDmt4eub_acE1xWg1Fqxm1DZ9yy7aVGvM0,12453
-phub/core.py,sha256=_5iMMcvnt9Ue-1YY1u0Nlc4Sra-VMHFoiLcxIaUSLSM,18441
+phub/consts.py,sha256=5CAmnpxAzX_-S2Mj6WlmpCgy10opck8ejQsbDYanN-8,12454
+phub/core.py,sha256=ZZXGXQpF74MuI9bft8op1vlo_Ia6AQBH5jdqM8xNAAI,18576
 phub/errors.py,sha256=KiNt_4T4ffzgL-2iIfD8qhIHN_5DeKV4FLPcY72sOw8,1822
 phub/literals.py,sha256=ZnRnn5hJNI3hM6aj2YxsxPANUR-PCqfE2SuQGD8_Yq4,10794
 phub/utils.py,sha256=MYPYvpLrWAYXcwpSUJnRWvFNP0N9iOyLxkzaJFsk8GA,6582
 phub/modules/__init__.py,sha256=h8BQjvxnqCEXxDCn7iDvnGLv0ZF_lE0dFlI7HVkzN5A,133
 phub/modules/display.py,sha256=qOUaDGZJbGp80JAqPu_T__F2Mzwr3FBRnhrAdYdVjoE,2444
-phub/modules/parser.py,sha256=v2iDYAZB6VQ6KvKR_Oe1Cs5Du42W0yNFvtliJKxbZdI,2337
+phub/modules/parser.py,sha256=-7q3818wqDX1YMQouY9JguHDaULYiXFkL6rheHf-Big,2360
 phub/modules/rss.py,sha256=j666dZenn3tWgLVXd2U3ox2-tWyUynFXuArzG2bmOFc,980
 phub/objects/__init__.py,sha256=BHOythbS-r01YKYSxtExBlJZYF38hkp85aLAoVQfDd4,446
 phub/objects/account.py,sha256=B1hSHmYHip08Gy-TdVmYq25iAA8rjdVuzwwkpjGjl8c,6044
@@ -17,16 +17,16 @@ phub/objects/image.py,sha256=qCLuaOy-EYzA_uXxiPRQeCLHPf9gFr0o7TDszQvWXZs,3376
 phub/objects/playlist.py,sha256=hpP76yH23LdDS0iL28jhp_iG7EGetYJA3xoqZZdXjTs,3278
 phub/objects/query.py,sha256=gALFeOQA48loUStLA_d9npQHIAkw0CdTAIOQ_h_tFuA,11811
 phub/objects/user.py,sha256=pIumIGC_MQXQ-hjzf_0c0I_egL4WziHrh2e8XegArEc,8161
-phub/objects/video.py,sha256=0XJL-PP8HVqb2uUexIMZVfQ29-qGEeb60_yVoj3RLuc,19169
+phub/objects/video.py,sha256=OVzeqQUQJfTMvtPXKARB-ZbmcPHZ3zhY2e04ekodJbA,19524
 phub/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phub/tests/test_auth.py,sha256=ySy1Aw0bogMGDSTmzVXO_W352cbRFzXUGjuDX1Iu0xE,609
 phub/tests/test_model.py,sha256=hRpmIjsx2z0EjTWsIpwT_vpHm-H4wCmZtvGWOohaIKQ,1426
 phub/tests/test_playlist.py,sha256=-hS5bIBecsv3zSNlUo66b73DdVbkYlmVThYip9Ivpss,1081
 phub/tests/test_search.py,sha256=VeqyjVzu0QnIYR6NhcujXy8wfCcWn1BlvKS06iY-7JY,1301
 phub/tests/test_video.py,sha256=4E70tiza45byMFIrjBdnpP3xOSyk1YKoTGNP4_QTI0E,1465
-phub-4.8.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-phub-4.8.5.dist-info/METADATA,sha256=K7OEBgDD9c1VArJvma_ccZmUZ0yi177cSxbUmIMon8k,41758
-phub-4.8.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-phub-4.8.5.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
-phub-4.8.5.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
-phub-4.8.5.dist-info/RECORD,,
+phub-4.8.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+phub-4.8.7.dist-info/METADATA,sha256=G-Od1A2D4sHRysnOv546u18w-yXUbWyu7Ojr0Kfgqrg,41758
+phub-4.8.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+phub-4.8.7.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
+phub-4.8.7.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
+phub-4.8.7.dist-info/RECORD,,