phub 4.7.8__tar.gz → 4.7.9__tar.gz

{phub-4.7.8 → phub-4.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.7.8
+Version: 4.7.9
 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 → phub-4.7.9}/pyproject.toml

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

{phub-4.7.8 → phub-4.7.9}/src/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-4.7.8 → phub-4.7.9}/src/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-4.7.8 → phub-4.7.9}/src/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-4.7.8 → phub-4.7.9}/src/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-4.7.9/src/phub/tests/test_auth.py

@@ -0,0 +1,26 @@
+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():
+    
+    email = os.getenv('EMAIL')
+    password = os.getenv('PASSWORD')
+    
+    assert email and password
+
+    config.request_delay = 0
+    core = BaseCore(config=config)
+    client = Client(language="en", core=core, email=email, password=password)
+
+    assert client.logged
+
+# EOF

{phub-4.7.8 → phub-4.7.9}/src/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-4.7.8 → phub-4.7.9}/src/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-4.7.8 → phub-4.7.9}/src/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-4.7.8 → phub-4.7.9}/src/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 → phub-4.7.9}/src/phub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.7.8
+Version: 4.7.9
 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/src/phub/tests/test_auth.py

@@ -1,21 +0,0 @@
-import os
-
-try:
-    from phub import Client
-
-except (ModuleNotFoundError, ImportError):
-    from ...phub import Client
-
-def test_auth():
-    
-    email = os.getenv('EMAIL')
-    password = os.getenv('PASSWORD')
-    
-    assert email and password
-    
-    client = Client(email, password, login = False)
-    client.login()
-    
-    assert client.logged
-
-# EOF