KekikStream 0.2.4__tar.gz → 0.2.5__tar.gz

kekikstream-0.2.5/KekikStream/Extractors/Odnoklassniki.py

@@ -0,0 +1,94 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+import re
+import json
+
+class Odnoklassniki(ExtractorBase):
+    name     = "Odnoklassniki"
+    main_url = "https://odnoklassniki.ru"
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        self.oturum.headers.update({
+            "User-Agent": "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
+        })
+
+        try:
+            # İlk isteği yap, ancak yönlendirmeyi manuel olarak kontrol et.
+            istek = await self.oturum.get(url, follow_redirects=False)
+            if istek.status_code == 302:  # Yönlendirme varsa
+                redirected_url = istek.headers.get("Location")
+                if not redirected_url:
+                    raise ValueError("Redirect location not found.")
+
+                # Yönlendirilmiş URL'yi kullanarak isteği yeniden yap.
+                url = redirected_url if redirected_url.startswith("http") else f"https://{redirected_url}"
+                istek = await self.oturum.get(url)
+
+            istek.raise_for_status()
+        except Exception as e:
+            raise RuntimeError(f"Failed to fetch the URL: {url}, Error: {e}")
+
+        response_text = (
+            istek.text.replace("\\"", "\"")
+                      .replace("\\\\", "\\")
+                      .replace(r"\\u", "\\u")
+        )
+        response_text = re.sub(
+            r"\\u([0-9A-Fa-f]{4})", 
+            lambda match: chr(int(match.group(1), 16)), 
+            response_text
+        )
+
+        videos_match = re.search(r'"videos":(\[.*?\])', response_text)
+        if not videos_match:
+            raise ValueError("No video data found in the response.")
+
+        videos_str = videos_match.group(1)
+        try:
+            videos = json.loads(videos_str)
+        except json.JSONDecodeError:
+            raise ValueError("Failed to parse video data.")
+
+        quality_order = {
+            "ULTRA": 6,  # 4K veya daha yüksek
+            "QUAD": 5,   # 1440p
+            "FULL": 4,   # 1080p
+            "HD": 3,     # 720p
+            "SD": 2,     # 480p
+            "LOW": 1,    # 360p
+            "MOBILE": 0  # 144p
+        }
+
+        # Kaliteye göre en iyi videoyu seçme
+        best_video = None
+        best_quality_score = -1
+
+        for video in videos:
+            video_url    = video.get("url")
+            quality_name = video.get("name", "").upper()
+
+            if not video_url or not quality_name:
+                continue
+
+            # Kalite sıralamasına göre puanla
+            quality_score = quality_order.get(quality_name, -1)
+            if quality_score > best_quality_score:
+                best_quality_score = quality_score
+                best_video         = video_url
+
+        if not best_video:
+            raise ValueError("No valid video URLs found.")
+
+        if best_video.startswith("//"):
+            best_video = f"https:{best_video}"
+
+        return ExtractResult(
+            name      = self.name,
+            url       = best_video,
+            referer   = self.main_url,
+            subtitles = []
+        )

{kekikstream-0.2.4 → kekikstream-0.2.5}/KekikStream/Extractors/VidMoly.py

@@ -14,24 +14,23 @@ class VidMoly(ExtractorBase):
         if referer:
             self.oturum.headers.update({"Referer": referer})
 
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
-            "Sec-Fetch-Dest": "iframe",
-        }
+        self.oturum.headers.update({
+            "User-Agent"     : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+            "Sec-Fetch-Dest" : "iframe",
+        })
 
         # Embed URL oluştur
-        embed_url = (
-            url.replace("/w/", "/embed-") + "-920x360.html" if "/w/" in url else url
-        )
+        embed_url      = url.replace("/w/", "/embed-") + "-920x360.html" if "/w/" in url else url
         script_content = None
-        attempts = 0
+        attempts       = 0
 
         # Script verisini almak için deneme yap
         while attempts < 10 and not script_content:
             attempts += 1
-            response = await self.oturum.get(embed_url, headers=headers)
+            response = await self.oturum.get(embed_url)
             response.raise_for_status()
-            script_match = re.search(r"sources:\s*\[(.*?)\],", response.text, re.DOTALL)
+
+            script_match   = re.search(r"sources:\s*\[(.*?)\],", response.text, re.DOTALL)
             script_content = script_match.group(1) if script_match else None
             if not script_content:
                 await asyncio.sleep(0.5)
