KekikStream 2.2.8__py3-none-any.whl → 2.3.9__py3-none-any.whl

KekikStream/Core/HTMLHelper.py

@@ -0,0 +1,134 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from selectolax.parser import HTMLParser, Node
+import re
+
+
+class HTMLHelper:
+    """
+    Selectolax ile HTML parsing işlemlerini temiz, kısa ve okunabilir hale getiren yardımcı sınıf.
+    """
+
+    def __init__(self, html: str):
+        self.parser = HTMLParser(html)
+        self.html   = html
+
+    # ========================
+    # TEMEL SELECTOR İŞLEMLERİ
+    # ========================
+
+    def _target(self, element: Node | None) -> Node | HTMLParser:
+        """İşlem yapılacak temel elementi döndürür."""
+        return element if element is not None else self.parser
+
+    def select(self, selector: str, element: Node | None = None) -> list[Node]:
+        """CSS selector ile tüm eşleşen elementleri döndür."""
+        return self._target(element).css(selector)
+
+    def select_first(self, selector: str | None, element: Node | None = None) -> Node | None:
+        """CSS selector ile ilk eşleşen elementi döndür."""
+        if not selector:
+            return element
+
+        return self._target(element).css_first(selector)
+
+    def select_text(self, selector: str | None = None, element: Node | None = None, strip: bool = True) -> str | None:
+        """CSS selector ile element bul ve text içeriğini döndür."""
+        el = self.select_first(selector, element)
+        if not el:
+            return None
+
+        val = el.text(strip=strip)
+        return val if val else None
+
+    def select_attr(self, selector: str | None, attr: str, element: Node | None = None) -> str | None:
+        """CSS selector ile element bul ve attribute değerini döndür."""
+        el = self.select_first(selector, element)
+        return el.attrs.get(attr) if el else None
+
+    def select_all_text(self, selector: str, element: Node | None = None, strip: bool = True) -> list[str]:
+        """CSS selector ile tüm eşleşen elementlerin text içeriklerini döndür."""
+        return [
+            txt for el in self.select(selector, element)
+                if (txt := el.text(strip=strip))
+        ]
+
+    def select_all_attr(self, selector: str, attr: str, element: Node | None = None) -> list[str]:
+        """CSS selector ile tüm eşleşen elementlerin attribute değerlerini döndür."""
+        return [
+            val for el in self.select(selector, element)
+                if (val := el.attrs.get(attr))
+        ]
+
+    # ----------------------------------------------
+
+    def select_poster(self, selector: str = "img", element: Node | None = None) -> str | None:
+        """Poster URL'sini çıkar. Önce data-src, sonra src dener."""
+        el = self.select_first(selector, element)
+        if not el:
+            return None
+
+        return el.attrs.get("data-src") or el.attrs.get("src")
+
+    # ========================
+    # REGEX İŞLEMLERİ
+    # ========================
+
+    def _source(self, target: str | int | None) -> str:
+        """Regex için kaynak metni döndürür."""
+        return target if isinstance(target, str) else self.html
+
+    def _flags(self, target: str | int | None, flags: int) -> int:
+        """Regex flags değerini döndürür."""
+        return target if isinstance(target, int) else flags
+
+    def regex_first(self, pattern: str, target: str | int | None = None, flags: int = 0) -> str | None:
+        """Regex ile arama yap, ilk grubu döndür (grup yoksa tamamını)."""
+        match = re.search(pattern, self._source(target), self._flags(target, flags))
+        if not match:
+            return None
+
+        try:
+            return match.group(1)
+        except IndexError:
+            return match.group(0)
+
+    def regex_all(self, pattern: str, target: str | int | None = None, flags: int = 0) -> list[str]:
+        """Regex ile tüm eşleşmeleri döndür."""
+        return re.findall(pattern, self._source(target), self._flags(target, flags))
+
+    def regex_replace(self, pattern: str, repl: str, target: str | int | None = None, flags: int = 0) -> str:
+        """Regex ile replace yap."""
+        return re.sub(pattern, repl, self._source(target), flags)
+
+    # ========================
+    # ÖZEL AYIKLAYICILAR
+    # ========================
+
+    @staticmethod
+    def extract_season_episode(text: str) -> tuple[int | None, int | None]:
+        """Metin içinden sezon ve bölüm numarasını çıkar."""
+        # S01E05 formatı
+        if m := re.search(r"[Ss](\d+)[Ee](\d+)", text):
+            return int(m.group(1)), int(m.group(2))
+
+        # Ayrı ayrı ara
+        s = re.search(r"(\d+)\.\s*[Ss]ezon|[Ss]ezon[- ]?(\d+)|-(\d+)-sezon", text, re.I)
+        e = re.search(r"(\d+)\.\s*[Bb]ölüm|[Bb]olum[- ]?(\d+)|-(\d+)-bolum|[Ee](\d+)", text, re.I)
+
+        # İlk bulunan grubu al (None değilse)
+        s_val = next((int(g) for g in s.groups() if g), None) if s else None
+        e_val = next((int(g) for g in e.groups() if g), None) if e else None
+
+        return s_val, e_val
+
+    def extract_year(self, *selectors: str, pattern: str = r"(\d{4})") -> int | None:
+        """Birden fazla selector veya regex ile yıl bilgisini çıkar."""
+        for selector in selectors:
+            if text := self.select_text(selector):
+                if m := re.search(r"(\d{4})", text):
+                    return int(m.group(1))
+
+        val = self.regex_first(pattern)
+        return int(val) if val and val.isdigit() else None
+

