KekikStream 0.4.2__tar.gz → 0.4.4__tar.gz

{kekikstream-0.4.2 → kekikstream-0.4.4}/KekikStream/Core/MediaHandler.py

@@ -12,14 +12,17 @@ class MediaHandler:
         self.headers = headers
         self.title   = title
 
-    def play_with_vlc(self, extract_data: ExtractResult):
+    def play_media(self, extract_data: ExtractResult):
         if subprocess.check_output(['uname', '-o']).strip() == b'Android':
             return self.play_with_android_mxplayer(extract_data)
 
-        try:
-            if "Cookie" in self.headers or extract_data.subtitles:
-                return self.play_with_mpv(extract_data)
+        if "Cookie" in self.headers or extract_data.subtitles:
+            return self.play_with_mpv(extract_data)
 
+        return self.play_with_vlc(extract_data)
+
+    def play_with_vlc(self, extract_data: ExtractResult):
+        try:
             vlc_command = ["vlc", "--quiet"]
 
             if self.title:
@@ -81,15 +84,39 @@ class MediaHandler:
             konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})
 
     def play_with_android_mxplayer(self, extract_data: ExtractResult):
-        try:
-            android_command = [
-                "am", "start", "-a", "android.intent.action.VIEW",
-                "-d", f"{extract_data.url}",
-                "-n", "com.mxtech.videoplayer.ad/com.mxtech.videoplayer.ad.ActivityScreen"
-            ]
-
-            with open(os.devnull, "w") as devnull:
-                subprocess.run(android_command, stdout=devnull, stderr=devnull, check=True)
-        except Exception as hata:
-            konsol.print(f"[red]Android MX Player oynatma hatası: {hata}[/red]")
-            konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})
+        paketler = [
+            "com.mxtech.videoplayer.ad/com.mxtech.videoplayer.ad.ActivityScreen",   # Free sürüm
+            "com.mxtech.videoplayer.pro/com.mxtech.videoplayer.pro.ActivityScreen"  # Pro sürüm
+        ]
+
+        for paket in paketler:
+            try:
+                android_command = [
+                    "am", "start",
+                    "-a", "android.intent.action.VIEW",
+                    "-d", extract_data.url,
+                    "-n", paket
+                ]
+
+                if self.title:
+                    android_command.extend(["--eu", "title", self.title])
+
+                if self.headers:
+                    headers_string = " ".join(f"{key}: {value}" for key, value in self.headers.items())
+                    android_command.extend(["--es", "headers", headers_string])
+
+                if extract_data.subtitles:
+                    subs_string = " ".join(subtitle.url for subtitle in extract_data.subtitles)
+                    android_command.extend(["--eu", "subs", subs_string])
+
+                with open(os.devnull, "w") as devnull:
+                    subprocess.run(android_command, stdout=devnull, stderr=devnull, check=True)
+
+                return
+
+            except subprocess.CalledProcessError as hata:
+                konsol.print(f"[red]{paket} oynatma hatası: {hata}[/red]")
+                konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})
+            except FileNotFoundError:
+                konsol.print(f"Paket: {paket}, Hata: MX Player kurulu değil")
+                konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})

{kekikstream-0.4.2 → kekikstream-0.4.4}/KekikStream/Managers/MediaManager.py

@@ -16,4 +16,4 @@ class MediaManager:
         self.media_handler.headers.update(headers)
 
     def play_media(self, extract_data):
-        self.media_handler.play_with_vlc(extract_data)
+        self.media_handler.play_media(extract_data)

{kekikstream-0.4.2 → kekikstream-0.4.4}/KekikStream/Plugins/SineWix.py

@@ -105,4 +105,4 @@ class SineWix(PluginBase):
     async def play(self, name: str, url: str, referer: str, subtitles: list[Subtitle]):
         extract_result = ExtractResult(name=name, url=url, referer=referer, subtitles=subtitles)
         self.media_handler.title = name
-        self.media_handler.play_with_vlc(extract_result)
+        self.media_handler.play_media(extract_result)

{kekikstream-0.4.2 → kekikstream-0.4.4}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.4.2
+Version: 0.4.4
 Summary: terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı
 Home-page: https://github.com/keyiflerolsun/KekikStream
 Author: keyiflerolsun

{kekikstream-0.4.2 → kekikstream-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.4.2
+Version: 0.4.4
 Summary: terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı
 Home-page: https://github.com/keyiflerolsun/KekikStream
 Author: keyiflerolsun

{kekikstream-0.4.2 → kekikstream-0.4.4}/setup.py

@@ -6,7 +6,7 @@ from io         import open
 setup(
     # ? Genel Bilgiler
     name         = "KekikStream",
-    version      = "0.4.2",
+    version      = "0.4.4",
     url          = "https://github.com/keyiflerolsun/KekikStream",
     description  = "terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı",
     keywords     = ["KekikStream", "KekikAkademi", "keyiflerolsun"],