KekikStream 2.3.2__py3-none-any.whl → 2.3.4__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

@@ -132,7 +132,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/__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
@@ -60,11 +57,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("\\", "")
         results  = [
             ExtractResult(
                 name      = self.name,
@@ -74,17 +71,17 @@ class ContentX(ExtractorBase):
             )
         ]
 
-        if i_dublaj := re.search(r',\"([^"]+)\",\"Türkçe"', i_source):
-            dublaj_value          = i_dublaj[1]
+        dublaj_value = HTMLHelper(i_source).regex_first(r',\"([^\"]+)\",\"Türkçe\"')
+        if dublaj_value:
             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:
+            dublaj_link = HTMLHelper(dublaj_source).regex_first(r'file":"([^\"]+)"')
+            if not dublaj_link:
                 raise ValueError("dublajExtract is null")
 
-            dublaj_link = dublaj_extract[1].replace("\\", "")
+            dublaj_link = dublaj_link.replace("\\", "")
             results.append(
                 ExtractResult(
                     name      = f"{self.name} Türkçe Dublaj",

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"
@@ -34,11 +32,10 @@ class Filemoon(ExtractorBase):
         # İ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
+        iframe_src = secici.select_attr("iframe", "src")
         
         m3u8_url = None
         
@@ -52,8 +49,8 @@ class Filemoon(ExtractorBase):
             
             if script_data:
                 unpacked = Packer.unpack(script_data)
-                if match := re.search(r'sources:\[\{file:"(.*?)"', unpacked):
-                    m3u8_url = match.group(1)
+                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)
@@ -62,25 +59,23 @@ class Filemoon(ExtractorBase):
             
             istek    = await self.httpx.get(iframe_url, headers=iframe_headers)
             response = istek.text
-            secici   = HTMLParser(response)
+            secici   = HTMLHelper(response)
             
             script_data = ""
-            for script in secici.css("script"):
+            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)
-                if match := re.search(r'sources:\[\{file:"(.*?)"', unpacked):
-                    m3u8_url = match.group(1)
+                unpacked_sec = HTMLHelper(unpacked)
+                m3u8_url = unpacked_sec.regex_first(r'sources:\[\{file:"(.*?)"')
 
         if not m3u8_url:
             # Son çare: Normal response içinde ara
-            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)
+            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}")

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}")

KekikStream/Extractors/MixPlayHD.py

@@ -1,8 +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, HTMLHelper
 from Kekik.Sifreleme import AESManager
-import re, json
+import json
 
 class MixPlayHD(ExtractorBase):
     name     = "MixPlayHD"
@@ -15,12 +15,12 @@ class MixPlayHD(ExtractorBase):
         istek = await self.httpx.get(url)
         istek.raise_for_status()
 
-        be_player_match = re.search(r"bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);", istek.text)
-        if not be_player_match:
+        hp = HTMLHelper(istek.text)
+        be_player_matches = hp.regex_all(r"bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);")
+        if not be_player_matches:
             raise ValueError("bePlayer not found in the response.")
 
-        be_player_pass = be_player_match[1]
-        be_player_data = be_player_match[2]
+        be_player_pass, be_player_data = be_player_matches[0]
 
         try:
             decrypted_data = AESManager.decrypt(be_player_data, be_player_pass).replace("\\", "")
@@ -28,13 +28,12 @@ class MixPlayHD(ExtractorBase):
         except Exception as hata:
             raise RuntimeError(f"Decryption failed: {hata}") from hata
 
-        if video_url_match := re.search(
-            pattern = r'"video_location":"([^"]+)"',
-            string  = decrypted_json.get("schedule", {}).get("client", ""),
-        ):
+        client_str = decrypted_json.get("schedule", {}).get("client", "")
+        video_url = HTMLHelper(client_str).regex_first(r'"video_location":"([^"]+)"')
+        if video_url:
             return ExtractResult(
                 name      = self.name,
-                url       = video_url_match[1],
+                url       = video_url,
                 referer   = self.main_url,
                 subtitles = []
             )