@@ -58,11 +57,11 @@ class VidMoly(ExtractorBase):
                 subtitle_sources = json.loads(f"[{subtitle_data}]")
                 subtitles = [
                     Subtitle(
-                        name=sub.get("label"),
-                        url=self.fix_url(sub.get("file")),
+                        name = sub.get("label"),
+                        url  = self.fix_url(sub.get("file")),
                     )
-                    for sub in subtitle_sources
-                    if sub.get("kind") == "captions"
+                        for sub in subtitle_sources
+                            if sub.get("kind") == "captions"
                 ]
             except json.JSONDecodeError:
                 pass
@@ -80,10 +79,10 @@ class VidMoly(ExtractorBase):
 
         await self.close()
         return ExtractResult(
-            name=self.name,
-            url=video_url,
-            referer=self.main_url,
-            subtitles=subtitles,
+            name      = self.name,
+            url       = video_url,
+            referer   = self.main_url,
+            subtitles = subtitles
         )
 
     def _add_marks(self, text: str, field: str) -> str:

{kekikstream-0.2.4 → kekikstream-0.2.5}/KekikStream/Plugins/SineWix.py

@@ -50,6 +50,9 @@ class SineWix(PluginBase):
                 episodes = []
                 for season in veri.get("seasons"):
                     for episode in season.get("episodes"):
+                        if not episode.get("videos"):
+                            continue
+
                         ep_model = Episode(
                             season  = season.get("season_number"),
                             episode = episode.get("episode_number"),

{kekikstream-0.2.4 → kekikstream-0.2.5}/KekikStream/__init__.py

@@ -25,6 +25,20 @@ class KekikStream:
         finally:
             await self.plugin_manager.close_plugins()
 
+    async def handle_no_results(self):
+        action = await self.ui_manager.select_from_list(
+            message = "Ne yapmak istersiniz?",
+            choices = ["Geri Git", "Ana Menü", "Çıkış"]
+        )
+
+        match action:
+            case "Geri Git":
+                await self.search_all()
+            case "Ana Menü":
+                await self.run()
+            case "Çıkış":
+                cikis_yap(False)
+
     async def select_plugin(self):
         plugin_name = await self.ui_manager.select_from_fuzzy(
             message = "Arama yapılacak eklentiyi seçin:",
@@ -113,6 +127,10 @@ class KekikStream:
             await self.show_options(links)
 
     async def show_options(self, links):
+        if not links:
+            konsol.print("[bold red]Hiçbir bağlantı bulunamadı![/bold red]")
+            return await self.handle_no_results()
+
         mapping = self.extractor_manager.map_links_to_extractors(links)
         has_play_method = hasattr(self.current_plugin, "play") and callable(getattr(self.current_plugin, "play", None))    
         # ! DEBUG
@@ -120,7 +138,7 @@ class KekikStream:
         if not mapping and not has_play_method:
             konsol.print("[bold red]Hiçbir Extractor bulunamadı![/bold red]")
             konsol.print(links)
-            return
+            return await self.handle_no_results()
 
         if not mapping:
             selected_link = await self.ui_manager.select_from_list(
@@ -146,7 +164,7 @@ class KekikStream:
                     await self.play_media(selected_link)
 
             case "Geri Git":
-                await self.search()
+                await self.search_all()
 
             case _:
                 await self.run()
@@ -203,6 +221,7 @@ class KekikStream:
 
         if not all_results:
             konsol.print("[bold red]Hiçbir sonuç bulunamadı![/bold red]")
+            await self.handle_no_results()
             return []
 
         return all_results

{kekikstream-0.2.4 → kekikstream-0.2.5}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.2.4
+Version: 0.2.5
 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.2.4 → kekikstream-0.2.5}/KekikStream.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ KekikStream/Core/PluginModels.py
 KekikStream/Core/__init__.py
 KekikStream/Extractors/CloseLoad.py
 KekikStream/Extractors/MailRu.py
+KekikStream/Extractors/Odnoklassniki.py
 KekikStream/Extractors/PixelDrain.py
 KekikStream/Extractors/RapidVid.py
 KekikStream/Extractors/SibNet.py

{kekikstream-0.2.4 → kekikstream-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.2.4
+Version: 0.2.5
 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.2.4 → kekikstream-0.2.5}/setup.py

@@ -6,7 +6,7 @@ from io         import open
 setup(
     # ? Genel Bilgiler
     name         = "KekikStream",
-    version      = "0.2.4",
+    version      = "0.2.5",
     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"],