KekikStream 0.0.7__tar.gz → 0.0.9__tar.gz

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream/Core/MediaHandler.py

@@ -11,7 +11,7 @@ class MediaHandler:
 
     def play_with_vlc(self, extract_data: ExtractResult):
         try:
-            if "Cookie" in self.headers:
+            if "Cookie" in self.headers or extract_data.subtitles:
                 self.play_with_mpv(extract_data)
                 return
 
@@ -27,6 +27,9 @@ class MediaHandler:
             if "Referer" in self.headers:
                 vlc_command.append(f"--http-referrer={self.headers.get('Referer')}")
 
+            for subtitle in extract_data.subtitles:
+                vlc_command.append(f"--sub-file={subtitle.url}")
+
             vlc_command.append(extract_data.url)
             subprocess.run(vlc_command, check=True)
         except subprocess.CalledProcessError as e:
@@ -52,6 +55,9 @@ class MediaHandler:
             if "Cookie" in self.headers:
                 mpv_command.append(f"--http-header-fields=Cookie: {self.headers.get('Cookie')}")
 
+            for subtitle in extract_data.subtitles:
+                mpv_command.append(f"--sub-file={subtitle.url}")
+
             mpv_command.append(extract_data.url)
             subprocess.run(mpv_command, check=True)
         except subprocess.CalledProcessError as e:

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream/Core/PluginBase.py

@@ -3,10 +3,12 @@
 from abc           import ABC, abstractmethod
 from httpx         import AsyncClient, Timeout
 from .PluginModels import SearchResult, MovieInfo
+from .MediaHandler import MediaHandler
 
 class PluginBase(ABC):
     name     = "Plugin"
     main_url = "https://example.com"
+    _data    = {}
 
     def __init__(self):
         self.oturum = AsyncClient(
@@ -16,6 +18,7 @@ class PluginBase(ABC):
             },
             timeout = Timeout(10.0),
         )
+        self.media_handler = MediaHandler()
 
     @abstractmethod
     async def search(self, query: str) -> list[SearchResult]:

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream/Core/PluginModels.py

@@ -29,4 +29,8 @@ class MovieInfo(BaseModel):
 
     @validator("actors", pre=True)
     def convert_actors(cls, value):
-        return ", ".join(value) if isinstance(value, list) else value
+        return ", ".join(value) if isinstance(value, list) else value
+
+    @validator("rating", pre=True)
+    def ensure_string(cls, value):
+        return str(value) if value is not None else value

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream/Core/__init__.py

@@ -5,5 +5,5 @@ from .PluginLoader    import PluginLoader
 from .PluginModels    import SearchResult, MovieInfo
 from .ExtractorBase   import ExtractorBase
 from .ExtractorLoader import ExtractorLoader
-from .ExtractorModels import ExtractResult
+from .ExtractorModels import ExtractResult, Subtitle
 from .MediaHandler    import MediaHandler

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream/Extractors/VidMoxy.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
 from Kekik.Sifreleme  import Packer, HexCodec
 import re
 
@@ -15,6 +15,23 @@ class VidMoxy(ExtractorBase):
         istek = await self.oturum.get(url)
         istek.raise_for_status()
 
+        subtitles        = []
+        subtitle_matches = re.findall(r'captions","file":"([^"]+)","label":"([^"]+)"', istek.text)
+        seen_subtitles   = set()
+
+        for sub_url, sub_lang in subtitle_matches:
+            if sub_url in seen_subtitles:
+                continue
+            seen_subtitles.add(sub_url)
+
+            decoded_lang = (
+                sub_lang.replace("\\u0131", "ı")
+                        .replace("\\u0130", "İ")
+                        .replace("\\u00fc", "ü")
+                        .replace("\\u00e7", "ç")
+            )
+            subtitles.append(Subtitle(name=decoded_lang, url=sub_url.replace("\\", "")))
+
         try:
             escaped_hex = re.findall(r'file": "(.*)",', istek.text)[0]
         except Exception:
@@ -29,5 +46,5 @@ class VidMoxy(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = self.main_url,
-            subtitles = []
+            subtitles = subtitles
         )

kekikstream-0.0.9/KekikStream/Plugins/SineWix.py

