KekikStream 0.0.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

KekikStream/CLI/__init__.py

@@ -1,3 +1,4 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from Kekik.cli import konsol, cikis_yap, hata_salla, log_salla, hata_yakala, bellek_temizle, temizle
+from Kekik.cli     import konsol, cikis_yap, hata_salla, log_salla, hata_yakala, bellek_temizle, temizle
+from .check_update import check_and_update_package

KekikStream/CLI/check_update.py

@@ -0,0 +1,33 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from .             import konsol
+from rich.panel    import Panel
+from pkg_resources import get_distribution
+from requests      import get
+from subprocess    import check_call
+import sys
+
+def check_and_update_package(package_name: str):
+    """Paketi kontrol et ve gerekirse güncelle."""
+    try:
+        # Mevcut sürümü al
+        current_version = get_distribution(package_name).version
+        konsol.print(Panel(f"[cyan]Yüklü sürüm:[/cyan] [bold yellow]{current_version}[/bold yellow]"))
+
+        # PyPI'den en son sürümü al
+        response = get(f"https://pypi.org/pypi/{package_name}/json")
+        if response.status_code == 200:
+            latest_version = response.json()["info"]["version"]
+            konsol.print(Panel(f"[cyan]En son sürüm:[/cyan] [bold green]{latest_version}[/bold green]"))
+
+            # Eğer güncel değilse güncelle
+            if current_version != latest_version:
+                konsol.print(f"[bold red]{package_name} güncelleniyor...[/bold red]")
+                check_call([sys.executable, "-m", "pip", "install", "--upgrade", package_name, "--break-system-packages"])
+                konsol.print(f"[bold green]{package_name} güncellendi![/bold green]")
+            else:
+                konsol.print(f"[bold green]{package_name} zaten güncel.[/bold green]")
+        else:
+            konsol.print("[bold red]PyPI'ye erişilemiyor. Güncelleme kontrolü atlanıyor.[/bold red]")
+    except Exception as e:
+        konsol.print(f"[bold red]Güncelleme kontrolü sırasında hata oluştu: {e}[/bold red]")

KekikStream/Core/ExtractorBase.py

@@ -12,7 +12,7 @@ class ExtractorBase(ABC):
     def __init__(self):
         self.oturum = AsyncClient(
             headers = {
-                "User-Agent" : "keyiflerolsun/KekikStream",
+                "User-Agent" : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5)",
                 "Accept"     : "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
             },
             timeout = Timeout(10.0),

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/Core/PluginBase.py

@@ -3,19 +3,22 @@
 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(
             headers = {
-                "User-Agent" : "keyiflerolsun/KekikStream",
+                "User-Agent" : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5)",
                 "Accept"     : "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
             },
             timeout = Timeout(10.0),
         )
+        self.media_handler = MediaHandler()
 
     @abstractmethod
     async def search(self, query: str) -> list[SearchResult]:

KekikStream/Core/PluginLoader.py

@@ -29,7 +29,7 @@ class PluginLoader:
         if not plugins:
             konsol.print("[yellow][!] Yüklenecek bir Plugin bulunamadı![/yellow]")
 
-        return plugins
+        return dict(sorted(plugins.items()))
 
     def _load_from_directory(self, directory: Path) -> dict[str, PluginBase]:
         plugins = {}

KekikStream/Core/PluginModels.py

@@ -1,7 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from pydantic import BaseModel, validator
-from typing   import Optional
+from pydantic import BaseModel, field_validator
+from typing   import List, Optional
 
 
 class SearchResult(BaseModel):
@@ -23,10 +23,46 @@ class MovieInfo(BaseModel):
     actors      : Optional[str] = None
     duration    : Optional[int] = None
 
-    @validator("tags", pre=True)
+    @field_validator("tags", mode="before")
+    @classmethod
     def convert_tags(cls, value):
         return ", ".join(value) if isinstance(value, list) else value
 
-    @validator("actors", pre=True)
+    @field_validator("actors", mode="before")
+    @classmethod
+    def convert_actors(cls, value):
+        return ", ".join(value) if isinstance(value, list) else value
+
+    @field_validator("rating", mode="before")
+    @classmethod
+    def ensure_string(cls, value):
+        return str(value) if value is not None else value
+
+
+class Episode(BaseModel):
+    season  : Optional[int] = None
+    episode : Optional[int] = None
+    title   : Optional[str] = None
+    url     : Optional[str] = None
+
+
+class SeriesInfo(BaseModel):
+    url          : Optional[str]           = None
+    poster       : Optional[str]           = None
+    title        : Optional[str]           = None
+    description  : Optional[str]           = None
+    tags         : Optional[str]           = None
+    rating       : Optional[float]         = None
+    year         : Optional[str]           = None
+    actors       : Optional[str]           = None
+    episodes     : Optional[List[Episode]] = None
+
+    @field_validator("tags", mode="before")
+    @classmethod
+    def convert_tags(cls, value):
+        return ", ".join(value) if isinstance(value, list) else value
+
+    @field_validator("actors", mode="before")
+    @classmethod
     def convert_actors(cls, value):
         return ", ".join(value) if isinstance(value, list) else value

