KekikStream 2.1.0__tar.gz → 2.1.9__tar.gz

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Core/Plugin/PluginBase.py

@@ -4,7 +4,7 @@ from ...CLI                       import konsol
 from abc                          import ABC, abstractmethod
 from cloudscraper                 import CloudScraper
 from httpx                        import AsyncClient
-from .PluginModels                import MainPageResult, SearchResult, MovieInfo
+from .PluginModels                import MainPageResult, SearchResult, MovieInfo, SeriesInfo
 from ..Media.MediaHandler         import MediaHandler
 from ..Extractor.ExtractorManager import ExtractorManager
 from ..Extractor.ExtractorModels  import ExtractResult
@@ -55,31 +55,31 @@ class PluginBase(ABC):
         pass
 
     @abstractmethod
-    async def load_item(self, url: str) -> MovieInfo:
+    async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         """Bir medya öğesi hakkında detaylı bilgi döndürür."""
         pass
 
     @abstractmethod
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         """
         Bir medya öğesi için oynatma bağlantılarını döndürür.
-        
+
         Args:
             url: Medya URL'si
-            
+
         Returns:
-            Dictionary listesi, her biri şu alanları içerir:
+            ExtractResult listesi, her biri şu alanları içerir:
             - url (str, zorunlu): Video URL'si
             - name (str, zorunlu): Gösterim adı (tüm bilgileri içerir)
             - referer (str, opsiyonel): Referer header
-            - subtitles (list, opsiyonel): Altyazı listesi
-        
+            - subtitles (list[Subtitle], opsiyonel): Altyazı listesi
+
         Example:
             [
-                {
-                    "url": "https://example.com/video.m3u8",
-                    "name": "HDFilmCehennemi | 1080p TR Dublaj"
-                }
+                ExtractResult(
+                    url="https://example.com/video.m3u8",
+                    name="HDFilmCehennemi | 1080p TR Dublaj"
+                )
             ]
         """
         pass
@@ -97,7 +97,7 @@ class PluginBase(ABC):
 
         return f"https:{url}" if url.startswith("//") else urljoin(self.main_url, url)
 
-    async def extract(self, url: str, referer: str = None, prefix: str | None = None) -> dict | None:
+    async def extract(self, url: str, referer: str = None, prefix: str | None = None) -> ExtractResult | None:
         """
         Extractor ile video URL'sini çıkarır.
 
@@ -107,8 +107,8 @@ class PluginBase(ABC):
             prefix: İsmin başına eklenecek opsiyonel etiket (örn: "Türkçe Dublaj")
 
         Returns:
-            dict: Extractor sonucu (name prefix ile birleştirilmiş) veya None
-            
+            ExtractResult: Extractor sonucu (name prefix ile birleştirilmiş) veya None
+
         Extractor bulunamadığında veya hata oluştuğunda uyarı verir.
         """
         if referer is None:
@@ -121,13 +121,12 @@ class PluginBase(ABC):
 
         try:
             data = await extractor.extract(url, referer=referer)
-            result = data.dict()
-            
+
             # prefix varsa name'e ekle
-            if prefix and result.get("name"):
-                result["name"] = f"{prefix} | {result['name']}"
-            
-            return result
+            if prefix and data.name:
+                data.name = f"{prefix} | {data.name}"
+
+            return data
         except Exception as hata:
             konsol.log(f"[red][!] {self.name} » Extractor hatası ({extractor.name}): {hata}")
             return None

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Extractors/CloseLoad.py

@@ -1,7 +1,8 @@
 # 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, StreamDecoder
+from parsel           import Selector
 import re
 
 class CloseLoadExtractor(ExtractorBase):
@@ -15,12 +16,26 @@ class CloseLoadExtractor(ExtractorBase):
         istek = await self.httpx.get(url)
         istek.raise_for_status()
 
+        # Video URL'sini çıkar
         eval_func = re.compile(r'\s*(eval\(function[\s\S].*)\s*').findall(istek.text)[0]
         m3u_link  = StreamDecoder.extract_stream_url(Packer.unpack(eval_func))
 
+        # Subtitle'ları parse et (Kotlin referansı: track elementleri)
+        subtitles = []
+        secici = Selector(istek.text)
+        for track in secici.css("track"):
+            raw_src = track.css("::attr(src)").get() or ""
+            raw_src = raw_src.strip()
+            label   = track.css("::attr(label)").get() or track.css("::attr(srclang)").get() or "Altyazı"
+            
+            if raw_src:
+                full_url = raw_src if raw_src.startswith("http") else f"{self.main_url}{raw_src}"
+                subtitles.append(Subtitle(name=label, url=full_url))
+
         return ExtractResult(
             name      = self.name,
             url       = m3u_link,
             referer   = self.main_url,
-            subtitles = []
+            subtitles = subtitles
         )
