phub 4.8.0__py3-none-any.whl → 4.8.2__py3-none-any.whl

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:
@@ -219,14 +218,22 @@ class Video:
             except Exception as e:
                 self.logger.warning(f"Skipping invalid quality entry: {q}, {e}")
                 continue
-
         return quality_urls
 
+    def get_segments(self, quality) -> list:
+        """
+        :param quality: (str) The video quality
+        :return: (list) A list of segments (URLs)
+        """
+        segments = self.client.core.get_segments(m3u8_url_master=self.m3u8_base_url, quality=quality)
+        return segments
 
     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 +244,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 +258,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.8.0.dist-info → phub-4.8.2.dist-info}/METADATA

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

@@ -17,16 +17,16 @@ 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/user.py,sha256=pIumIGC_MQXQ-hjzf_0c0I_egL4WziHrh2e8XegArEc,8161
-phub/objects/video.py,sha256=oPfKaxCulvSWoCNvp0w7DZACfl9Vx8DaOdDWEye69w4,19191
+phub/objects/video.py,sha256=NgsfxgqwjkiTKcNLEgwfMLfeGU7n2j4ZF3Vkq4LocR0,19168
 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.8.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-phub-4.8.0.dist-info/METADATA,sha256=hWshEqar7OxI6ZaGjINSVfkUratn5fGayKqtbctNNsc,41777
-phub-4.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-phub-4.8.0.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
-phub-4.8.0.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
-phub-4.8.0.dist-info/RECORD,,
+phub/tests/test_video.py,sha256=4E70tiza45byMFIrjBdnpP3xOSyk1YKoTGNP4_QTI0E,1465
+phub-4.8.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+phub-4.8.2.dist-info/METADATA,sha256=A7_wFWtOTpS6k9qVA3VwX6A4ky-uuM24sef4gpExgu0,41740
+phub-4.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+phub-4.8.2.dist-info/entry_points.txt,sha256=oxL1BvDV19M1IGLgwFElgb37PlmGnblDBEfMwx3x6u8,44
+phub-4.8.2.dist-info/top_level.txt,sha256=xqJ5Lg28Ba-pgvXf8qwpTFurW3neZhguNd8bhbQonZo,5
+phub-4.8.2.dist-info/RECORD,,