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

phub/core.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.8.4
+Version: 4.8.5
 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.dist-info → phub-4.8.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=rY5wiZ6gsPQPQY8xqC3V53D4Iah4P4M5g5CfR62IXpQ,18423
+phub/core.py,sha256=_5iMMcvnt9Ue-1YY1u0Nlc4Sra-VMHFoiLcxIaUSLSM,18441
 phub/errors.py,sha256=KiNt_4T4ffzgL-2iIfD8qhIHN_5DeKV4FLPcY72sOw8,1822
 phub/literals.py,sha256=ZnRnn5hJNI3hM6aj2YxsxPANUR-PCqfE2SuQGD8_Yq4,10794
 phub/utils.py,sha256=MYPYvpLrWAYXcwpSUJnRWvFNP0N9iOyLxkzaJFsk8GA,6582
@@ -15,7 +15,7 @@ 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=hpP76yH23LdDS0iL28jhp_iG7EGetYJA3xoqZZdXjTs,3278
-phub/objects/query.py,sha256=crYC-MJGEf04XO3hfU7FPyyHEnBWS9D8XbeQmtTnpzQ,11596
+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/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,9 +24,9 @@ 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.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-phub-4.8.4.dist-info/METADATA,sha256=FrkX4nJyEFB61jgpBTB77lbVkj4SxY7loM2rUBa43TE,41758
-phub-4.8.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-phub-4.8.4.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
-phub-4.8.4.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
-phub-4.8.4.dist-info/RECORD,,
+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,,