KekikStream 1.7.7__tar.gz → 1.8.5__tar.gz

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Core/Extractor/ExtractorBase.py

@@ -1,7 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from abc              import ABC, abstractmethod
-from curl_cffi        import AsyncSession
 from cloudscraper     import CloudScraper
 from httpx            import AsyncClient
 from typing           import Optional
@@ -12,7 +11,6 @@ class ExtractorBase(ABC):
     # Çıkarıcının temel özellikleri
     name     = "Extractor"
     main_url = ""
-    requires_cffi = False
 
     def __init__(self):
         # cloudscraper - for bypassing Cloudflare
@@ -21,19 +19,11 @@ class ExtractorBase(ABC):
         # httpx - lightweight and safe for most HTTP requests
         self.httpx = AsyncClient(
             timeout          = 3,
-            follow_redirects = True,
+            follow_redirects = True
         )
         self.httpx.headers.update(self.cloudscraper.headers)
         self.httpx.cookies.update(self.cloudscraper.cookies)
 
-        # curl_cffi - only initialize if needed for anti-bot bypass
-        self.cffi = None
-
-        if self.requires_cffi:
-            self.cffi = AsyncSession(impersonate="firefox135")
-            self.cffi.cookies.update(self.cloudscraper.cookies)
-            self.cffi.headers.update({"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 15.7; rv:135.0) Gecko/20100101 Firefox/135.0"})
-
     def can_handle_url(self, url: str) -> bool:
         # URL'nin bu çıkarıcı tarafından işlenip işlenemeyeceğini kontrol et
         return self.main_url in url
@@ -44,10 +34,8 @@ class ExtractorBase(ABC):
         pass
 
     async def close(self):
-        """Close both HTTP clients if they exist."""
+        """Close HTTP client."""
         await self.httpx.aclose()
-        if self.cffi:
-            await self.cffi.close()
 
     def fix_url(self, url: str) -> str:
         # Eksik URL'leri düzelt ve tam URL formatına çevir

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Core/Extractor/ExtractorModels.py

@@ -1,8 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from pydantic import BaseModel
-from typing   import List, Optional
-
 
 class Subtitle(BaseModel):
     """Altyazı modeli."""
@@ -12,8 +10,8 @@ class Subtitle(BaseModel):
 
 class ExtractResult(BaseModel):
     """Extractor'ın döndürmesi gereken sonuç modeli."""
-    name      : str
-    url       : str
-    referer   : str
-    headers   : Optional[dict] = {}
-    subtitles : List[Subtitle] = []
+    name       : str
+    url        : str
+    referer    : str | None     = None
+    user_agent : str | None     = None
+    subtitles  : list[Subtitle] = []

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Core/Media/MediaHandler.py

@@ -5,33 +5,29 @@ from ..Extractor.ExtractorModels import ExtractResult
 import subprocess, os
 
 class MediaHandler:
-    def __init__(self, title: str = "KekikStream", headers: dict = None):
-        # Varsayılan HTTP başlıklarını ayarla
-        if headers is None:
-            headers = {"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5)"}
-
-        self.headers = headers
+    def __init__(self, title: str = "KekikStream"):
         self.title   = title
+        self.headers = {}
 
     def play_media(self, extract_data: ExtractResult):
-        # Referer varsa headers'a ekle
-        if extract_data.referer:
-            self.headers.update({"Referer": extract_data.referer})
+        # user-agent ekle (varsayılan veya extract_data'dan)
+        user_agent = extract_data.user_agent or "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5)"
+        self.headers["user-agent"] = user_agent
 
-        # ExtractResult'tan gelen headers'ları ekle
-        if extract_data.headers:
-            self.headers.update(extract_data.headers)
+        # referer ekle
+        if extract_data.referer:
+            self.headers["referer"] = extract_data.referer
 
         # Google Drive gibi özel durumlar için yt-dlp kullan