+

kekikstream-2.1.9/KekikStream/Extractors/Filemoon.py

@@ -0,0 +1,78 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult
+from Kekik.Sifreleme  import Packer
+from parsel           import Selector
+import re
+
+class Filemoon(ExtractorBase):
+    name     = "Filemoon"
+    main_url = "https://filemoon.to"
+
+    # Filemoon'un farklı domainlerini destekle
+    supported_domains = [
+        "filemoon.to",
+        "filemoon.in",
+        "filemoon.sx",
+        "filemoon.nl",
+        "filemoon.com"
+    ]
+
+    def can_handle_url(self, url: str) -> bool:
+        return any(domain in url for domain in self.supported_domains)
+
+    async def extract(self, url: str, referer: str = None) -> ExtractResult:
+        headers = {
+            "Referer"        : url,
+            "Sec-Fetch-Dest" : "iframe",
+            "Sec-Fetch-Mode" : "navigate",
+            "Sec-Fetch-Site" : "cross-site",
+        }
+        self.httpx.headers.update(headers)
+
+        # İlk sayfayı al
+        istek    = await self.httpx.get(url)
+        response = istek.text
+        secici   = Selector(response)
+
+        # Eğer iframe varsa, iframe'e git
+        iframe_src = secici.css("iframe::attr(src)").get()
+        if iframe_src:
+            iframe_url = self.fix_url(iframe_src)
+            self.httpx.headers.update({
+                "Accept-Language" : "en-US,en;q=0.5",
+                "Sec-Fetch-Dest"  : "iframe"
+            })
+            istek    = await self.httpx.get(iframe_url)
+            response = istek.text
+
+        # Packed script'i bul ve unpack et
+        m3u8_url = None
+
+        if Packer.detect_packed(response):
+            try:
+                unpacked = Packer.unpack(response)
+                # sources:[{file:"..." pattern'ını ara
+                if match := re.search(r'sources:\s*\[\s*\{\s*file:\s*"([^"]+)"', unpacked):
+                    m3u8_url = match.group(1)
+                elif match := re.search(r'file:\s*"([^"]*?\.m3u8[^"]*)"', unpacked):
+                    m3u8_url = match.group(1)
+            except Exception:
+                pass
+
+        # Fallback: Doğrudan response'ta ara
+        if not m3u8_url:
+            if match := re.search(r'sources:\s*\[\s*\{\s*file:\s*"([^"]+)"', response):
+                m3u8_url = match.group(1)
+            elif match := re.search(r'file:\s*"([^"]*?\.m3u8[^"]*)"', response):
+                m3u8_url = match.group(1)
+
+        if not m3u8_url:
+            raise ValueError(f"Filemoon: Video URL bulunamadı. {url}")
+
+        return ExtractResult(
+            name      = self.name,
+            url       = self.fix_url(m3u8_url),
+            referer   = f"{self.main_url}/",
+            subtitles = []
+        )

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Extractors/MixTiger.py

@@ -37,16 +37,15 @@ class MixTiger(ExtractorBase):
         if not m3u_link:
             raise ValueError("Video URL not found in response")
 
-        # Recursive extraction check
+        # Recursive extraction check - başka extractor kullanılabilir mi?
         try:
             from KekikStream.Core.Extractor.ExtractorManager import ExtractorManager
-            # Import inside method to avoid circular dependency
             manager = ExtractorManager()
             if nested_extractor := manager.find_extractor(m3u_link):
-                # Use recursive extraction
-                return await nested_extractor.extract(m3u_link, referer=final_referer)
+                # Nested extractor ile çıkar
+                return await nested_extractor.extract(m3u_link, referer=ext_ref)
         except Exception:
-            # If recursion fails, fallback to standard result
+            # Recursive extraction başarısız olursa standart sonucu döndür
             pass
 
         return ExtractResult(
@@ -55,3 +54,4 @@ class MixTiger(ExtractorBase):
             referer   = None if "disk.yandex" in m3u_link else ext_ref,
             subtitles = []
         )
+

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Extractors/RapidVid.py

@@ -1,7 +1,7 @@
 # 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
+from Kekik.Sifreleme  import Packer, HexCodec, StreamDecoder
 import re, base64
 
 class RapidVid(ExtractorBase):
@@ -39,15 +39,25 @@ class RapidVid(ExtractorBase):
             subtitles.append(Subtitle(name=decoded_lang, url=sub_url.replace("\\", "")))
 
         try:
+            decoded_url = None
+
+            # Method 1: file": "..." pattern (HexCodec)
             if extracted_value := re.search(r'file": "(.*)",', istek.text):
                 escaped_hex = extracted_value[1]
                 decoded_url = HexCodec.decode(escaped_hex)
