phub 4.7.8__py3-none-any.whl → 4.8.0__py3-none-any.whl

phub/consts.py

@@ -227,8 +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
-    playlist_data            = find( engine.DOTALL,              r'id=\"playlistWrapper(.*?)playlistSectionWrapper\"'                          ) # Get playlist data container
-    get_playlist_size        = find( engine.DOTALL,              r'- (\d+).*?\"avatarPosition'                                                 ) # 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

@@ -1,7 +1,7 @@
 '''
 PHUB core module.
 '''
-
+import re
 import time
 import logging
 import random
@@ -209,12 +209,13 @@ class Client:
             raise errors.ClientAlreadyLogged()
     
         # Get token
-        page = self.call('').text
+        page = self.call('https://www.pornhub.com').text
         try:
             base_token = consts.re.get_token(page)
 
         except errors.RegexError:
-            raise LoginFailed("(Probably) invalid credentials. If you are sure they are correct, please report this issue.")
+            self.logger.warning("Couldn't get token. Trying alternative method...")
+            base_token = re.search(r'data-token="(.*?)"', string=page).group(1)
 
         # Send credentials
         payload = consts.LOGIN_PAYLOAD | self.credentials | {'token': base_token}

phub/modules/parser.py

@@ -79,8 +79,7 @@ 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.config.cookies = {'KEY': cookie}
     client.core.update_cookies()
     logger.info('Injected cookie %s', cookie)
-    print("Injected cookie for authentication")
 # EOF

phub/objects/playlist.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import re
+import time
 from typing import TYPE_CHECKING
 from functools import cache, cached_property
 
@@ -34,7 +36,6 @@ class Playlist(queries.VideoQuery):
         
         # Initialise 
         super().__init__(client, func = None)
-        
         # Define both playlist url (first page) and chunked (next pages)
         self.url = 'playlist/' + str(pid)
         self.chunk_url = f'playlist/viewChunked?id={pid}' '&token={token}&page={page}'
@@ -70,13 +71,9 @@ class Playlist(queries.VideoQuery):
             raise errors.NoResult()
         
         return response.text
-    
-    @cached_property
-    def _data(self) -> str:
-        return consts.re.playlist_data(self._page)
 
     def __len__(self) -> int:
-        return int(consts.re.get_playlist_size(self._page))
+        return int(re.search(r'var\s+itemsCount\s*=\s*(\d+)\s*\|\|', string=self._page).group(1))
     
     @cached_property
     def hidden_videos_amount(self) -> int:
@@ -89,27 +86,27 @@ class Playlist(queries.VideoQuery):
     @cached_property
     def like(self) -> Like:
         return Like(
-            int(consts.re.get_playlist_likes(self._data)),
-            int(consts.re.get_playlist_dislikes(self._data)),
-            float(consts.re.get_playlist_ratings(self._data))
+            int(consts.re.get_playlist_likes(self._page)),
+            int(consts.re.get_playlist_dislikes(self._page)),
+            float(consts.re.get_playlist_ratings(self._page))
         )
 
     @cached_property
     def views(self) -> int:
-        raw: str = consts.re.get_playlist_views(self._data)
+        raw: str = consts.re.get_playlist_views(self._page)
         return int(raw.replace(',', ''))
     
     @cached_property
     def tags(self) -> list[str]:
-        return consts.re.get_playlist_tags(self._data)
+        return consts.re.get_playlist_tags(self._page)
 
     @cached_property
     def author(self) -> User:
-        url = consts.re.get_playlist_author(self._data)
+        url = consts.re.get_playlist_author(self._page)
         return User.get(self.client, consts.HOST + url)
     
     @cached_property
     def title(self) -> str:
-        return consts.re.get_playlist_title(self._data)
+        return consts.re.get_playlist_title(self._page)
 
 # EOF

phub/objects/query.py

@@ -184,7 +184,7 @@ class Query:
         
         assert isinstance(index, int)
         url = self.url.format(page = index + 1)
-        req = self.client.call(url, get_response=True)
+        req = self.client.call(url, get_response=True, throw=False)
         
         if req.status_code == 404:
             raise errors.NoResult()

phub/objects/user.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 import logging
+import re
 
 from dataclasses import dataclass
 from functools import cached_property
+
 from base_api.base import setup_logger
 from typing import TYPE_CHECKING, Literal, Union
 
@@ -223,8 +225,16 @@ class User:
         '''
         The user bio.
         '''