KekikStream/Core/Plugin/PluginBase.py

@@ -25,14 +25,22 @@ class PluginBase(ABC):
         self.main_page = {url.replace(self.main_url, new_url): category for url, category in self.main_page.items()}
         self.main_url  = new_url
 
-    def __init__(self):
+    def __init__(self, proxy: str | dict | None = None):
         # cloudscraper - for bypassing Cloudflare
         self.cloudscraper = CloudScraper()
+        if proxy:
+            self.cloudscraper.proxies = proxy if isinstance(proxy, dict) else {"http": proxy, "https": proxy}
+
+        # Convert dict proxy to string for httpx if necessary
+        httpx_proxy = proxy
+        if isinstance(proxy, dict):
+            httpx_proxy = proxy.get("https") or proxy.get("http")
 
         # httpx - lightweight and safe for most HTTP requests
         self.httpx = AsyncClient(
             timeout          = 3,
-            follow_redirects = True
+            follow_redirects = True,
+            proxy            = httpx_proxy
         )
         self.httpx.headers.update(self.cloudscraper.headers)
         self.httpx.cookies.update(self.cloudscraper.cookies)
@@ -122,7 +130,14 @@ class PluginBase(ABC):
         try:
             data = await extractor.extract(url, referer=referer)
 
-            # prefix varsa name'e ekle
+            # Liste ise her bir öğe için prefix ekle
+            if isinstance(data, list):
+                for item in data:
+                    if prefix and item.name:
+                        item.name = f"{prefix} | {item.name}"
+                return data
+
+            # Tekil öğe ise
             if prefix and data.name:
                 data.name = f"{prefix} | {data.name}"
 
@@ -132,7 +147,10 @@ class PluginBase(ABC):
             return None
 
     @staticmethod