@@ -0,0 +1,68 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core                 import PluginBase, SearchResult, MovieInfo
+from KekikStream.Core.ExtractorModels import ExtractResult, Subtitle
+
+class SineWix(PluginBase):
+    name     = "SineWix"
+    main_url = "https://ythls.kekikakademi.org"
+
+    async def search(self, query: str) -> list[SearchResult]:
+        istek = await self.oturum.get(f"{self.main_url}/sinewix/search/{query}")
+
+        return [
+            SearchResult(
+                title  = veri.get("name"),
+                url    = f"?type={veri.get('type')}&id={veri.get('id')}",
+                poster = self.fix_url(veri.get("poster_path")),
+            )
+                for veri in istek.json().get("search") if veri.get("type") == "movie"
+        ]
+
+    async def load_item(self, url: str) -> MovieInfo:
+        item_type = url.split("?type=")[-1].split("&id=")[0]
+        item_id   = url.split("&id=")[-1]
+
+        match item_type:
+            case "movie":
+                istek = await self.oturum.get(f"{self.main_url}/sinewix/movie/{item_id}")
+                veri  = istek.json()
+
+                org_title = veri.get("title")
+                alt_title = veri.get("original_name") or ""
+                title     = f"{org_title} - {alt_title}" if (alt_title and org_title != alt_title)  else org_title
+
+                return MovieInfo(
+                    url         = self.fix_url(f"{self.main_url}/sinewix/movie/{item_id}"),
+                    poster      = self.fix_url(veri.get("poster_path")),
+                    title       = title,
+                    description = veri.get("overview"),
+                    tags        = [genre.get("name") for genre in veri.get("genres")],
+                    rating      = veri.get("vote_average"),
+                    year        = veri.get("release_date"),
+                    actors      = [actor.get("name") for actor in veri.get("casterslist")],
+                )
+
+    async def load_links(self, url: str) -> list[str]:
+        istek = await self.oturum.get(url)
+        veri  = istek.json()
+
+        org_title = veri.get("title")
+        alt_title = veri.get("original_name") or ""
+        title     = f"{org_title} - {alt_title}" if (alt_title and org_title != alt_title)  else org_title
+        title     = f"{self.name} | {title}"
+
+        for video in veri.get("videos"):
+            video_link = video.get("link").split("_blank\">")[-1]
+            self._data[video_link] = {
+                "name"      : title,
+                "referer"   : self.main_url,
+                "subtitles" : []
+            }
+
+        return list(self._data.keys())
+
+    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)

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream/__init__.py

@@ -68,16 +68,26 @@ class KekikStream:
 
         self.ui_manager.display_media_info(self.current_plugin.name, media_info)
 
-        links = await self.current_plugin.load_links(url)
+        links = await self.current_plugin.load_links(media_info.url)
         await self.show_options(links)
 
     async def show_options(self, links):
         mapping = self.extractor_manager.map_links_to_extractors(links)
-        if not mapping:
+        has_play_method = hasattr(self.current_plugin, "play") and callable(getattr(self.current_plugin, "play", None))    
+        if not mapping and not has_play_method:
             konsol.print("[bold red]Hiçbir Extractor bulunamadı![/bold red]")
             konsol.print(links)
             return
 
+        if not mapping:
+            selected_link = await self.ui_manager.select_from_list(
+                message = "Doğrudan bir bağlantı seçin:",
+                choices = [{"name": self.current_plugin.name, "value": link} for link in links]
+            )
+            if selected_link:
+                await self.play_media(selected_link)
+            return
+
         action  = await self.ui_manager.select_from_list(
             message = "Ne yapmak istersiniz?",
             choices = ["İzle", "Geri Git", "Ana Menü"]
@@ -99,6 +109,15 @@ class KekikStream:
                 await self.run()
 
     async def play_media(self, selected_link):
+        if hasattr(self.current_plugin, "play") and callable(self.current_plugin.play):
+            await self.current_plugin.play(
+                name      = self.current_plugin._data[selected_link]["name"],
+                url       = selected_link,
+                referer   = self.current_plugin._data[selected_link]["referer"],
+                subtitles = self.current_plugin._data[selected_link]["subtitles"]
+            )
+            return
+
         extractor:ExtractorBase = self.extractor_manager.find_extractor(selected_link)
         if not extractor:
             konsol.print("[bold red]Uygun Extractor bulunamadı.[/bold red]")

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.0.7
+Version: 0.0.9
 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
@@ -66,6 +66,10 @@ KekikStream
 
 **[☕️ Kahve Ismarla](https://KekikAkademi.org/Kahve)**
 
+### 🎁 Teşekkürler
+
+- [DeoDorqnt387/aniwatch-tr](https://github.com/DeoDorqnt387/aniwatch-tr)
+
 ## 🌐 Telif Hakkı ve Lisans
 
 * *Copyright (C) 2024 by* [keyiflerolsun](https://github.com/keyiflerolsun) ❤️️

{kekikstream-0.0.7 → kekikstream-0.0.9}/KekikStream.egg-info/SOURCES.txt

@@ -30,4 +30,5 @@ KekikStream/Managers/UIManager.py
 KekikStream/Managers/__init__.py
 KekikStream/Plugins/FilmMakinesi.py
 KekikStream/Plugins/FullHDFilmizlesene.py
+KekikStream/Plugins/SineWix.py
 KekikStream/Plugins/UgurFilm.py

{kekikstream-0.0.7 → kekikstream-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.0.7
+Version: 0.0.9
 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
@@ -66,6 +66,10 @@ KekikStream
 
 **[☕️ Kahve Ismarla](https://KekikAkademi.org/Kahve)**
 
+### 🎁 Teşekkürler
+
+- [DeoDorqnt387/aniwatch-tr](https://github.com/DeoDorqnt387/aniwatch-tr)
+
 ## 🌐 Telif Hakkı ve Lisans
 
 * *Copyright (C) 2024 by* [keyiflerolsun](https://github.com/keyiflerolsun) ❤️️

{kekikstream-0.0.7 → kekikstream-0.0.9}/README.md

@@ -43,6 +43,10 @@ KekikStream
 
 **[☕️ Kahve Ismarla](https://KekikAkademi.org/Kahve)**
 
+### 🎁 Teşekkürler
+
+- [DeoDorqnt387/aniwatch-tr](https://github.com/DeoDorqnt387/aniwatch-tr)
+
 ## 🌐 Telif Hakkı ve Lisans
 
 * *Copyright (C) 2024 by* [keyiflerolsun](https://github.com/keyiflerolsun) ❤️️

{kekikstream-0.0.7 → kekikstream-0.0.9}/setup.py

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