-            else:
-                av_encoded = re.search(r"av\('([^']+)'\)", istek.text)
-                if not av_encoded:
-                    raise ValueError("AV encoding not found.")
 
+            # Method 2: av('...') pattern
+            elif av_encoded := re.search(r"av\('([^']+)'\)", istek.text):
                 decoded_url = self.decode_secret(av_encoded[1])
+
+            # Method 3: Packed script with dc_* function (StreamDecoder)
+            elif Packer.detect_packed(istek.text):
+                unpacked    = Packer.unpack(istek.text)
+                decoded_url = StreamDecoder.extract_stream_url(unpacked)
+
+            if not decoded_url:
+                raise ValueError("No valid video URL pattern found.")
+
         except Exception as hata:
             raise RuntimeError(f"Extraction failed: {hata}") from hata
 

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Extractors/VidHide.py

@@ -9,6 +9,12 @@ class VidHide(ExtractorBase):
     name     = "VidHide"
     main_url = "https://vidhidepro.com"
 
+    # Birden fazla domain destekle
+    supported_domains = ["vidhidepro.com", "vidhide.com", "rubyvidhub.com"]
+
+    def can_handle_url(self, url: str) -> bool:
+        return any(domain in url for domain in self.supported_domains)
+
     def get_embed_url(self, url: str) -> str:
         if "/d/" in url:
             return url.replace("/d/", "/v/")
@@ -20,6 +26,9 @@ class VidHide(ExtractorBase):
             return url.replace("/f/", "/v/")
 
     async def extract(self, url: str, referer: str = None) -> ExtractResult:
+        # Dinamik base URL kullan
+        base_url = self.get_base_url(url)
+
         if referer:
             self.httpx.headers.update({"Referer": referer})
 
@@ -27,7 +36,7 @@ class VidHide(ExtractorBase):
             "Sec-Fetch-Dest" : "empty",
             "Sec-Fetch-Mode" : "cors",
             "Sec-Fetch-Site" : "cross-site",
-            "Origin"         : self.main_url,
+            "Origin"         : base_url,
         })
         
         embed_url = self.get_embed_url(url)
@@ -66,7 +75,7 @@ class VidHide(ExtractorBase):
         return ExtractResult(
             name       = self.name,
             url        = self.fix_url(m3u8_url),
-            referer    = f"{self.main_url}/",
+            referer    = f"{base_url}/",
             user_agent = self.httpx.headers.get("User-Agent", ""),
             subtitles  = []
         )

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/BelgeselX.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult
 from parsel           import Selector
 import re
 
@@ -164,7 +164,7 @@ class BelgeselX(PluginBase):
             episodes    = episodes
         )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek = await self.httpx.get(url)
         text  = istek.text
 
@@ -187,10 +187,10 @@ class BelgeselX(PluginBase):
             source_name = "Google" if quality == "FULL" else self.name
             quality_str = "1080p" if quality == "FULL" else quality
 
-            links.append({
-                "url"     : video_url,
-                "name"    : f"{source_name} | {quality_str}",
-                "referer" : url
-            })
+            links.append(ExtractResult(
+                url     = video_url,
+                name    = f"{source_name} | {quality_str}",
+                referer = url
+            ))
 
         return links

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/DiziBox.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult
 from Kekik.Sifreleme  import CryptoJS
 from parsel           import Selector
 import re, urllib.parse, base64, contextlib, asyncio, time
@@ -174,7 +174,7 @@ class DiziBox(PluginBase):
 
         return results
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/DiziPal.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, Subtitle
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, Subtitle, ExtractResult
 from parsel import Selector
 import re
 
@@ -177,7 +177,7 @@ class DiziPal(PluginBase):
                 duration    = duration,
             )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         # Reset headers to get HTML response
         self.httpx.headers.update({
             "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
@@ -220,12 +220,12 @@ class DiziPal(PluginBase):
                     sub_url = sub_text.replace(f"[{lang}]", "")
                     subtitles.append(Subtitle(name=lang, url=self.fix_url(sub_url)))
 
-            results.append({
-                "name"      : self.name,
-                "url"       : m3u_link,
-                "referer"   : f"{self.main_url}/",
-                "subtitles" : subtitles
-            })
+            results.append(ExtractResult(
+                name      = self.name,
+                url       = m3u_link,
+                referer   = f"{self.main_url}/",
+                subtitles = subtitles
+            ))
         else:
             # Extractor'a yönlendir
             data = await self.extract(iframe)

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/DiziYou.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, Subtitle
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, Subtitle, ExtractResult
 from parsel           import Selector
 import re
 
@@ -123,7 +123,7 @@ class DiziYou(PluginBase):
             actors      = actors
         )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
@@ -179,11 +179,11 @@ class DiziYou(PluginBase):
 
         results = []
         for stream in stream_urls:
-            results.append({
-                "url"       : stream.get("url"),
-                "name"      : f"{stream.get('dil')}",
-                "referer"   : url,
-                "subtitles" : subtitles
-            })
+            results.append(ExtractResult(
+                url       = stream.get("url"),
+                name      = f"{stream.get('dil')}",
+                referer   = url,
+                subtitles = subtitles
+            ))
 
         return results

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/Dizilla.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult
 from parsel           import Selector
 from json             import loads
 from urllib.parse     import urlparse, urlunparse
@@ -170,7 +170,7 @@ class Dizilla(PluginBase):
             actors      = actors
         )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek   = await self.httpx.get(url)
         secici  = Selector(istek.text)
 

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/FilmBip.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, ExtractResult
 from parsel import Selector
 
 class FilmBip(PluginBase):