-    def clean_title(title: str) -> str:
+    def clean_title(title: str | None) -> str | None:
+        if not title:
+            return None
+
         suffixes = [
             " izle", 
             " full film", 

KekikStream/Core/Plugin/PluginLoader.py

@@ -6,8 +6,9 @@ from pathlib     import Path
 import os, importlib.util, traceback
 
 class PluginLoader:
-    def __init__(self, plugins_dir: str):
+    def __init__(self, plugins_dir: str, proxy: str | dict | None = None):
         # Yerel ve global eklenti dizinlerini ayarla
+        self.proxy = proxy
         self.local_plugins_dir  = Path(plugins_dir).resolve()
         self.global_plugins_dir = Path(__file__).parent.parent.parent / plugins_dir
 
@@ -70,7 +71,7 @@ class PluginLoader:
                 obj = getattr(module, attr)
                 if isinstance(obj, type) and issubclass(obj, PluginBase) and obj is not PluginBase:
                     # konsol.log(f"[yellow]Yüklenen sınıf\t\t: {module_name}.{obj.__name__} ({obj.__module__}.{obj.__name__})[/yellow]")
-                    return obj()
+                    return obj(proxy=self.proxy)
 
         except Exception as hata:
             konsol.print(f"[red][!] Eklenti yüklenirken hata oluştu: {module_name}\nHata: {hata}")

KekikStream/Core/Plugin/PluginManager.py

@@ -4,9 +4,9 @@ from .PluginLoader import PluginLoader
 from .PluginBase   import PluginBase
 
 class PluginManager:
-    def __init__(self, plugin_dir="Plugins"):
+    def __init__(self, plugin_dir="Plugins", proxy: str | dict | None = None):
         # Eklenti yükleyiciyi başlat ve tüm eklentileri yükle
-        self.plugin_loader = PluginLoader(plugin_dir)
+        self.plugin_loader = PluginLoader(plugin_dir, proxy=proxy)
         self.plugins       = self.plugin_loader.load_all()
 
     def get_plugin_names(self):

KekikStream/Core/__init__.py

@@ -17,3 +17,5 @@ from .Extractor.YTDLPCache       import get_ytdlp_extractors
 
 from .Media.MediaManager import MediaManager
 from .Media.MediaHandler import MediaHandler
+
+from .HTMLHelper import HTMLHelper

KekikStream/Extractors/CloseLoad.py

@@ -1,9 +1,8 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle
+from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle, HTMLHelper
 from Kekik.Sifreleme   import Packer, StreamDecoder
-from selectolax.parser import HTMLParser
-import re, json
+import json
 
 class CloseLoadExtractor(ExtractorBase):
     name     = "CloseLoad"
@@ -11,8 +10,8 @@ class CloseLoadExtractor(ExtractorBase):
 
     def _extract_from_json_ld(self, html: str) -> str | None:
         """JSON-LD script tag'inden contentUrl'i çıkar (Kotlin versiyonundaki gibi)"""
-        secici = HTMLParser(html)
-        for script in secici.css("script[type='application/ld+json']"):
+        secici = HTMLHelper(html)
+        for script in secici.select("script[type='application/ld+json']"):
             try:
                 data = json.loads(script.text(strip=True))
                 if content_url := data.get("contentUrl"):
@@ -20,17 +19,17 @@ class CloseLoadExtractor(ExtractorBase):
                         return content_url
             except (json.JSONDecodeError, TypeError):
                 # Regex ile contentUrl'i çıkarmayı dene
-                match = re.search(r'"contentUrl"\s*:\s*"([^"]+)"', script.text())
-                if match and match.group(1).startswith("http"):
-                    return match.group(1)
+                if content_url := secici.regex_first(r'"contentUrl"\s*:\s*"([^\"]+)"', script.text()):
+                    if content_url.startswith("http"):
+                        return content_url
         return None
 
     def _extract_from_packed(self, html: str) -> str | None:
         """Packed JavaScript'ten video URL'sini çıkar (fallback)"""
         try:
-            eval_func = re.compile(r'\s*(eval\(function[\s\S].*)').findall(html)
-            if eval_func:
-                return StreamDecoder.extract_stream_url(Packer.unpack(eval_func[0]))
+            packed = HTMLHelper(html).regex_all(r'\s*(eval\(function[\s\S].*)')
+            if packed:
+                return StreamDecoder.extract_stream_url(Packer.unpack(packed[0]))
         except Exception:
             pass
         return None
@@ -59,8 +58,8 @@ class CloseLoadExtractor(ExtractorBase):
 
         # Subtitle'ları parse et (Kotlin referansı: track elementleri)
         subtitles = []
-        secici = HTMLParser(istek.text)
-        for track in secici.css("track"):
+        secici = HTMLHelper(istek.text)
+        for track in secici.select("track"):
             raw_src = track.attrs.get("src") or ""
             raw_src = raw_src.strip()
             label   = track.attrs.get("label") or track.attrs.get("srclang") or "Altyazı"

KekikStream/Extractors/ContentX.py

@@ -1,7 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
-import re
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle, HTMLHelper
 
 class ContentX(ExtractorBase):
     name     = "ContentX"
@@ -31,15 +30,13 @@ class ContentX(ExtractorBase):
         istek.raise_for_status()
         i_source = istek.text
 
-        i_extract = re.search(r"window\.openPlayer\('([^']+)'", i_source)
-        if not i_extract:
+        i_extract_value = HTMLHelper(i_source).regex_first(r"window\.openPlayer\('([^']+)'")
+        if not i_extract_value:
             raise ValueError("i_extract is null")
-        i_extract_value = i_extract[1]
 
         subtitles = []
         sub_urls  = set()
-        for match in re.finditer(r'"file":"([^"]+)","label":"([^"]+)"', i_source):
-            sub_url, sub_lang = match.groups()
+        for sub_url, sub_lang in HTMLHelper(i_source).regex_all(r'"file":"([^\"]+)","label":"([^\"]+)"'):
 
             if sub_url in sub_urls:
                 continue
@@ -50,8 +47,12 @@ class ContentX(ExtractorBase):
                     name = sub_lang.replace("\\u0131", "ı")
                                  .replace("\\u0130", "İ")
                                  .replace("\\u00fc", "ü")
-                                 .replace("\\u00e7", "ç"),
-                    url  = self.fix_url(sub_url.replace("\\", ""))
+                                 .replace("\\u00e7", "ç")
+                                 .replace("\\u011f", "ğ")
+                                 .replace("\\u015f", "ş")
+                                 .replace("\\u011e", "Ğ")
+                                 .replace("\\u015e", "Ş"),
+                    url  = self.fix_url(sub_url.replace("\\/", "/").replace("\\", ""))
                 )
             )
 
