phub 4.8.4__tar.gz → 4.8.6__tar.gz

{phub-4.8.4 → phub-4.8.6}/PKG-INFO

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

{phub-4.8.4 → phub-4.8.6}/pyproject.toml

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

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

@@ -61,7 +61,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)
 
@@ -361,7 +361,7 @@ class Client:
             AssertioneError: If one or more filters don't match their literals.
         '''
         
-        query = query.strip()
+        query = query.strip().lower()
         
         assert query, 'Query must be a non-empty string'
         
@@ -370,7 +370,7 @@ class Client:
         literals.ass('exclude_category', exclude_category, literals.category  )
         literals.ass('sort'            , sort            , literals.sort      )
         literals.ass('period'          , period          , literals.period    )
-        
+        s = f'search "{query}"'
         return queries.VideoQuery(
             client = self,
             func = 'video/search',
@@ -383,8 +383,7 @@ class Client:
                 't': literals.map.period.get(period),
                 'hd': literals._craft_boolean(hd)
             },
-            query_repr = query
-        )
+            query_repr = s)
     
     def get_playlist(self, playlist: Union[str, int, Playlist]) -> Playlist:
         '''

{phub-4.8.4 → phub-4.8.6}/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.4 → phub-4.8.6}/src/phub/objects/query.py

@@ -5,6 +5,7 @@ import logging
 from base_api.base import setup_logger
 from functools import cache, cached_property
 from typing import TYPE_CHECKING, Iterator, Any, Callable, Union
+from urllib.parse import urlencode, urlsplit, parse_qsl, urlunsplit
 
 from . import Video, User, FeedItem
 
@@ -93,7 +94,6 @@ class Query:
         self._query_repr = query_repr
         
         # Build URL
-        args |= {'page': '{page}'}
         self.url = utils.concat(self.BASE, func, utils.urlify(args))
         
         self.suppress_spicevids = True
@@ -181,14 +181,17 @@ class Query:
         Returns:
             str: The raw page content.
         '''
-        
+
         assert isinstance(index, int)
-        url = self.url.format(page = index + 1)
+        parts = list(urlsplit(self.url))
+        q = dict(parse_qsl(parts[3], keep_blank_values=True))
+        q['page'] = str(index + 1)  # PH uses 1-based pages; omit or set "1" for page 1
+        parts[3] = urlencode(q)
+        url = urlunsplit(parts)
+
         req = self.client.call(url, get_response=True, throw=False)
-        
         if req.status_code == 404:
             raise errors.NoResult()
-        
         return req.text
     
     @cache

{phub-4.8.4 → phub-4.8.6}/src/phub.egg-info/PKG-INFO

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