-        
-        return consts.re.user_bio(self._page, throw = False)
+        try:
+            bio = consts.re.user_bio(self._page, throw = False)
+            assert bio, str
+        except (errors.RegexError, AssertionError):
+            try:
+                bio = re.search(r'<div class="profileReadMoreExcerpt">\s*(.*?)\s*</div>', self._page, re.DOTALL).group(1)
+            except AttributeError:
+                return None # User has no bio probably
+
+        return bio
 
     @cached_property
     def info(self) -> dict[str, str]:
@@ -247,10 +257,14 @@ class User:
         '''
         
         from . import Image
-        
-        url = (getattr(self, '_cached_avatar_url')
+        try:
+            url = (getattr(self, '_cached_avatar_url')
                or consts.re.user_avatar(self._page))
-        
+
+        except errors.RegexError:
+            url = (getattr(self, '_cached_avatar_url')
+                   or re.search(r"/(?:model|pornstar)/(.*?)/about", string=self._page).group(1))
+
         return Image(client = self.client,
                      url = url,
                      name = f'{self.name}-avatar')

phub/tests/test_auth.py

@@ -1,10 +1,14 @@
-import os
-
 try:
+    import os
     from phub import Client
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
 
 except (ModuleNotFoundError, ImportError):
+    import os
     from ...phub import Client
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
 
 def test_auth():
     
@@ -12,10 +16,11 @@ def test_auth():
     password = os.getenv('PASSWORD')
     
     assert email and password
-    
-    client = Client(email, password, login = False)
-    client.login()
-    
+
+    config.request_delay = 0
+    core = BaseCore(config=config)
+    client = Client(language="en", core=core, email=email, password=password)
+
     assert client.logged
 
 # EOF

phub/tests/test_model.py

@@ -1,14 +1,19 @@
 try:
     from phub import Client
-
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
 except (ModuleNotFoundError, ImportError):
     from ...phub import Client
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
+
+config.request_delay = 0
+core = BaseCore(config=config)
+client = Client(language="en", core=core)  # Make a delay, so that PornHub isn't stressed too much
 
 url = "https://pornhub.com/pornstar/nancy-a"
-client = Client(language="en")  # Make a delay, so that PornHub isn't stressed too much
 model = client.get_user(url)
 
-
 def test_info():
     assert isinstance(model.info, dict)
 

phub/tests/test_playlist.py

@@ -1,8 +1,11 @@
 try:
     from phub import Client, Like, User
-
-except (ImportError, ModuleNotFoundError):
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
+except (ModuleNotFoundError, ImportError):
     from ...phub import Client, Like, User
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
 
 url = "https://de.pornhub.com/playlist/113348141"
 client = Client(language="en")

phub/tests/test_search.py

@@ -1,13 +1,16 @@
 try:
     from phub import Client
-    from phub import literals
-
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
 except (ModuleNotFoundError, ImportError):
     from ...phub import Client
-    from ...phub import literals
-
-client = Client(language="en")
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
 
+config.request_delay = 0
+core = BaseCore(config=config)
+client = Client(language="en", core=core)  # Make a delay, so that PornHub isn't stressed too much
+print(f"Using config:; {client.core.config.request_delay}")
 
 def test_basic_search():
     search = client.search("Mia Khalifa")  # for the nostalgia

phub/tests/test_video.py

@@ -1,10 +1,13 @@
 try:
     from phub import Client
-
-except (ImportError, ModuleNotFoundError):
+    from base_api.modules.config import config
+    from base_api.base import BaseCore
+except (ModuleNotFoundError, ImportError):
     from ...phub import Client
 
-client = Client(language="en")
+config.request_delay = 0
+core = BaseCore(config=config)
+client = Client(language="en", core=core)  # Make a delay, so that PornHub isn't stressed too much
 url = "https://de.pornhub.com/view_video.php?viewkey=ph60f99fa4b5cd7"
 video = client.get(url)
 

{phub-4.7.8.dist-info → phub-4.8.0.dist-info}/METADATA

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

{phub-4.7.8.dist-info → phub-4.8.0.dist-info}/RECORD

@@ -1,32 +1,32 @@
 phub/__init__.py,sha256=tEWpP7XSkDB9_M5iJ1XHSgpJ6g4olWqYTX8f9IBpIAA,635
 phub/__main__.py,sha256=rRph6K-lXFURL7t8s0q_XB5-4Bqtrkg_ZoERjhjNmow,3637
-phub/consts.py,sha256=fp5dqY5DHtoxH82S_Rcz4LCAVJZlMUH5Wl5pH_d6l4U,12629
-phub/core.py,sha256=gbnB9-IO_DGQgTXsjUmUbZxWpIDadieeFMmcabF4u1U,18254
+phub/consts.py,sha256=a-okcZtwtSDmt4eub_acE1xWg1Fqxm1DZ9yy7aVGvM0,12453
+phub/core.py,sha256=JeD-Z0tqxXvWotVhlZu0Lor0Sw3QcnUyAXyAcsEBfGA,18325
 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=BxI8SSx8tc-BUkrWYG-75BjgS2dwlw9M5QXHoyci3Gs,2445
-phub/modules/parser.py,sha256=BbJw0iDZ0dhaJEuoWKoRr68CthMz_yl7AzC01eJoZOo,2385
+phub/modules/parser.py,sha256=v2iDYAZB6VQ6KvKR_Oe1Cs5Du42W0yNFvtliJKxbZdI,2337
 phub/modules/rss.py,sha256=j666dZenn3tWgLVXd2U3ox2-tWyUynFXuArzG2bmOFc,980
 phub/objects/__init__.py,sha256=BHOythbS-r01YKYSxtExBlJZYF38hkp85aLAoVQfDd4,446
 phub/objects/account.py,sha256=B1hSHmYHip08Gy-TdVmYq25iAA8rjdVuzwwkpjGjl8c,6044
 phub/objects/data.py,sha256=hJpbuL185CLmISYCsmVu8WZVJEsiFC246bL1-QHa9j0,5967
 phub/objects/feed.py,sha256=JFvNc59VfGXU3PiW17GySQooy-5h8zLfl0vHIs9ga48,2691
 phub/objects/image.py,sha256=qCLuaOy-EYzA_uXxiPRQeCLHPf9gFr0o7TDszQvWXZs,3376
-phub/objects/playlist.py,sha256=WmFI9EIqSpKxyRmPmGHzT2OUbKo9qsBv0-fWUJrZZFw,3332
-phub/objects/query.py,sha256=DaB-X-lDomm1vemcG2XFVEoWNZYhLA3iZoWyui_vhsY,11583
-phub/objects/user.py,sha256=pcsy-HMxgjrGhokCm0glg_DwIiRc4IZ87bThdZZXeLs,7627
+phub/objects/playlist.py,sha256=hpP76yH23LdDS0iL28jhp_iG7EGetYJA3xoqZZdXjTs,3278
+phub/objects/query.py,sha256=crYC-MJGEf04XO3hfU7FPyyHEnBWS9D8XbeQmtTnpzQ,11596
+phub/objects/user.py,sha256=pIumIGC_MQXQ-hjzf_0c0I_egL4WziHrh2e8XegArEc,8161
 phub/objects/video.py,sha256=oPfKaxCulvSWoCNvp0w7DZACfl9Vx8DaOdDWEye69w4,19191
 phub/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-phub/tests/test_auth.py,sha256=QEnHrPvfTQesEFyDeaZ2bIRgB10dwqygsjM3QeSWRmQ,357
-phub/tests/test_model.py,sha256=i39bxsw16X0_-iL4Jfy-CwbGH9y5UeTzFZp0l-6WyjM,1188
-phub/tests/test_playlist.py,sha256=nByfOysRBwQUF2nyfKdldSW1Oq2cULRcTkphmF3QQQk,910
-phub/tests/test_search.py,sha256=G1u9OUttBWfko-M71MBqgtEzUjYj8NXtsApB-MZY0Fs,1010
-phub/tests/test_video.py,sha256=_TgI5oxLKlh3hSOYf7KDwYiQL2cLITNwiNkBFJQQLpE,1103
-phub-4.7.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-phub-4.7.8.dist-info/METADATA,sha256=qaynT-pFgtK-ymXHZxSlT7TpVoLB7J4dXNoFoeaZ1Sw,41777
-phub-4.7.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-phub-4.7.8.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
-phub-4.7.8.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
-phub-4.7.8.dist-info/RECORD,,
+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=bX-gPhDa34p6-5Ei20gh9opNkLs_08JHEfhVlQUwfMU,1312
+phub-4.8.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+phub-4.8.0.dist-info/METADATA,sha256=hWshEqar7OxI6ZaGjINSVfkUratn5fGayKqtbctNNsc,41777
+phub-4.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+phub-4.8.0.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
+phub-4.8.0.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
+phub-4.8.0.dist-info/RECORD,,