@@ -60,11 +61,11 @@ class ContentX(ExtractorBase):
         vid_source_request.raise_for_status()
 
         vid_source  = vid_source_request.text
-        vid_extract = re.search(r'file":"([^"]+)"', vid_source)
-        if not vid_extract:
+        m3u_link = HTMLHelper(vid_source).regex_first(r'file":"([^\"]+)"')
+        if not m3u_link:
             raise ValueError("vidExtract is null")
 
-        m3u_link = vid_extract[1].replace("\\", "")
+        m3u_link = m3u_link.replace("\\", "").replace("/m.php", "/master.m3u8")
         results  = [
             ExtractResult(
                 name      = self.name,
@@ -74,24 +75,25 @@ class ContentX(ExtractorBase):
             )
         ]
 
-        if i_dublaj := re.search(r',\"([^"]+)\",\"Türkçe"', i_source):
-            dublaj_value          = i_dublaj[1]
-            dublaj_source_request = await self.httpx.get(f"{base_url}/source2.php?v={dublaj_value}", headers={"Referer": referer or base_url})
-            dublaj_source_request.raise_for_status()
-
-            dublaj_source  = dublaj_source_request.text
-            dublaj_extract = re.search(r'file":"([^"]+)"', dublaj_source)
-            if not dublaj_extract:
-                raise ValueError("dublajExtract is null")
-
-            dublaj_link = dublaj_extract[1].replace("\\", "")
-            results.append(
-                ExtractResult(
-                    name      = f"{self.name} Türkçe Dublaj",
-                    url       = dublaj_link,
-                    referer   = url,
-                    subtitles = []
-                )
-            )
+        dublaj_value = HTMLHelper(i_source).regex_first(r'["\']([^"\']+)["\'],["\']Türkçe["\']')
+        if dublaj_value:
+            try:
+                dublaj_source_request = await self.httpx.get(f"{base_url}/source2.php?v={dublaj_value}", headers={"Referer": referer or base_url})
+                dublaj_source_request.raise_for_status()
+
+                dublaj_source  = dublaj_source_request.text
+                dublaj_link = HTMLHelper(dublaj_source).regex_first(r'file":"([^\"]+)"')
+                if dublaj_link:
+                    dublaj_link = dublaj_link.replace("\\", "")
+                    results.append(
+                        ExtractResult(
+                            name      = f"{self.name} Türkçe Dublaj",
+                            url       = dublaj_link,
+                            referer   = url,
+                            subtitles = []
+                        )
+                    )
+            except Exception:
+                pass
 
         return results[0] if len(results) == 1 else results