KekikStream/Core/__init__.py

@@ -2,8 +2,8 @@
 
 from .PluginBase      import PluginBase
 from .PluginLoader    import PluginLoader
-from .PluginModels    import SearchResult, MovieInfo
+from .PluginModels    import SearchResult, MovieInfo, Episode, SeriesInfo
 from .ExtractorBase   import ExtractorBase
 from .ExtractorLoader import ExtractorLoader
-from .ExtractorModels import ExtractResult
+from .ExtractorModels import ExtractResult, Subtitle
 from .MediaHandler    import MediaHandler

KekikStream/Extractors/PixelDrain.py

@@ -0,0 +1,28 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+import re
+
+class PixelDrain(ExtractorBase):
+    name     = "PixelDrain"
+    main_url = "https://pixeldrain.com"
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        pixel_id_match = re.search(r"([^\/]+)(?=\?download)", url)
+        if not pixel_id_match:
+            raise ValueError("PixelDrain bağlantısından ID çıkarılamadı.")
+
+        pixel_id      = pixel_id_match.group(1)
+        download_link = f"{self.main_url}/api/file/{pixel_id}?download"
+        referer_link  = f"{self.main_url}/u/{pixel_id}?download"
+
+        await self.close()
+        return ExtractResult(
+            name      = f"{self.name} - {pixel_id}",
+            url       = download_link,
+            referer   = referer_link,
+            subtitles = []
+        )

KekikStream/Extractors/RapidVid.py

@@ -0,0 +1,61 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
+from Kekik.Sifreleme  import Packer, HexCodec
+import re
+
+class RapidVid(ExtractorBase):
+    name     = "RapidVid"
+    main_url = "https://rapidvid.net"
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        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:
+            extracted_value = re.search(r'file": "(.*)",', istek.text)
+            if extracted_value:
+                escaped_hex = extracted_value.group(1)
+                decoded_url = HexCodec.decode(escaped_hex)
+            else:
+                eval_jwsetup = re.search(r'\};\s*(eval\(function[\s\S]*?)var played = \d+;', istek.text)
+                if not eval_jwsetup:
+                    raise ValueError("JWPlayer setup not found.")
+                
+                unpacked_jwsetup = Packer.unpack(Packer.unpack(eval_jwsetup.group(1)))
+                extracted_value  = re.search(r'file":"(.*)","label', unpacked_jwsetup)
+                if not extracted_value:
+                    raise ValueError("File URL not found in unpacked JWPlayer setup.")
+                
+                escaped_hex = extracted_value.group(1).replace("\\\\x", "")
+                decoded_url = bytes.fromhex(escaped_hex).decode("utf-8")
+        except Exception as e:
+            raise RuntimeError(f"Extraction failed: {e}")
+
+        await self.close()
+        return ExtractResult(
+            name      = self.name,
+            url       = decoded_url,
+            referer   = self.main_url,
+            subtitles = subtitles
+        )

KekikStream/Extractors/SibNet.py

@@ -0,0 +1,29 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+import re
+
+class SibNet(ExtractorBase):
+    name     = "SibNet"
+    main_url = "https://video.sibnet.ru"
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        response = await self.oturum.get(url)
+        response.raise_for_status()
+
+        match = re.search(r'player\.src\(\[\{src: \"([^\"]+)\"', response.text)
+        if not match:
+            raise ValueError("m3u bağlantısı bulunamadı.")
+
+        m3u_link = f"{self.main_url}{match.group(1)}"
+
+        await self.close()
+        return ExtractResult(
+            name      = self.name,
+            url       = m3u_link,
+            referer   = url,
+            subtitles = []
+        )

KekikStream/Extractors/Sobreatsesuyp.py