-        if self.headers.get("User-Agent") in ["googleusercontent", "Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0"]:
+        if user_agent in ["googleusercontent", "Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0"]:
             return self.play_with_ytdlp(extract_data)
 
         # İşletim sistemine göre oynatıcı seç
         if subprocess.check_output(['uname', '-o']).strip() == b'Android':
             return self.play_with_android_mxplayer(extract_data)
 
-        # Cookie veya alt yazılar varsa mpv kullan
-        if "Cookie" in self.headers or extract_data.subtitles:
+        # Alt yazılar varsa mpv kullan
+        if extract_data.subtitles:
             return self.play_with_mpv(extract_data)
 
         return self.play_with_vlc(extract_data) or self.play_with_mpv(extract_data)
@@ -48,11 +44,11 @@ class MediaHandler:
                     f"--input-title-format={self.title}"
                 ])
 
-            if "User-Agent" in self.headers:
-                vlc_command.append(f"--http-user-agent={self.headers.get('User-Agent')}")
+            if "user-agent" in self.headers:
+                vlc_command.append(f"--http-user-agent={self.headers.get('user-agent')}")
 
-            if "Referer" in self.headers:
-                vlc_command.append(f"--http-referrer={self.headers.get('Referer')}")
+            if "referer" in self.headers:
+                vlc_command.append(f"--http-referrer={self.headers.get('referer')}")
 
             vlc_command.extend(
                 f"--sub-file={subtitle.url}" for subtitle in extract_data.subtitles
@@ -162,4 +158,4 @@ class MediaHandler:
                 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})
+                konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Core/Media/MediaManager.py

@@ -12,8 +12,5 @@ class MediaManager:
     def get_title(self):
         return self.media_handler.title
 
-    def set_headers(self, headers):
-        self.media_handler.headers.update(headers)
-
     def play_media(self, extract_data):
         self.media_handler.play_media(extract_data)

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Core/Plugin/PluginBase.py

@@ -1,7 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from abc                          import ABC, abstractmethod
-from curl_cffi                    import AsyncSession
 from cloudscraper                 import CloudScraper
 from httpx                        import AsyncClient
 from .PluginModels                import MainPageResult, SearchResult, MovieInfo
@@ -17,8 +16,6 @@ class PluginBase(ABC):
     favicon     = f"https://www.google.com/s2/favicons?domain={main_url}&sz=64"
     description = "No description provided."
 
-    requires_cffi = False
-
     main_page   = {}
 
     async def url_update(self, new_url: str):
@@ -33,19 +30,11 @@ class PluginBase(ABC):
         # httpx - lightweight and safe for most HTTP requests
         self.httpx = AsyncClient(
             timeout          = 3,
-            follow_redirects = True,
+            follow_redirects = True
         )
         self.httpx.headers.update(self.cloudscraper.headers)
         self.httpx.cookies.update(self.cloudscraper.cookies)
 
-        # curl_cffi - only initialize if needed for anti-bot bypass
-        self.cffi = None
-
-        if self.requires_cffi:
-            self.cffi = AsyncSession(impersonate="firefox135")
-            self.cffi.cookies.update(self.cloudscraper.cookies)
-            self.cffi.headers.update({"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 15.7; rv:135.0) Gecko/20100101 Firefox/135.0"})
-
         self.media_handler = MediaHandler()
         self.ex_manager    = ExtractorManager()
 
@@ -90,10 +79,8 @@ class PluginBase(ABC):
         pass
 
     async def close(self):
-        """Close both HTTP clients if they exist."""
+        """Close HTTP client."""
         await self.httpx.aclose()
-        if self.cffi:
-            await self.cffi.close()
 
     def fix_url(self, url: str) -> str:
         if not url:

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Core/Plugin/PluginModels.py

@@ -1,34 +1,33 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from pydantic import BaseModel, field_validator, model_validator
-from typing   import List, Optional
 
 class MainPageResult(BaseModel):
     """Ana sayfa sonucunda dönecek veri modeli."""
     category : str
     title    : str
     url      : str