KekikStream/Extractors/DonilasPlay.py

@@ -1,8 +1,8 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle, HTMLHelper
 from Kekik.Sifreleme   import AESManager
-import re, json
+import json
 
 class DonilasPlay(ExtractorBase):
     name     = "DonilasPlay"
@@ -20,10 +20,10 @@ class DonilasPlay(ExtractorBase):
         subtitles  = []
 
         # bePlayer pattern
-        be_player_match = re.search(r"bePlayer\('([^']+)',\s*'(\{[^}]+\})'\);", i_source)
-        if be_player_match:
-            be_player_pass = be_player_match.group(1)
-            be_player_data = be_player_match.group(2)
+        hp = HTMLHelper(i_source)
+        be_player_matches = hp.regex_all(r"bePlayer\('([^']+)',\s*'(\{[^}]+\})'\);")
+        if be_player_matches:
+            be_player_pass, be_player_data = be_player_matches[0]
 
             try:
                 # AES decrypt
@@ -54,15 +54,15 @@ class DonilasPlay(ExtractorBase):
 
         # Fallback: file pattern
         if not m3u_link:
-            file_match = re.search(r'file:"([^"]+)"', i_source)
+            file_match = hp.regex_first(r'file:"([^"]+)"')
             if file_match:
-                m3u_link = file_match.group(1)
+                m3u_link = file_match
 
             # tracks pattern for subtitles
-            tracks_match = re.search(r'tracks:\[([^\]]+)', i_source)
+            tracks_match = hp.regex_first(r'tracks:\[([^\]]+)')
             if tracks_match:
                 try:
-                    tracks_str = f"[{tracks_match.group(1)}]"
+                    tracks_str = f"[{tracks_match}]"
                     tracks = json.loads(tracks_str)
                     for track in tracks:
                         file_url = track.get("file")

KekikStream/Extractors/DzenRu.py

@@ -1,7 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult
-import re
+from KekikStream.Core import ExtractorBase, ExtractResult, HTMLHelper
 
 class DzenRu(ExtractorBase):
     name     = "DzenRu"
@@ -18,7 +17,8 @@ class DzenRu(ExtractorBase):
         istek.raise_for_status()
 
         # okcdn.ru linklerini bul
-        matches = re.findall(r'https://vd\d+\.okcdn\.ru/\?[^"\'\\\s]+', istek.text)
+        hp = HTMLHelper(istek.text)
+        matches = hp.regex_all(r'https://vd\d+\.okcdn\.ru/\?[^"\'\\\s]+')
 
         if not matches:
             raise ValueError("DzenRu video link not found")

KekikStream/Extractors/ExPlay.py

@@ -1,7 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
-import re
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle, HTMLHelper
 from urllib.parse import urlparse, parse_qs
 
 class ExPlay(ExtractorBase):
@@ -23,21 +22,22 @@ class ExPlay(ExtractorBase):
         istek = await self.httpx.get(clean_url)
         istek.raise_for_status()
 
+        hp = HTMLHelper(istek.text)
+
         # videoUrl çıkar
-        video_url_match = re.search(r'videoUrl":"([^",]+)"', istek.text)
-        if not video_url_match:
+        video_url = hp.regex_first(r'videoUrl":"([^",]+)"')
+        if not video_url:
             raise ValueError("videoUrl not found")
-        video_url = video_url_match[1].replace("\\", "")
+        video_url = video_url.replace("\\", "")
 
         # videoServer çıkar
-        video_server_match = re.search(r'videoServer":"([^",]+)"', istek.text)
-        if not video_server_match:
+        video_server = hp.regex_first(r'videoServer":"([^",]+)"')
+        if not video_server:
             raise ValueError("videoServer not found")
-        video_server = video_server_match[1]
 
         # title çıkar
-        title_match = re.search(r'title":"([^",]+)"', istek.text)
-        title = title_match[1].split(".")[-1] if title_match else "Unknown"
+        title = hp.regex_first(r'title":"([^",]+)"')
+        title = title.split(".")[-1] if title else "Unknown"
         
         if part_key and "turkce" in part_key.lower():
              title = part_key # Or nicer formatting like SetPlay

KekikStream/Extractors/Filemoon.py

