Merge pull request #191 from viu-media/minor-fixes

Fix #188 wrong video resolution from animepahe provider

Author: Benexl

viu_media/cli/service/player/ipc/mpv.py

@@ -5,6 +5,7 @@
 
 import json
 import logging
+import os
 import socket
 import subprocess
 import tempfile
@@ -43,7 +44,7 @@ class MPVIPCClient:
 
     def __init__(self, socket_path: str):
         self.socket_path = socket_path
-        self.socket: Optional[socket.socket] = None
+        self.socket: Optional[Any] = None
         self._request_id_counter = 0
         self._lock = threading.Lock()
 
@@ -55,16 +56,55 @@ def __init__(self, socket_path: str):
         self._response_dict: Dict[int, Any] = {}
         self._response_events: Dict[int, threading.Event] = {}
 
+    @staticmethod
+    def _is_windows_named_pipe(path: str) -> bool:
+        return path.startswith("\\\\.\\pipe\\")
+
+    @staticmethod
+    def _supports_unix_sockets() -> bool:
+        return hasattr(socket, "AF_UNIX")
+
+    @staticmethod
+    def _open_windows_named_pipe(path: str):
+        # MPV's JSON IPC on Windows uses named pipes like: \\.\pipe\mpvpipe
+        # Opening the pipe as a binary file supports read/write.
+        f = open(path, "r+b", buffering=0)
+
+        class _PipeConn:
+            def __init__(self, fileobj):
+                self._f = fileobj
+
+            def recv(self, n: int) -> bytes:
+                return self._f.read(n)
+
+            def sendall(self, data: bytes) -> None:
+                self._f.write(data)
+                self._f.flush()
+
+            def close(self) -> None:
+                self._f.close()
+
+        return _PipeConn(f)
+
     def connect(self, timeout: float = 5.0) -> None:
         """Connect to MPV IPC socket and start the reader thread."""
-        if not hasattr(socket, "AF_UNIX"):
-            raise MPVIPCError("Unix domain sockets are unavailable on this platform")
 
         start_time = time.time()
         while time.time() - start_time < timeout:
             try:
-                self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-                self.socket.connect(self.socket_path)
+                if self._supports_unix_sockets() and not self._is_windows_named_pipe(
+                    self.socket_path
+                ):
+                    self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) # type: ignore (type error on Windows but this code path won't be used there)
+                    self.socket.connect(self.socket_path)
+                else:
+                    if os.name != "nt" or not self._is_windows_named_pipe(self.socket_path):
+                        raise MPVIPCError(
+                            "MPV IPC requires Unix domain sockets (AF_UNIX) or a Windows named pipe path "
+                            "like \\\\.\\pipe\\mpvpipe. Got: "
+                            f"{self.socket_path}"
+                        )
+                    self.socket = self._open_windows_named_pipe(self.socket_path)
                 logger.info(f"Connected to MPV IPC socket at {self.socket_path}")
                 self._start_reader_thread()
                 return
@@ -302,10 +342,6 @@ def play(
     def _play_with_ipc(self, player: BasePlayer, params: PlayerParams) -> PlayerResult:
         """Play media using MPV IPC."""
         try:
-            if not hasattr(socket, "AF_UNIX"):
-                raise MPVIPCError(
-                    "MPV IPC requires Unix domain sockets, which are unavailable on this platform."
-                )
             self._start_mpv_process(player, params)
             self._connect_ipc()
             self._setup_event_handling()
@@ -336,8 +372,12 @@ def _play_with_ipc(self, player: BasePlayer, params: PlayerParams) -> PlayerResu
 
     def _start_mpv_process(self, player: BasePlayer, params: PlayerParams) -> None:
         """Start MPV process with IPC enabled."""
-        temp_dir = Path(tempfile.gettempdir())
-        self.socket_path = str(temp_dir / f"mpv_ipc_{time.time()}.sock")
+        if hasattr(socket, "AF_UNIX"):
+            temp_dir = Path(tempfile.gettempdir())
+            self.socket_path = str(temp_dir / f"mpv_ipc_{time.time()}.sock")
+        else:
+            # Windows MPV IPC uses named pipes.
+            self.socket_path = f"\\\\.\\pipe\\mpv_ipc_{int(time.time() * 1000)}"
         self.mpv_process = player.play_with_ipc(params, self.socket_path)
         time.sleep(1.0)
 
@@ -487,7 +527,11 @@ def _cleanup(self):
                 self.mpv_process.wait(timeout=3)
             except subprocess.TimeoutExpired:
                 self.mpv_process.kill()
-        if self.socket_path and Path(self.socket_path).exists():
+        if (
+            self.socket_path
+            and not self.socket_path.startswith("\\\\.\\pipe\\")
+            and Path(self.socket_path).exists()
+        ):
             Path(self.socket_path).unlink(missing_ok=True)
 
     def _get_episode(

viu_media/libs/provider/anime/animepahe/mappers.py

@@ -1,3 +1,5 @@
+import logging
+
 from ..types import (
     Anime,
     AnimeEpisodeInfo,
@@ -20,6 +22,8 @@
     "raw": MediaTranslationType.RAW,
 }
 
+logger = logging.getLogger(__name__)
+
 
 def map_to_search_results(data: AnimePaheSearchPage) -> SearchResults:
     results = []
@@ -98,6 +102,12 @@ def map_to_server(
         )
         for link in stream_links
     ]
+
+    # sort links by quality, best to worst
+    links.sort(key=lambda x: int(x.quality), reverse=True)
+    logger.debug(f"Aggregated links: {links}")
+
     return Server(
         name="kwik", links=links, episode_title=episode.title, headers=headers
     )
+