-    poster   : Optional[str] = None
+    poster   : str | None = None
 
 
 class SearchResult(BaseModel):
     """Arama sonucunda dönecek veri modeli."""
     title  : str
     url    : str
-    poster : Optional[str] = None
+    poster : str | None = None
 
 
 class MovieInfo(BaseModel):
     """Bir medya öğesinin bilgilerini tutan model."""
     url         : str
-    poster      : Optional[str] = None
-    title       : Optional[str] = None
-    description : Optional[str] = None
-    tags        : Optional[str] = None
-    rating      : Optional[str] = None
-    year        : Optional[str] = None
-    actors      : Optional[str] = None
-    duration    : Optional[int] = None
+    poster      : str | None = None
+    title       : str | None = None
+    description : str | None = None
+    tags        : str | None = None
+    rating      : str | None = None
+    year        : str | None = None
+    actors      : str | None = None
+    duration    : int | None = None
 
     @field_validator("tags", "actors", mode="before")
     @classmethod
@@ -42,10 +41,10 @@ class MovieInfo(BaseModel):
 
 
 class Episode(BaseModel):
-    season  : Optional[int] = None
-    episode : Optional[int] = None
-    title   : Optional[str] = None
-    url     : Optional[str] = None
+    season  : int | None = None
+    episode : int | None = None
+    title   : str | None = None
+    url     : str | None = None
 
     @model_validator(mode="after")
     def check_title(self) -> "Episode":
@@ -58,16 +57,16 @@ class Episode(BaseModel):
         return self
 
 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[str]           = None
-    year         : Optional[str]           = None
-    actors       : Optional[str]           = None
-    duration     : Optional[int]           = None
-    episodes     : Optional[List[Episode]] = None
+    url          : str | None           = None
+    poster       : str | None           = None
+    title        : str | None           = None
+    description  : str | None           = None
+    tags         : str | None           = None
+    rating       : str | None           = None
+    year         : str | None           = None
+    actors       : str | None           = None
+    duration     : int | None           = None
+    episodes     : list[Episode] | None = None
 
     @field_validator("tags", "actors", mode="before")
     @classmethod
@@ -77,4 +76,4 @@ class SeriesInfo(BaseModel):
     @field_validator("rating", "year", 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

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/CloseLoad.py

@@ -22,6 +22,5 @@ class CloseLoadExtractor(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = self.main_url,
-            headers   = {},
             subtitles = []
-        )
+        )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/ContentX.py

@@ -53,7 +53,6 @@ class ContentX(ExtractorBase):
                 name      = self.name,
                 url       = m3u_link,
                 referer   = url,
-                headers   = {},
                 subtitles = subtitles
             )
         ]
@@ -74,7 +73,6 @@ class ContentX(ExtractorBase):
                     name      = f"{self.name} Türkçe Dublaj",
                     url       = dublaj_link,
                     referer   = url,
-                    headers   = {},
                     subtitles = []
                 )
             )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/DzenRu.py

@@ -34,6 +34,5 @@ class DzenRu(ExtractorBase):
             name      = self.name,
             url       = best_link,
             referer   = self.main_url,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/ExPlay.py

@@ -49,6 +49,5 @@ class ExPlay(ExtractorBase):
             name      = f"{self.name} - {title}",
             url       = m3u_link,
             referer   = clean_url, 
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/FirePlayer.py

@@ -53,9 +53,8 @@ class FirePlayer(ExtractorBase):
              raise ValueError("Could not find video URL in unpacked content")
 
         return ExtractResult(
-            name      = self.name,
-            url       = video_url,
-            referer   = url,
-            headers   = headers
+            name       = self.name,
+            url        = video_url,
+            referer    = url,
+            user_agent = headers.get("User-Agent", "")
         )
-

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/HDPlayerSystem.py