@@ -1,9 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import ExtractorBase, ExtractResult
+from KekikStream.Core  import ExtractorBase, ExtractResult, HTMLHelper
 from Kekik.Sifreleme   import Packer
-from selectolax.parser import HTMLParser
-import re
 
 class Filemoon(ExtractorBase):
     name     = "Filemoon"
@@ -22,51 +20,62 @@ class Filemoon(ExtractorBase):
         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",
+        default_headers = {
+            "Referer"         : url,
+            "Sec-Fetch-Dest"  : "iframe",
+            "Sec-Fetch-Mode"  : "navigate",
+            "Sec-Fetch-Site"  : "cross-site",
+            "User-Agent"      : "Mozilla/5.0 (X11; Linux x86_64; rv:137.0) Gecko/20100101 Firefox/137.0"
         }
-        self.httpx.headers.update(headers)
+        self.httpx.headers.update(default_headers)
 
         # İlk sayfayı al
         istek    = await self.httpx.get(url)
         response = istek.text
-        secici   = HTMLParser(response)
+        secici   = HTMLHelper(response)
 
         # Eğer iframe varsa, iframe'e git
-        iframe_el = secici.css_first("iframe")
-        iframe_src = iframe_el.attrs.get("src") if iframe_el else None
-        if iframe_src:
+        iframe_src = secici.select_attr("iframe", "src")
+        
+        m3u8_url = None
+        
+        if not iframe_src:
+            # Fallback: Script içinde ara (Kotlin: selectFirst("script:containsData(function(p,a,c,k,e,d))"))
+            script_data = ""
+            for script in secici.css("script"):
+                if "function(p,a,c,k,e,d)" in script.text():
+                    script_data = script.text()
+                    break
+            
+            if script_data:
+                unpacked = Packer.unpack(script_data)
+                unpacked_sec = HTMLHelper(unpacked)
+                m3u8_url = unpacked_sec.regex_first(r'sources:\[\{file:"(.*?)"')
+        else:
+            # Iframe varsa devam et
             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)
+            iframe_headers = default_headers.copy()
+            iframe_headers["Accept-Language"] = "en-US,en;q=0.5"
+            
+            istek    = await self.httpx.get(iframe_url, headers=iframe_headers)
             response = istek.text
+            secici   = HTMLHelper(response)
+            
+            script_data = ""
+            for script in secici.select("script"):
+                if "function(p,a,c,k,e,d)" in script.text():
+                    script_data = script.text()
+                    break
+            
+            if script_data:
+                unpacked = Packer.unpack(script_data)
+                unpacked_sec = HTMLHelper(unpacked)
+                m3u8_url = unpacked_sec.regex_first(r'sources:\[\{file:"(.*?)"')
 
-        # 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)
+            # Son çare: Normal response içinde ara
+            resp_sec = HTMLHelper(response)
+            m3u8_url = resp_sec.regex_first(r'sources:\s*\[\s*\{\s*file:\s*"([^"]+)"') or resp_sec.regex_first(r'file:\s*"([^\"]*?\.m3u8[^"]*)"')
 
         if not m3u8_url:
             raise ValueError(f"Filemoon: Video URL bulunamadı. {url}")
@@ -75,5 +84,6 @@ class Filemoon(ExtractorBase):
             name      = self.name,
             url       = self.fix_url(m3u8_url),
             referer   = f"{self.main_url}/",
+            user_agent = default_headers["User-Agent"],
             subtitles = []
         )

KekikStream/Extractors/JetTv.py

@@ -1,7 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
-import re, json
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle, HTMLHelper
+import json
 
 class JetTv(ExtractorBase):
     name     = "JetTv"
@@ -31,8 +31,8 @@ class JetTv(ExtractorBase):
 
         # 2. Yöntem: Regex Fallback
         if not master_url:
-             if match := re.search(r"file: '([^']*)'", document, re.IGNORECASE):
-                 master_url = match.group(1)
+             hp = HTMLHelper(document)
+             master_url = hp.regex_first(r"(?i)file: '([^']*)'") or master_url
         
         if not master_url:
             raise ValueError(f"JetTv: Video kaynağı bulunamadı. {url}")