@@ -125,7 +125,7 @@ class FilmBip(PluginBase):
             actors      = actors,
         )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/FilmMakinesi.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, ExtractResult
 from parsel           import Selector
 
 class FilmMakinesi(PluginBase):
@@ -75,18 +75,22 @@ class FilmMakinesi(PluginBase):
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
-        title       = secici.css("h1.title::text").get().strip()
-        poster      = secici.css("img.cover-img::attr(src)").get().strip()
-        description = secici.css("div.info-description p::text").get().strip()
+        title       = secici.css("h1.title::text").get()
+        title       = title.strip() if title else ""
+        poster      = secici.css("img.cover-img::attr(src)").get()
+        poster      = poster.strip() if poster else ""
+        description = secici.css("div.info-description p::text").get()
+        description = description.strip() if description else ""
         rating      = secici.css("div.score::text").get()
         if rating:
             rating = rating.strip().split()[0]
-        year        = secici.css("span.date a::text").get().strip()
+        year        = secici.css("span.date a::text").get()
+        year        = year.strip() if year else ""
         actors      = secici.css("div.cast-name::text").getall()
         tags        = secici.css("div.genre a::text").getall()
         duration    = secici.css("div.time::text").get()
         if duration:
-            duration = duration.split()[1].strip()
+            duration = duration.split()[1].strip() if len(duration.split()) > 1 else ""
 
         return MovieInfo(
             url         = url,
@@ -100,20 +104,28 @@ class FilmMakinesi(PluginBase):
             duration    = duration
         )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
-        iframe_src = secici.css("iframe::attr(data-src)").get()
+        response = []
 
-        all_links = [iframe_src] if iframe_src else []
+        # Video parts linklerini ve etiketlerini al
         for link in secici.css("div.video-parts a[data-video_url]"):
-            all_links.append(link.attrib.get("data-video_url"))
+            video_url = link.attrib.get("data-video_url")
+            label     = link.css("::text").get() or ""
+            label     = label.strip()
 
-        response = []
-        for link in all_links:
-            data = await self.extract(link)
+            data = await self.extract(video_url, prefix=label.split()[0] if label else None)
             if data:
                 response.append(data)
 
-        return response
+        # Eğer video-parts yoksa iframe kullan
+        if not response:
+            iframe_src = secici.css("iframe::attr(data-src)").get()
+            if iframe_src:
+                data = await self.extract(iframe_src)
+                if data:
+                    response.append(data)
+
+        return response

{kekikstream-2.1.0 → kekikstream-2.1.9}/KekikStream/Plugins/FilmModu.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, Subtitle
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, Subtitle, ExtractResult
 from parsel import Selector
 import re
 
@@ -87,7 +87,7 @@ class FilmModu(PluginBase):
             actors      = [a.css("span::text").get() for a in secici.css("a[itemprop='actor']")],
         )
 
-    async def load_links(self, url: str) -> list[dict]:
+    async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
@@ -124,11 +124,11 @@ class FilmModu(PluginBase):
                 subtitle_url = None
 
             for source in source_data.get("sources", []):
-                results.append({
-                    "name"      : f"{self.name} | {alt_name} | {source.get('label', 'Bilinmiyor')}",
-                    "url"       : self.fix_url(source["src"]),
-                    "referer"   : f"{self.main_url}/",
-                    "subtitles" : [Subtitle(name="Türkçe", url=subtitle_url)] if subtitle_url else []
-                })
+                results.append(ExtractResult(
+                    name      = f"{self.name} | {alt_name} | {source.get('label', 'Bilinmiyor')}",
+                    url       = self.fix_url(source["src"]),
+                    referer   = f"{self.main_url}/",
+                    subtitles = [Subtitle(name="Türkçe", url=subtitle_url)] if subtitle_url else []
+                ))
 
         return results