@@ -37,6 +37,5 @@ class HDPlayerSystem(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = url,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/JetTv.py

@@ -41,6 +41,5 @@ class JetTv(ExtractorBase):
             name      = self.name,
             url       = master_url,
             referer   = final_ref,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/MailRu.py

@@ -34,6 +34,5 @@ class MailRuExtractor(ExtractorBase):
             name      = self.name,
             url       = video_url,
             referer   = self.main_url,
-            headers   = {"Cookie": f"video_key={video_key}"},
             subtitles = []
-        )
+        )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/MixPlayHD.py

@@ -36,7 +36,6 @@ class MixPlayHD(ExtractorBase):
                 name      = self.name,
                 url       = video_url_match[1],
                 referer   = self.main_url,
-                headers   = {},
                 subtitles = []
             )
         else:

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/MixTiger.py

@@ -37,9 +37,6 @@ class MixTiger(ExtractorBase):
         if not m3u_link:
             raise ValueError("Video URL not found in response")
 
-        # disk.yandex için referer boş olmalı
-        final_referer = "" if "disk.yandex" in m3u_link else ext_ref
-
         # Recursive extraction check
         try:
             from KekikStream.Core.Extractor.ExtractorManager import ExtractorManager
@@ -55,7 +52,6 @@ class MixTiger(ExtractorBase):
         return ExtractResult(
             name      = self.name,
             url       = m3u_link,
-            referer   = final_referer,
-            headers   = {},
+            referer   = None if "disk.yandex" in m3u_link else ext_ref,
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/MolyStream.py

@@ -26,9 +26,9 @@ class MolyStream(ExtractorBase):
         ]
 
         return ExtractResult(
-            name      = self.name,
-            url       = video,
-            referer   = video.replace("/sheila", ""),
-            headers   = {"User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0"},
-            subtitles = subtitles
+            name       = self.name,
+            url        = video,
+            referer    = video.replace("/sheila", ""),
+            user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0",
+            subtitles  = subtitles
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/Odnoklassniki.py

@@ -82,11 +82,11 @@ class Odnoklassniki(ExtractorBase):
             best_video = f"https:{best_video}"
 
         return ExtractResult(
-            name      = self.name,
-            url       = best_video,
-            referer   = referer,
-            headers   = headers,
-            subtitles = []
+            name       = self.name,
+            url        = best_video,
+            referer    = referer,
+            user_agent = headers.get("User-Agent", None),
+            subtitles  = []
         )
 
     async def fetch_with_redirects(self, url, max_redirects=5):

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/PeaceMakerst.py

@@ -53,6 +53,5 @@ class PeaceMakerst(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = url,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/PixelDrain.py

@@ -23,6 +23,5 @@ class PixelDrain(ExtractorBase):
             name      = f"{self.name} - {pixel_id}",
             url       = download_link,
             referer   = referer_link,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/PlayerFilmIzle.py

@@ -54,9 +54,9 @@ class PlayerFilmIzle(ExtractorBase):
             raise ValueError("PlayerFilmIzle: M3U8 linki bulunamadı")
 
         return ExtractResult(
-            name      = self.name,
-            url       = m3u8_url,
-            referer   = ext_ref,
-            headers   = dict(self.httpx.headers),
-            subtitles = subtitles
+            name       = self.name,
+            url        = m3u8_url,
+            referer    = ext_ref,
+            user_agent = self.httpx.headers.get("User-Agent", None),
+            subtitles  = subtitles
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/RapidVid.py

@@ -49,7 +49,6 @@ class RapidVid(ExtractorBase):
             name      = self.name,
             url       = decoded_url,
             referer   = self.main_url,
-            headers   = {},
             subtitles = subtitles
         )
 

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/SetPlay.py

@@ -53,6 +53,5 @@ class SetPlay(ExtractorBase):
             name      = f"{self.name} - {name_suffix}",
             url       = m3u_link,
             referer   = url,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/SetPrime.py

@@ -41,6 +41,5 @@ class SetPrime(ExtractorBase):
             name      = display_name,
             url       = m3u_link,
             referer   = clean_url,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/SibNet.py

@@ -24,6 +24,5 @@ class SibNet(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = url,
-            headers   = {},
             subtitles = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/Sobreatsesuyp.py

@@ -49,7 +49,6 @@ class Sobreatsesuyp(ExtractorBase):
                     name      = f"{self.name} - {title}",
                     url       = playlist_request.text,
                     referer   = self.main_url,
-                    headers   = {},
                     subtitles = []
                 )
             )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/TRsTX.py

@@ -57,7 +57,6 @@ class TRsTX(ExtractorBase):
                     name      = f"{self.name} - {title}",
                     url       = video_data,
                     referer   = self.main_url,
-                    headers   = {},
                     subtitles = []
                 )
             )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/TauVideo.py