@@ -0,0 +1,60 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+import re
+import json
+
+class Sobreatsesuyp(ExtractorBase):
+    name     = "Sobreatsesuyp"
+    main_url = "https://sobreatsesuyp.com"
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        istek = await self.oturum.get(url)
+        istek.raise_for_status()
+
+        file_match = re.search(r'file\":\"([^\"]+)', istek.text)
+        if not file_match:
+            raise ValueError("File not found in response.")
+
+        file_path = file_match.group(1).replace("\\", "")
+        post_link = f"{self.main_url}/{file_path}"
+
+        post_istek = await self.oturum.post(post_link)
+        post_istek.raise_for_status()
+
+        try:
+            post_json = json.loads(post_istek.text)
+        except json.JSONDecodeError:
+            raise ValueError("Failed to parse JSON response.")
+
+        video_data_list = post_json[1:] if isinstance(post_json, list) else []
+
+        all_results = []
+
+        for item in video_data_list:
+            title = item.get("title")
+            file  = item.get("file")
+
+            if not title or not file:
+                continue
+
+            playlist_url     = f"{self.main_url}/playlist/{file.lstrip('/')}.txt"
+            playlist_request = await self.oturum.post(playlist_url, headers={"Referer": referer or self.main_url})
+            playlist_request.raise_for_status()
+
+            all_results.append(
+                ExtractResult(
+                    name      = f"{self.name} - {title}",
+                    url       = playlist_request.text,
+                    referer   = self.main_url,
+                    subtitles = []
+                )
+            )
+
+        if not all_results:
+            raise ValueError("No videos found in response.")
+
+        return all_results

KekikStream/Extractors/TRsTX.py

@@ -0,0 +1,68 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+import re
+import json
+
+class TRsTX(ExtractorBase):
+    name     = "TRsTX"
+    main_url = "https://trstx.org"
+
+    async def extract(self, url, referer=None) -> list[ExtractResult]:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        istek = await self.oturum.get(url)
+        istek.raise_for_status()
+
+        file_match = re.search(r'file\":\"([^\"]+)', istek.text)
+        if not file_match:
+            raise ValueError("File not found in response.")
+
+        file_path = file_match.group(1).replace("\\", "")
+        post_link = f"{self.main_url}/{file_path}"
+
+        post_istek = await self.oturum.post(post_link)
+        post_istek.raise_for_status()
+
+        try:
+            post_json = json.loads(post_istek.text)
+        except json.JSONDecodeError:
+            raise ValueError("Failed to parse JSON response.")
+
+        video_data_list = post_json[1:] if isinstance(post_json, list) else []
+
+        video_links = set()
+        all_results = []
+
+        for item in video_data_list:
+            title = item.get("title")
+            file  = item.get("file")
+
+            if not title or not file:
+                continue
+
+            playlist_url = f"{self.main_url}/playlist/{file.lstrip('/')}.txt"
+            playlist_request = await self.oturum.post(playlist_url, headers={"Referer": referer or self.main_url})
+            playlist_request.raise_for_status()
+
+            video_data = playlist_request.text
+
+            if video_data in video_links:
+                continue
+
+            video_links.add(video_data)
+
+            all_results.append(
+                ExtractResult(
+                    name      = f"{self.name} - {title}",
+                    url       = video_data,
+                    referer   = self.main_url,
+                    subtitles = []
+                )
+            )
+
+        if not all_results:
+            raise ValueError("No videos found in response.")
+
+        return all_results

KekikStream/Extractors/TauVideo.py

@@ -0,0 +1,33 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+
+class TauVideo(ExtractorBase):
+    name     = "TauVideo"
+    main_url = "https://tau-video.xyz"
+
+    async def extract(self, url, referer=None) -> list[ExtractResult]:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        video_key = url.split("/")[-1]
+        api_url   = f"{self.main_url}/api/video/{video_key}"
+
+        response = await self.oturum.get(api_url)
+        response.raise_for_status()
+
+        api_data = response.json()
+
+        if "urls" not in api_data:
+            raise ValueError("API yanıtında 'urls' bulunamadı.")
+
+        results = []
+        for video in api_data["urls"]:
+            results.append(ExtractResult(
+                name      = f"{self.name} - {video['label']}",
+                url       = video["url"],
+                referer   = referer or self.main_url,
+                subtitles = []
+            ))
+
+        return results

KekikStream/Extractors/TurboImgz.py

@@ -0,0 +1,28 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+import re
+
+class TurboImgz(ExtractorBase):
+    name     = "TurboImgz"
+    main_url = "https://turbo.imgz.me"
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.oturum.headers.update({"Referer": referer})
+
+        istek = await self.oturum.get(url)
+        istek.raise_for_status()
+
+        video_match = re.search(r'file: "(.*)",', istek.text)
+        if not video_match:
+            raise ValueError("File not found in response.")
+
+        video_link = video_match.group(1)
+
+        return ExtractResult(
+            name      = self.name,
+            url       = video_link,
+            referer   = referer or self.main_url,
+            subtitles = []
+        )

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
 
