KekikStream 0.0.8__py3-none-any.whl → 0.1.0__py3-none-any.whl

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/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,14 +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
 
-    @validator("rating", pre=True)
+    @field_validator("rating", mode="before")
+    @classmethod
     def ensure_string(cls, value):
-        return str(value) if value is not None else 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/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/Managers/UIManager.py

@@ -26,6 +26,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

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core                 import PluginBase, SearchResult, MovieInfo
+from KekikStream.Core                 import PluginBase, SearchResult, MovieInfo, Episode, SeriesInfo
 from KekikStream.Core.ExtractorModels import ExtractResult, Subtitle
 
 class SineWix(PluginBase):
@@ -16,24 +16,24 @@ class SineWix(PluginBase):
                 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"
+                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":
-                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}"),
+                    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"),
@@ -42,8 +42,45 @@ class SineWix(PluginBase):
                     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()
 

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:
@@ -68,12 +68,25 @@ class KekikStream:
 
         self.ui_manager.display_media_info(self.current_plugin.name, media_info)
 
-        links = await self.current_plugin.load_links(media_info.url)
-        await self.show_options(links)
+        if isinstance(media_info, SeriesInfo):
+            selected_episode = await self.ui_manager.select_from_list(
+                message="Bir 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 and (not hasattr(self.current_plugin, "play") and not callable(self.current_plugin.play)):
+        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

{KekikStream-0.0.8.dist-info → KekikStream-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.0.8
+Version: 0.1.0
 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.0.8.dist-info → KekikStream-0.1.0.dist-info}/RECORD

@@ -1,30 +1,30 @@
-KekikStream/__init__.py,sha256=BZIOhiujI9qVh1nlJXw-C2gJ02e4bu8o9VaoaXhdeCk,5406
+KekikStream/__init__.py,sha256=u5AcYJhxhNGXuoVHXmaSQiw5-qgq3_O_W-c8nNLj8nA,6059
 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=SPXKZPfpzvgkJeMds-USzgpm8-qb0vgZjjLDs58NfGU,1069
 KekikStream/Core/ExtractorLoader.py,sha256=JovJJr6Clk3xpbRLlh7v_XOl3FGwVXCjTZivec1FktI,2533
 KekikStream/Core/ExtractorModels.py,sha256=vJeh4qd05K7nbqdCCGU29UkGQpce6jXfsCm7LuDL1G8,454
-KekikStream/Core/MediaHandler.py,sha256=2kcRnGPuKhrdLQwbBYHR9fSY0RgHp763Q6QQnt7MWqg,2743
+KekikStream/Core/MediaHandler.py,sha256=Q_9LMc4Wnmv8PhMfoo2IgxpHLeikUgrqp_B_Rfs217U,3005
 KekikStream/Core/PluginBase.py,sha256=CHq2ANsedSY1BQhGZgP4CumERRnOjiyopW3FMrE4J70,1474
 KekikStream/Core/PluginLoader.py,sha256=POayKsWOjAuReMbp6_aWbG5lIioQzpQT3u1LQXMqUwY,2574
-KekikStream/Core/PluginModels.py,sha256=cV24ksmdrjE2usdfZv4c68TDC5FN9j9yaLH9lcg4FCY,1127
-KekikStream/Core/__init__.py,sha256=tW3rP6d18BAD54p9QiIzrPBG396tYm2DlUCnmrPAmmI,385
+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/VidMoxy.py,sha256=i59sfXfQFs4tkwarjUsTHMMDsmE0fjgqEJ7Az70n9x0,1128
+KekikStream/Extractors/VidMoxy.py,sha256=UnVrCEI4XNiONE2aLV9dGUhRqQ9ELJTnYVXyG81N11A,1800
 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/UIManager.py,sha256=7C_y3DZhMYxmfE88be5v4DlEk_H8CmBzn4dRHwr5klY,1162
 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=g3uTe4IHepnAuwZjSeAf-9ModSGcpS7zKTjyY5011IA,2950
+KekikStream/Plugins/SineWix.py,sha256=RJxggTrZxBimQHI4ehtJipVeIBpfHy85NW-ixE2iF2k,4762
 KekikStream/Plugins/UgurFilm.py,sha256=U7ryNWpjSZJWuYlMGX1Be9uuyiM3SfuI9VJcEiXedNs,2960
-KekikStream-0.0.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-KekikStream-0.0.8.dist-info/METADATA,sha256=RJ_3-b402HzkQWsgy0fM2dPKWsYkAa9-at6J_kqKr_A,3960
-KekikStream-0.0.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-KekikStream-0.0.8.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
-KekikStream-0.0.8.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
-KekikStream-0.0.8.dist-info/RECORD,,
+KekikStream-0.1.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+KekikStream-0.1.0.dist-info/METADATA,sha256=H127dX_jC5p4LduihR44SaumVQnXIcmzJ75QBuzxFhY,3960
+KekikStream-0.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+KekikStream-0.1.0.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
+KekikStream-0.1.0.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
+KekikStream-0.1.0.dist-info/RECORD,,