@@ -26,7 +26,6 @@ class TauVideo(ExtractorBase):
                     name      = f"{self.name} - {video['label']}",
                     url       = video["url"],
                     referer   = referer or self.main_url,
-                    headers   = {},
                     subtitles = []
                 )
                     for video in api_data["urls"]

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/TurboImgz.py

@@ -19,7 +19,6 @@ class TurboImgz(ExtractorBase):
                 name      = self.name,
                 url       = video_match[1],
                 referer   = referer or self.main_url,
-                headers   = {},
                 subtitles = []
             )
         else:

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/TurkeyPlayer.py

@@ -26,9 +26,9 @@ class TurkeyPlayer(ExtractorBase):
         master_url = f"https://watch.turkeyplayer.com/m3u8/8/{video_md5}/master.txt?s=1&id={video_id}&cache=1"
         
         return ExtractResult(
-            name      = self.name,
-            url       = master_url,
-            referer   = referer or url,
-            headers   = dict(self.httpx.headers),
-            subtitles = []
+            name       = self.name,
+            url        = master_url,
+            referer    = referer or url,
+            user_agent = self.httpx.headers.get("User-Agent", ""),
+            subtitles  = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/VidHide.py

@@ -64,9 +64,9 @@ class VidHide(ExtractorBase):
             raise ValueError(f"VidHide: Video URL bulunamadı. {url}")
 
         return ExtractResult(
-            name      = self.name,
-            url       = self.fix_url(m3u8_url),
-            referer   = f"{self.main_url}/",
-            headers   = dict(self.httpx.headers),
-            subtitles = []
+            name       = self.name,
+            url        = self.fix_url(m3u8_url),
+            referer    = f"{self.main_url}/",
+            user_agent = self.httpx.headers.get("User-Agent", ""),
+            subtitles  = []
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/VidMoly.py

@@ -80,7 +80,6 @@ class VidMoly(ExtractorBase):
             name      = self.name,
             url       = video_url,
             referer   = self.main_url,
-            headers   = {},
             subtitles = subtitles
         )
 

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/VidMoxy.py

@@ -45,6 +45,5 @@ class VidMoxy(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = self.main_url,
-            headers   = {},
             subtitles = subtitles
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/VidPapi.py

@@ -85,6 +85,5 @@ class VidPapi(ExtractorBase):
             name      = self.name,
             url       = stream_url,
             referer   = ext_ref or self.main_url,
-            headers   = {},
             subtitles = subtitles
         )

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/VideoSeyred.py

@@ -43,7 +43,6 @@ class VideoSeyred(ExtractorBase):
                 name      = self.name,
                 url       = self.fix_url(source["file"]),
                 referer   = self.main_url,
-                headers   = {},
                 subtitles = subtitles,
             )
                 for source in response_data.get("sources", [])

{kekikstream-1.7.7 → kekikstream-1.8.5}/KekikStream/Extractors/YildizKisaFilm.py

@@ -37,6 +37,5 @@ class YildizKisaFilm(ExtractorBase):
             name      = self.name,
             url       = m3u_link,
             referer   = ext_ref,
-            headers   = {},
             subtitles = []
         )