- release v4.8.1

Author: EchterAlsFake

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "phub"
-version = "4.8.0"
+version = "4.8.1"
 description = "An API for Pornhub"
 authors = [
   {name = 'Egsagon', email = "[email protected]"},
@@ -13,7 +13,7 @@ classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python"
 ]
-dependencies = ["httpx[brotli,socks]", "ffmpeg-progress-yield", "eaf_base_api"]
+dependencies = ["httpx[brotli,socks]", "eaf_base_api"]
 requires-python = ">=3.9"
 
 

src/phub/objects/video.py

@@ -18,7 +18,6 @@
 
 if TYPE_CHECKING:
     from ..core import Client
-    from ..utils import Quality
 
 
 class Video:
@@ -226,7 +225,9 @@ def get_m3u8_urls(self) -> dict:
     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 @@ def download(self,
             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 @@ def download(self,
         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:

src/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="best", remux=True), str)
+    assert isinstance(video.download(path="./", quality="beest"), 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