phub 4.7.9__py3-none-any.whl → 4.8.1__py3-none-any.whl

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/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/video.py

@@ -18,7 +18,6 @@ from ..modules import parser, display
 
 if TYPE_CHECKING:
     from ..core import Client
-    from ..utils import Quality
 
 
 class Video:
@@ -226,7 +225,9 @@ class Video:
     def download(self,
                  path: Union[str, os.PathLike],
                  downloader: Union[Callable, str] = "threaded",
-                 quality: Quality | str = 'best',
+                 quality: str = 'best',
+                 remux: bool = False,
+                 display_remux: Callable[[int, int], None] = None,
                  *,
                  display: Callable[[int, int], None] = display.default()) -> str:
         '''
@@ -237,6 +238,8 @@ class Video:
             quality (Quality | str | int): The video quality.
             downloader (Callable): The download backend.
             display (Callable): The progress display.
+            remux (bool): Whether to remux the video from MPEG-TS to MP4 (h264)
+            display_remux (Callable[[int, int], None], optional): The display backend for remuxing.
 
         Returns:
             str: The downloader video path.
@@ -249,37 +252,14 @@ class Video:
         self.logger.info('Starting download for %s at %s', self, path)
 
         try:
-            self.client.core.download(video=self, quality=quality, path=path, callback=display, downloader=downloader)
+            self.client.core.download(video=self, quality=quality, path=path, callback=display, downloader=downloader,
+                                      remux=remux, callback_remux=display_remux)
 
         except Exception as e:
             self.logger.error(f"An error occured while downloading video {e}")
 
         return path
 
-    def get_direct_url(self, quality: Quality) -> str:
-        '''
-        Get the direct video URL given a specific quality.
-
-        Args:
-            quality (Quality): The video quality.
-
-        Returns:
-            str: The direct url.
-        '''
-
-        from ..utils import Quality
-        qual = Quality(quality)
-
-        # Get remote
-        sources = self.fetch('page@mediaDefinitions')
-        remote = [s for s in sources if 'remote' in s][0]['videoUrl']
-
-        # Parse quality
-        quals = {int(s['quality']): s['videoUrl']
-                 for s in self.client.call(remote).json()}
-
-        return qual.select(quals)
-
     # === Interaction methods === #
 
     def _assert_internal_success(self, res: dict) -> None:

phub/tests/test_video.py

@@ -23,7 +23,8 @@ def test_video_information():
     embed = video.embed
     image = video.image.url
     id = video.id
-
+    assert isinstance(video.download(path="./", quality="worst", remux=True), str)
+    assert isinstance(video.download(path="./", quality="worst"), str)
     assert isinstance(title, str) and len(title) > 3
     assert isinstance(likes, int) and len(str(likes)) >= 1
     assert isinstance(dislikes, int) and len(str(dislikes)) >= 1

{phub-4.7.9.dist-info → phub-4.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phub
-Version: 4.7.9
+Version: 4.8.1
 Summary: An API for Pornhub
 Author-email: Egsagon <egsagon.git@gmail.com>, EchterAlsFake <EchterAlsFake@proton.me>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -688,7 +688,6 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx[brotli,socks]
-Requires-Dist: ffmpeg-progress-yield
 Requires-Dist: eaf_base_api
 Dynamic: license-file
 

{phub-4.7.9.dist-info → phub-4.8.1.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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
@@ -15,18 +15,18 @@ 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=DaB-X-lDomm1vemcG2XFVEoWNZYhLA3iZoWyui_vhsY,11583
+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/objects/video.py,sha256=8LTrr0wszjMtm0mK1_gJzEos_NPCWBuxNfPWxZ8g5X4,18876
 phub/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.7.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-phub-4.7.9.dist-info/METADATA,sha256=vEccGSCPA-gWB85BA7zOpcbdYgGtByH_g60KSIxr42E,41777
-phub-4.7.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-phub-4.7.9.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
-phub-4.7.9.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
-phub-4.7.9.dist-info/RECORD,,
+phub/tests/test_video.py,sha256=4E70tiza45byMFIrjBdnpP3xOSyk1YKoTGNP4_QTI0E,1465
+phub-4.8.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+phub-4.8.1.dist-info/METADATA,sha256=zR76THI_K4DfAuuZHMJ9F4x0o42BjXYB1GhQWpuFsLk,41740
+phub-4.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+phub-4.8.1.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
+phub-4.8.1.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
+phub-4.8.1.dist-info/RECORD,,