@@ -9,13 +9,29 @@ class VidMoxy(ExtractorBase):
     main_url = "https://vidmoxy.com"
 
     async def extract(self, url, referer=None) -> ExtractResult:
-        self.oturum.headers.update({"User-Agent":"Mozilla/5.0"})
         if referer:
             self.oturum.headers.update({"Referer": referer})
 
         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:
@@ -30,5 +46,5 @@ class VidMoxy(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = self.main_url,
-            subtitles = []
+            subtitles = subtitles
         )

KekikStream/Managers/ExtractorManager.py

@@ -21,7 +21,7 @@ class ExtractorManager:
             for extractor_cls in self.extractors:
                 extractor:ExtractorBase = extractor_cls()
                 if extractor.can_handle_url(link):
-                    mapping[link] = extractor.name
+                    mapping[link] = f"{extractor.name:<30} » {link.replace(extractor.main_url, '')}"
                     break
 
         return mapping

KekikStream/Managers/PluginManager.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from ..Core import PluginLoader
+from ..Core import PluginLoader, PluginBase
 
 class PluginManager:
     def __init__(self, plugin_dir="Plugins"):
@@ -8,11 +8,12 @@ class PluginManager:
         self.plugins       = self.plugin_loader.load_all()
 
     def get_plugin_names(self):
-        return list(self.plugins.keys())
+        return sorted(list(self.plugins.keys()))
 
     def select_plugin(self, plugin_name):
         return self.plugins.get(plugin_name)
 
     async def close_plugins(self):
         for plugin in self.plugins.values():
-            await plugin.close()
+            if isinstance(plugin, PluginBase):
+                await plugin.close()

KekikStream/Managers/UIManager.py

@@ -13,7 +13,17 @@ class UIManager:
 
     @staticmethod
     async def select_from_list(message, choices):
-        return await inquirer.select(message=message, choices=choices).execute_async()
+        return await inquirer.select(message=message, choices=choices, max_height="75%").execute_async()
+
+    @staticmethod
+    async def select_from_fuzzy(message, choices):
+        return await inquirer.fuzzy(
+            message    = message,
+            choices    = choices,
+            validate   = lambda result: result in [choice if isinstance(choice, str) else choice["value"] for choice in choices],
+            filter     = lambda result: result,
+            max_height = "75%"
+        ).execute_async()
 
     @staticmethod
     async def prompt_text(message):
@@ -26,6 +36,9 @@ class UIManager:
         table.add_column(style="magenta")
 
         for key, value in media_info.dict().items():
+            if key == "episodes":
+                continue
+
             if value:
                 table.add_row(f"[bold cyan]{key.capitalize()}[/bold cyan]", str(value))
 

KekikStream/Plugins/SineWix.py

