- fixed pagination when searching

Author: EchterAlsFake

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "phub"
-version = "4.8.4"
+version = "4.8.5"
 description = "An API for Pornhub"
 authors = [
   {name = 'Egsagon', email = "[email protected]"},

src/phub/core.py

@@ -361,7 +361,7 @@ def search(self,
             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 @@ def search(self,
         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 @@ def search(self,
                 '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:
         '''

src/phub/objects/query.py

@@ -5,6 +5,7 @@
 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 @@ def __init__(self,
         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 @@ def _get_raw_page(self, index: int) -> str:
         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