KekikStream/Extractors/MolyStream.py

@@ -1,7 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle
-from selectolax.parser import HTMLParser
+from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle, HTMLHelper
 import re
 
 class MolyStream(ExtractorBase):
@@ -10,16 +9,13 @@ class MolyStream(ExtractorBase):
 
     async def extract(self, url, referer=None) -> ExtractResult:
         if "doctype html" in url:
-            secici   = HTMLParser(url)
-            video_el = secici.css_first("video#sheplayer source")
-            video    = video_el.attrs.get("src") if video_el else None
+            secici   = HTMLHelper(url)
+            video    = secici.select_attr("video#sheplayer source", "src")
         else:
             video = url
 
-        matches = re.findall(
-            pattern = r"addSrtFile\(['\"]([^'\"]+\.srt)['\"]\s*,\s*['\"][a-z]{2}['\"]\s*,\s*['\"]([^'\"]+)['\"]",
-            string  = url
-        )
+        resp_sec = HTMLHelper(url)
+        matches = resp_sec.regex_all(r"addSrtFile\(['\"]([^'\"]+\.srt)['\"]\s*,\s*['\"][a-z]{2}['\"]\s*,\s*['\"]([^'\"]+)['\"]")
 
         subtitles = [
             Subtitle(name = name, url = self.fix_url(url))

KekikStream/Extractors/Odnoklassniki.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, HTMLHelper
 import re, json
 
 class Odnoklassniki(ExtractorBase):
@@ -45,12 +45,12 @@ class Odnoklassniki(ExtractorBase):
             response_text
         )
 
-        videos_match = re.search(r'"videos":(\[.*?\])', response_text)
-        if not videos_match:
+        videos_json = HTMLHelper(response_text).regex_first(r'"videos":(\[.*?\])')
+        if not videos_json:
             raise ValueError("No video data found in the response.")
 
         try:
-            videos = json.loads(videos_match[1])
+            videos = json.loads(videos_json)
         except json.JSONDecodeError as hata:
             raise ValueError("Failed to parse video data.") from hata
 

KekikStream/Extractors/PeaceMakerst.py

@@ -1,7 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult
-import re, json
+from KekikStream.Core import ExtractorBase, ExtractResult, HTMLHelper
+import json
 
 class PeaceMakerst(ExtractorBase):
     name     = "PeaceMakerst"
@@ -36,7 +36,7 @@ class PeaceMakerst(ExtractorBase):
         m3u_link      = None
 
         if "teve2.com.tr\\/embed\\/" in response_text:
-            teve2_id = re.search(r"teve2\.com\.tr\\\/embed\\\/(\d+)", response_text)[1]
+            teve2_id = HTMLHelper(response_text).regex_first(r"teve2\.com\.tr\\\/embed\\\/(\d+)")
             teve2_url = f"https://www.teve2.com.tr/action/media/{teve2_id}"
 
             teve2_response = await self.httpx.get(teve2_url, headers={"Referer": f"https://www.teve2.com.tr/embed/{teve2_id}"})

KekikStream/Extractors/PixelDrain.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 PixelDrain(ExtractorBase):
     name     = "PixelDrain"
@@ -11,11 +10,13 @@ class PixelDrain(ExtractorBase):
         if referer:
             self.httpx.headers.update({"Referer": referer})
 
-        pixel_id_match = re.search(r"/u/([^/?]+)|([^\/]+)(?=\?download)", url)
-        if not pixel_id_match:
+        hp = HTMLHelper(url)
+        matches = hp.regex_all(r"/u/([^/?]+)|([^\/]+)(?=\?download)")
+        if not matches:
             raise ValueError("PixelDrain bağlantısından ID çıkarılamadı.")
 
-        pixel_id      = pixel_id_match[1]
+        m = matches[0]
+        pixel_id = next((g for g in m if g), None)
         download_link = f"{self.main_url}/api/file/{pixel_id}?download"
         referer_link  = f"{self.main_url}/u/{pixel_id}?download"