@@ -0,0 +1,105 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core                 import PluginBase, SearchResult, MovieInfo, Episode, SeriesInfo
+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")
+        ]
+
+    async def load_item(self, url: str) -> MovieInfo:
+        item_type = url.split("?type=")[-1].split("&id=")[0]
+        item_id   = url.split("&id=")[-1]
+
+        istek = await self.oturum.get(f"{self.main_url}/sinewix/{item_type}/{item_id}")
+        veri  = istek.json()
+
+        match item_type:
+            case "movie":
+                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/{item_type}/{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")],
+                )
+            case _:
+                org_title = veri.get("name")
+                alt_title = veri.get("original_name") or ""
+                title     = f"{org_title} - {alt_title}" if (alt_title and org_title != alt_title)  else org_title
+
+                episodes = []
+                for season in veri.get("seasons"):
+                    for episode in season.get("episodes"):
+                        ep_model = Episode(
+                            season  = season.get("season_number"),
+                            episode = episode.get("episode_number"),
+                            title   = episode.get("name"),
+                            url     = self.fix_url(episode.get("videos")[0].get("link")),
+                        )
+
+                        episodes.append(ep_model)
+
+                        self._data[ep_model.url] = {
+                            "name"      : f"{ep_model.season}. Sezon {ep_model.episode}. Bölüm - {ep_model.title}",
+                            "referer"   : self.main_url,
+                            "subtitles" : []
+                        }
+
+                return SeriesInfo(
+                    url         = self.fix_url(f"{self.main_url}/sinewix/{item_type}/{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("first_air_date"),
+                    actors      = [actor.get("name") for actor in veri.get("casterslist")],
+                    episodes    = episodes,
+                )
+
+    async def load_links(self, url: str) -> list[str]:
+        if not url.startswith(self.main_url):
+            return [url]
+
+        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/__init__.py

@@ -2,7 +2,7 @@
 
 from .CLI      import konsol, cikis_yap, hata_yakala
 from .Managers import PluginManager, ExtractorManager, UIManager, MediaManager
-from .Core     import PluginBase, ExtractorBase
+from .Core     import PluginBase, ExtractorBase, SeriesInfo
 from asyncio   import run
 
 class KekikStream:
@@ -26,16 +26,18 @@ class KekikStream:
             await self.plugin_manager.close_plugins()
 
     async def select_plugin(self):
-        plugin_name = await self.ui_manager.select_from_list(
-            message = "Bir eklenti seçin:",
-            choices = self.plugin_manager.get_plugin_names()
+        plugin_name = await self.ui_manager.select_from_fuzzy(
+            message = "Arama yapılacak eklentiyi seçin:",
+            choices = ["Tüm Eklentilerde Ara", *self.plugin_manager.get_plugin_names()]
         )
 
-        self.current_plugin = self.plugin_manager.select_plugin(plugin_name)
+        if plugin_name == "Tüm Eklentilerde Ara":
+            await self.search_all()
+        else:
+            self.current_plugin = self.plugin_manager.select_plugin(plugin_name)
+            await self.search_single_plugin()
 
-        await self.search()
-
-    async def search(self):
+    async def search_single_plugin(self):
         self.ui_manager.clear_console()
         konsol.rule(f"[bold cyan]{self.current_plugin.name} Eklentisinde Arama Yapın[/bold cyan]")
 
@@ -46,38 +48,89 @@ class KekikStream:
             konsol.print("[bold red]Arama sonucu bulunamadı![/bold red]")
             return
 
-        await self.select_result(results)
+        selected_result = await self.select_result(results)
+
+        if selected_result:
+            await self.show_details({"plugin": self.current_plugin.name, "url": selected_result})
+
+    async def search_all(self):
+        self.ui_manager.clear_console()
+        konsol.rule("[bold cyan]Tüm Eklentilerde Arama Yapın[/bold cyan]")
+
+        query   = await self.ui_manager.prompt_text("Arama sorgusu girin:")
+        results = await self.search_all_plugins(query)
+
+        if not results:
+            return
+
+        selected_result = await self.select_from_all_results(results)
+
+        if selected_result:
+            await self.show_details(selected_result)
 
     async def select_result(self, results):
-        selected_url = await self.ui_manager.select_from_list(
-            message = "Bir içerik seçin:",
+        selected_url = await self.ui_manager.select_from_fuzzy(
+            message = "İçerik sonuçlarından birini seçin:",
             choices = [{"name": res.title, "value": res.url} for res in results]
         )
 
-        await self.show_details(selected_url)
+        if selected_url:
+            return selected_url
 
-    async def show_details(self, url):
+    async def show_details(self, selected_result):
         try:
+            if isinstance(selected_result, dict) and "plugin" in selected_result:
+                plugin_name = selected_result["plugin"]
+                url         = selected_result["url"]
+
+                self.current_plugin = self.plugin_manager.select_plugin(plugin_name)
+            else:
+                url = selected_result
+
             media_info = await self.current_plugin.load_item(url)
         except Exception as hata:
-            konsol.log(url)
+            konsol.log(selected_result)
             hata_yakala(hata)
             return
 
         self.media_manager.set_title(f"{self.current_plugin.name} | {media_info.title}")
 
-        self.ui_manager.display_media_info(self.current_plugin.name, media_info)
-
-        links = await self.current_plugin.load_links(url)
-        await self.show_options(links)
+        self.ui_manager.display_media_info(f"{self.current_plugin.name} | {media_info.title}", media_info)
+
+        if isinstance(media_info, SeriesInfo):
+            selected_episode = await self.ui_manager.select_from_fuzzy(
+                message = "İzlemek istediğiniz bölümü seçin:",
+                choices = [
+                    {"name": f"{episode.season}. Sezon {episode.episode}. Bölüm - {episode.title}", "value": episode.url}
+                        for episode in media_info.episodes
+                ]
+            )
+            if selected_episode:
+                links = await self.current_plugin.load_links(selected_episode)
+                await self.show_options(links)
+        else:
+            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))    
+        # ! DEBUG
+        # konsol.print(links)
+        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 oynatmak için 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ü"]
@@ -86,7 +139,7 @@ class KekikStream:
         match action:
             case "İzle":
                 selected_link = await self.ui_manager.select_from_list(
-                    message = "Bir bağlantı seçin:", 
+                    message = "İzlemek için bir bağlantı seçin:", 
                     choices = [{"name": extractor_name, "value": link} for link, extractor_name in mapping.items()]
                 )
                 if selected_link:
@@ -99,22 +152,81 @@ class KekikStream:
                 await self.run()
 
     async def play_media(self, selected_link):
-        extractor:ExtractorBase = self.extractor_manager.find_extractor(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]")
             return
 
         extract_data = await extractor.extract(selected_link, referer=self.current_plugin.main_url)
-        if extract_data.headers.get("Cookie"):
-            self.media_manager.set_headers({"Cookie": extract_data.headers.get("Cookie")})
 
-        self.media_manager.set_title(f"{self.media_manager.get_title()} | {extract_data.name}")
-        self.media_manager.set_headers({"Referer": extract_data.referer})
-        self.media_manager.play_media(extract_data)
+        if isinstance(extract_data, list):
+            selected_data = await self.ui_manager.select_from_list(
+                message = "Birden fazla bağlantı bulundu, lütfen birini seçin:",
+                choices = [{"name": data.name, "value": data} for data in extract_data]
+            )
+        else:
+            selected_data = extract_data
+
+        if selected_data.headers.get("Cookie"):
+            self.media_manager.set_headers({"Cookie": selected_data.headers.get("Cookie")})
+
+        self.media_manager.set_title(f"{self.media_manager.get_title()} | {selected_data.name}")
+        self.media_manager.set_headers({"Referer": selected_data.referer})
+        self.media_manager.play_media(selected_data)
+
+    async def search_all_plugins(self, query: str):
+        all_results = []
+
+        for plugin_name, plugin in self.plugin_manager.plugins.items():
+            if not isinstance(plugin, PluginBase):
+                konsol.print(f"[yellow][!] {plugin_name} geçerli bir PluginBase değil, atlanıyor...[/yellow]")
+                continue
+
+            konsol.log(f"[yellow][~] {plugin_name:<18} eklentisinde arama yapılıyor...[/]")
+            try:
+                results = await plugin.search(query)
+                if results:
+                    all_results.extend(
+                        [{"plugin": plugin_name, "title": result.title, "url": result.url, "poster": result.poster} for result in results]
+                    )
+            except Exception as hata:
+                konsol.print(f"[bold red]{plugin_name} eklentisinde hata oluştu: {hata}[/bold red]")
+
+        if not all_results:
+            konsol.print("[bold red]Hiçbir sonuç bulunamadı![/bold red]")
+            return []
+
+        return all_results
+
+    async def select_from_all_results(self, results):
+        choices = [
+            {"name": f"[{res['plugin']}] {res['title']}", "value": res}
+                for res in results
+        ]
+
+        selected_result = await self.ui_manager.select_from_fuzzy(
+            message = "Arama sonuçlarından bir içerik seçin:",
+            choices = choices
+        )
 
+        return selected_result
+
+from .CLI import check_and_update_package
 
 def basla():
     try:
+        konsol.print("[bold cyan]Güncelleme kontrol ediliyor...[/bold cyan]")
+        check_and_update_package("KekikStream")
+
         app = KekikStream()
         run(app.run())
         cikis_yap(False)

{KekikStream-0.0.6.dist-info → KekikStream-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.0.6
+Version: 0.1.7
 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
@@ -10,7 +10,7 @@ Keywords: KekikStream,KekikAkademi,keyiflerolsun
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools
@@ -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.1.7.dist-info/RECORD

@@ -0,0 +1,38 @@
+KekikStream/__init__.py,sha256=NE4oTbIL42S9IUdjKgh9rIgKsL2D-MRkMB5xmoLlH_c,9347
+KekikStream/__main__.py,sha256=4U-NO1f0Mts5Mf_QnWhWqRbTsRBy2y2VPlpHyaqG9_I,137
+KekikStream/requirements.txt,sha256=Kh3E0NzIkAmhVODtIwRVffVOHLiElO6Ua9kIgjbocPE,57
+KekikStream/CLI/__init__.py,sha256=9YlF135BVff85y492hX4sq2WY2CNqa4BuVzF9hIIaKE,233
+KekikStream/CLI/check_update.py,sha256=rOa16bO9sGN-p78yaTRaccFoNfhHWEfDgGZNavpcwNI,1642
+KekikStream/Core/ExtractorBase.py,sha256=SPXKZPfpzvgkJeMds-USzgpm8-qb0vgZjjLDs58NfGU,1069
+KekikStream/Core/ExtractorLoader.py,sha256=JovJJr6Clk3xpbRLlh7v_XOl3FGwVXCjTZivec1FktI,2533
+KekikStream/Core/ExtractorModels.py,sha256=vJeh4qd05K7nbqdCCGU29UkGQpce6jXfsCm7LuDL1G8,454
+KekikStream/Core/MediaHandler.py,sha256=Q_9LMc4Wnmv8PhMfoo2IgxpHLeikUgrqp_B_Rfs217U,3005
+KekikStream/Core/PluginBase.py,sha256=CHq2ANsedSY1BQhGZgP4CumERRnOjiyopW3FMrE4J70,1474
+KekikStream/Core/PluginLoader.py,sha256=og5EPfnVqrb2kUkeGU65AY0fU43IbiUo_h3ix6ZiINY,2596
+KekikStream/Core/PluginModels.py,sha256=-V4Be9ebnUQsQtGzLxg0kGK13RJTmpB7bvAUwsE-ir0,2208
+KekikStream/Core/__init__.py,sha256=HZpXs3MKy4joO0sDpIGcZ2DrUKwK49IKG-GQgKbO2jk,416
+KekikStream/Extractors/CloseLoad.py,sha256=YmDB3YvuDaCUbQ0T_tmhnkEsC5mSdEN6GNoAR662fl8,990
+KekikStream/Extractors/MailRu.py,sha256=lB3Xy912EaSEUw7Im65L5TwtIeM7OLFV1_9lan39g40,1308
+KekikStream/Extractors/PixelDrain.py,sha256=ysHzc8-14sFkzfBheVzbM9HFyixDgVyPyn_l5LrGawQ,986
+KekikStream/Extractors/RapidVid.py,sha256=HmSXDWhE1EXZRhNCxrqqEBbyJKbqFtTFRtq-zYg3G2c,2430
+KekikStream/Extractors/SibNet.py,sha256=w0Rv1cYB_Ho6M9Aho9n38Thp6mAfKPNe-eKFC_DbGuE,884
+KekikStream/Extractors/Sobreatsesuyp.py,sha256=7JUbqHLMWFkHuzH3NG2ogaV53e9fUmGvAr7h83yRtxs,1953
+KekikStream/Extractors/TRsTX.py,sha256=jhPcQq7KPxL0SPvEFL4MG7oDXDpBbt6Qh8vRJ_bLQMU,2105
+KekikStream/Extractors/TauVideo.py,sha256=bBjrZFSi4QqSJhRB0sDWMA0Saio-zpoAb6Ss4QZmBeY,1045
+KekikStream/Extractors/TurboImgz.py,sha256=0d9t6bj4prVt1_LIbzwcfuqrSRB7SMvc4RKvE25BtW4,851
+KekikStream/Extractors/VidMoxy.py,sha256=UnVrCEI4XNiONE2aLV9dGUhRqQ9ELJTnYVXyG81N11A,1800
+KekikStream/Managers/ExtractorManager.py,sha256=9rGlUsnedJ7fwIeObN5Vsm8H5VLal0ODO7F93dDRx8w,976
+KekikStream/Managers/MediaManager.py,sha256=F7mkSvAttAaMHRvnDcxnV2K1D_sK644BCSrEaAmMl_U,522
+KekikStream/Managers/PluginManager.py,sha256=YDBLHB_Fh79A3Pei0ny2KLVY4VSihdNiKBh_w5tBl-0,637
+KekikStream/Managers/UIManager.py,sha256=PmGabWjHACnaOZLyIfOd0j4cfqpuV34RO58QeeIbF6E,1590
+KekikStream/Managers/__init__.py,sha256=3085I_9Sa2L_Vq6Z-QvYUYn1BapkN4sQqBo8ITZoD_4,251
+KekikStream/Plugins/FilmMakinesi.py,sha256=g4LRDP5Atn97PqbgnEdm0-wjVdXaJIVk1Ru0F8B66Ws,2902
+KekikStream/Plugins/FullHDFilmizlesene.py,sha256=HJzHDXHhhMpvXxiD2SjpoZEYs7dmnPymE8EXCSvLKVo,3106
+KekikStream/Plugins/SineWix.py,sha256=RJxggTrZxBimQHI4ehtJipVeIBpfHy85NW-ixE2iF2k,4762
+KekikStream/Plugins/UgurFilm.py,sha256=U7ryNWpjSZJWuYlMGX1Be9uuyiM3SfuI9VJcEiXedNs,2960
+KekikStream-0.1.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+KekikStream-0.1.7.dist-info/METADATA,sha256=_fm4Z7P5KXfua7j-QHksMSLjuP590efPALyTtCg9MjU,3961
+KekikStream-0.1.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+KekikStream-0.1.7.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
+KekikStream-0.1.7.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
+KekikStream-0.1.7.dist-info/RECORD,,

KekikStream-0.0.6.dist-info/RECORD

@@ -1,29 +0,0 @@
-KekikStream/__init__.py,sha256=69FPFbIT8ROAJlc86vyValOhpg-n0lHFRbjO-UpIc0Q,4488
-KekikStream/__main__.py,sha256=4U-NO1f0Mts5Mf_QnWhWqRbTsRBy2y2VPlpHyaqG9_I,137
-KekikStream/requirements.txt,sha256=Kh3E0NzIkAmhVODtIwRVffVOHLiElO6Ua9kIgjbocPE,57
-KekikStream/CLI/__init__.py,sha256=so-9S3fmNAyHtZYYUTEI1YaUHPiQhVA6U-Q0grACaRg,178
-KekikStream/Core/ExtractorBase.py,sha256=xwERFguGBKo_oznZaeI2d4OKvnVRHCh4AFTby5hBMJ8,1047
-KekikStream/Core/ExtractorLoader.py,sha256=JovJJr6Clk3xpbRLlh7v_XOl3FGwVXCjTZivec1FktI,2533
-KekikStream/Core/ExtractorModels.py,sha256=vJeh4qd05K7nbqdCCGU29UkGQpce6jXfsCm7LuDL1G8,454
-KekikStream/Core/MediaHandler.py,sha256=2kcRnGPuKhrdLQwbBYHR9fSY0RgHp763Q6QQnt7MWqg,2743
-KekikStream/Core/PluginBase.py,sha256=HHkfncke3XY-OsFbKGicDAqkbOtBS_dnOaZT77xLCHU,1351
-KekikStream/Core/PluginLoader.py,sha256=POayKsWOjAuReMbp6_aWbG5lIioQzpQT3u1LQXMqUwY,2574
-KekikStream/Core/PluginModels.py,sha256=bokfnVqMwVgs65A4tFUM64u4f-xcLAAGPehrfC0TI6g,998
-KekikStream/Core/__init__.py,sha256=tW3rP6d18BAD54p9QiIzrPBG396tYm2DlUCnmrPAmmI,385
-KekikStream/Extractors/CloseLoad.py,sha256=YmDB3YvuDaCUbQ0T_tmhnkEsC5mSdEN6GNoAR662fl8,990
-KekikStream/Extractors/MailRu.py,sha256=lB3Xy912EaSEUw7Im65L5TwtIeM7OLFV1_9lan39g40,1308
-KekikStream/Extractors/VidMoxy.py,sha256=gQ6U6EwY_fiJtYBs5wr_z8nITGE371aqXRXKKC7HB_M,1193
-KekikStream/Managers/ExtractorManager.py,sha256=4p5VaERx3qIIzvti9gl_khkCWYcVnzUNORmMP-OrQu0,925
-KekikStream/Managers/MediaManager.py,sha256=F7mkSvAttAaMHRvnDcxnV2K1D_sK644BCSrEaAmMl_U,522
-KekikStream/Managers/PluginManager.py,sha256=5O19YNCt4P7a6yVzlDvmxfZLA9SX9LxDs5bqqZ4i1rA,566
-KekikStream/Managers/UIManager.py,sha256=81ZSGFdf1nKw1NjL-nqwgQTYAgzJqybBWXqWCNQ_JPc,1102
-KekikStream/Managers/__init__.py,sha256=3085I_9Sa2L_Vq6Z-QvYUYn1BapkN4sQqBo8ITZoD_4,251
-KekikStream/Plugins/FilmMakinesi.py,sha256=g4LRDP5Atn97PqbgnEdm0-wjVdXaJIVk1Ru0F8B66Ws,2902
-KekikStream/Plugins/FullHDFilmizlesene.py,sha256=HJzHDXHhhMpvXxiD2SjpoZEYs7dmnPymE8EXCSvLKVo,3106
-KekikStream/Plugins/UgurFilm.py,sha256=U7ryNWpjSZJWuYlMGX1Be9uuyiM3SfuI9VJcEiXedNs,2960
-KekikStream-0.0.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-KekikStream-0.0.6.dist-info/METADATA,sha256=L-TOOQEdHv1vIB4yniOZU-hI7wvyd5KJ32GkQwJnz2U,3861
-KekikStream-0.0.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-KekikStream-0.0.6.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
-KekikStream-0.0.6.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
-KekikStream-0.0.6.dist-info/RECORD,,