KekikStream 2.4.6__py3-none-any.whl → 2.4.7__py3-none-any.whl

KekikStream/Core/HTMLHelper.py

@@ -41,14 +41,14 @@ class HTMLHelper:
         val = el.text(strip=True)
         return val or None
 
-    def select_texts(self, selector: str, element: Node | None = None) -> list[str]:
+    def select_texts(self, selector: str, element: Node | None = None) -> list[str] | None:
         """CSS selector ile tüm eşleşen elementlerin text içeriklerini döndür."""
         out: list[str] = []
         for el in self.select(selector, element):
             txt = el.text(strip=True)
             if txt:
                 out.append(txt)
-        return out
+        return out or 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."""

KekikStream/Core/Plugin/PluginBase.py

@@ -106,7 +106,13 @@ class PluginBase(ABC):
         url = f"https:{url}" if url.startswith("//") else urljoin(self.main_url, url)
         return url.replace("\\", "")
 
-    async def extract(self, url: str, referer: str = None, prefix: str | None = None) -> ExtractResult | None:
+    async def extract(
+        self, 
+        url: str, 
+        referer: str = None, 
+        prefix: str | None = None, 
+        name_override: str | None = None
+    ) -> ExtractResult | list[ExtractResult] | None:
         """
         Extractor ile video URL'sini çıkarır.
 
@@ -114,6 +120,7 @@ class PluginBase(ABC):
             url: Iframe veya video URL'si
             referer: Referer header (varsayılan: plugin main_url)
             prefix: İsmin başına eklenecek opsiyonel etiket (örn: "Türkçe Dublaj")
+            name_override: İsmi tamamen değiştirecek opsiyonel etiket (Extractor adını ezer)
 
         Returns:
             ExtractResult: Extractor sonucu (name prefix ile birleştirilmiş) veya None
@@ -131,15 +138,19 @@ class PluginBase(ABC):
         try:
             data = await extractor.extract(url, referer=referer)
 
-            # Liste ise her bir öğe için prefix ekle
+            # Liste ise her bir öğe için prefix/override ekle
             if isinstance(data, list):
                 for item in data:
-                    if prefix and item.name:
+                    if name_override:
+                        item.name = name_override
+                    elif prefix and item.name:
                         item.name = f"{prefix} | {item.name}"
                 return data
 
             # Tekil öğe ise
-            if prefix and data.name:
+            if name_override:
+                data.name = name_override
+            elif prefix and data.name:
                 data.name = f"{prefix} | {data.name}"
 
             return data

KekikStream/Extractors/Odnoklassniki.py

@@ -1,7 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from KekikStream.Core import ExtractorBase, ExtractResult, HTMLHelper
-import json
+import json, html
 
 class Odnoklassniki(ExtractorBase):
     name     = "Odnoklassniki"
@@ -19,12 +19,18 @@ class Odnoklassniki(ExtractorBase):
         resp = await self.httpx.get(url, follow_redirects=True)
         sel  = HTMLHelper(resp.text)
         
-        v_data = sel.regex_first(r'"videos":(\[.*?\])')
+        # Metadata içinden videos array'ini al (esnek regex)
+        v_data = sel.regex_first(r'videos[^:]+:(\[.*?\])')
         if not v_data:
+            if "Видео заблокировано" in resp.text or "copyrightsRestricted" in resp.text:
+                raise ValueError("Odnoklassniki: Video telif nedeniyle silinmiş/erişilemiyor.")
             raise ValueError(f"Odnoklassniki: Video verisi bulunamadı. {url}")
 
         # Kalite sıralaması (En yüksekten düşüğe)
         order = ["ULTRA", "QUAD", "FULL", "HD", "SD", "LOW", "MOBILE"]
+        # Escaped string'i temizle
+        v_data = html.unescape(v_data)
+        v_data = v_data.replace('\\"', '"').replace('\\/', '/')
         videos = json.loads(v_data)
         
         best_url = None
@@ -38,4 +44,10 @@ class Odnoklassniki(ExtractorBase):
         if not best_url:
             raise ValueError("Odnoklassniki: Geçerli video URL'si bulunamadı.")
 
+        # URL temizliği (u0026 -> & ve olası unicode kaçışları)
+        best_url = best_url.replace("u0026", "&").replace("\\u0026", "&")
+        # Eğer hala \uXXXX formatında unicode kaçışları varsa çöz
+        if "\\u" in best_url:
+            best_url = best_url.encode().decode('unicode-escape')
+
         return ExtractResult(name=self.name, url=self.fix_url(best_url), referer=referer)

KekikStream/Extractors/YTDLP.py

@@ -151,8 +151,8 @@ class YTDLP(ExtractorBase):
         ydl_opts = {
             "quiet"                 : True,
             "no_warnings"           : True,
-            "extract_flat"          : False,   # Tam bilgi al
-            "format"                : "best",  # En iyi kalite
+            "extract_flat"          : False,       # Tam bilgi al
+            "format"                : "best/all",  # En iyi kalite, yoksa herhangi biri
             "no_check_certificates" : True,
             "socket_timeout"        : 3,
             "retries"               : 1

KekikStream/Plugins/BelgeselX.py

@@ -36,15 +36,15 @@ class BelgeselX(PluginBase):
         """Türkçe için title case dönüşümü."""
         if not text:
             return ""
-        
-        words = text.split()
+
+        words     = text.split()
         new_words = []
-        
+
         for word in words:
             # Önce Türkçe karakterleri koruyarak küçült
             # İ -> i, I -> ı
             word = word.replace("İ", "i").replace("I", "ı").lower()
-            
+
             # Sonra ilk harfi Türkçe kurallarına göre büyüt
             if word:
                 if word[0] == "i":
@@ -53,9 +53,9 @@ class BelgeselX(PluginBase):
                     word = "I" + word[1:]
                 else:
                     word = word[0].upper() + word[1:]
-            
+
             new_words.append(word)
-            
+
         return " ".join(new_words)
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
@@ -63,21 +63,17 @@ class BelgeselX(PluginBase):
         secici = HTMLHelper(istek.text)
 
         results = []
-        # xpath kullanamıyoruz, en üst seviye gen-movie-contain'leri alıp içlerinden bilgileri çekelim
         for container in secici.select("div.gen-movie-contain"):
-            # Poster için img'i container'ın içinden alalım
             poster = secici.select_attr("div.gen-movie-img img", "src", container)
-
-            # Title ve href için gen-movie-info
-            title = secici.select_text("div.gen-movie-info h3 a", container)
-            href  = secici.select_attr("div.gen-movie-info h3 a", "href", container)
+            title  = secici.select_text("div.gen-movie-info h3 a", container)
+            href   = secici.select_attr("div.gen-movie-info h3 a", "href", container)
 
             if title and href:
                 results.append(MainPageResult(
                     category = category,
                     title    = self._to_title_case(title),
                     url      = self.fix_url(href),
-                    poster   = self.fix_url(poster) if poster else None
+                    poster   = self.fix_url(poster)
                 ))
 
         return results
@@ -117,7 +113,6 @@ class BelgeselX(PluginBase):
             poster  = images[i] if i < len(images) else None
 
             if not url_val or "diziresimleri" not in url_val:
-                # URL'den belgesel linkini oluştur
                 if poster and "diziresimleri" in poster:
                     file_name = poster.rsplit("/", 1)[-1]
                     file_name = HTMLHelper(file_name).regex_replace(r"\.(jpe?g|png|webp)$", "")
@@ -154,6 +149,7 @@ class BelgeselX(PluginBase):
             if not rating:
                 if r_match := secici.regex_first(r"%\s*(\d+)\s*Puan", item):
                     rating = float(r_match) / 10
+        rating = rating or None
 
         episodes = []
         for i, ep in enumerate(secici.select("div.gen-movie-contain")):
@@ -166,12 +162,23 @@ class BelgeselX(PluginBase):
                 final_url = self.fix_url(href)
                 if item_id:
                     final_url = f"{final_url}?id={item_id}"
-                
-                episodes.append(Episode(season=s or 1, episode=e or (i + 1), title=name, url=final_url))
+
+                episodes.append(Episode(
+                    season  = s or 1,
+                    episode = e or (i + 1),
+                    title   = name,
+                    url     = final_url
+                ))
 
         return SeriesInfo(
-            url=url, poster=self.fix_url(poster) if poster else None, title=title or "Bilinmiyor",
-            description=description, tags=tags, year=year, rating=rating, episodes=episodes
+            url         = url,
+            poster      = self.fix_url(poster),
+            title       = title,
+            description = description,
+            tags        = tags,
+            year        = year,
+            rating      = rating,
+            episodes    = episodes
         )
 
     async def load_links(self, url: str) -> list[ExtractResult]:
@@ -198,6 +205,7 @@ class BelgeselX(PluginBase):
 
         for i, video_url in enumerate(files):
             quality = labels[i] if i < len(labels) else "HD"
+            name    = f"{'Google' if 'google' in video_url.lower() or 'blogspot' in video_url.lower() or quality == 'FULL' else self.name} | {'1080p' if quality == 'FULL' else quality}"
 
             # belgeselx.php redirect'ini çöz
             if "belgeselx.php" in video_url or "belgeselx2.php" in video_url:
@@ -210,7 +218,7 @@ class BelgeselX(PluginBase):
 
             links.append(ExtractResult(
                 url     = video_url,
-                name    = f"{'Google' if 'google' in video_url.lower() or 'blogspot' in video_url.lower() or quality == 'FULL' else self.name} | {'1080p' if quality == 'FULL' else quality}",
+                name    = name,
                 referer = main_url
             ))
 

KekikStream/Plugins/DiziBox.py

@@ -1,7 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, HTMLHelper
-from Kekik.Sifreleme   import CryptoJS
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, HTMLHelper
+from Kekik.Sifreleme  import CryptoJS
 import urllib.parse, base64, contextlib, asyncio, time
 
 class DiziBox(PluginBase):
@@ -61,7 +61,7 @@ class DiziBox(PluginBase):
                     category = category,
                     title    = title,
                     url      = self.fix_url(href),
-                    poster   = self.fix_url(poster) if poster else None,
+                    poster   = self.fix_url(poster),
                 ))
 
         return results
@@ -84,7 +84,7 @@ class DiziBox(PluginBase):
                 results.append(SearchResult(
                     title  = title,
                     url    = self.fix_url(href),
-                    poster = self.fix_url(poster) if poster else None,
+                    poster = self.fix_url(poster),
                 ))
 
         return results
@@ -114,12 +114,12 @@ class DiziBox(PluginBase):
 
         return SeriesInfo(
             url         = url,
-            poster      = self.fix_url(poster) if poster else None,
+            poster      = self.fix_url(poster),
             title       = title,
             description = description,
             tags        = tags,
             rating      = rating,
-            year        = str(year) if year else None,
+            year        = year,
             episodes    = episodes,
             actors      = actors,
         )
@@ -182,13 +182,16 @@ class DiziBox(PluginBase):
         istek  = await self.httpx.get(url)
         secici = HTMLHelper(istek.text)
 
+        # Aktif kaynağın adını bul (DBX Pro vs.)
+        current_source_name = secici.select_text("div.video-toolbar option[selected]") or self.name
+
         results = []
         main_iframe = secici.select_attr("div#video-area iframe", "src")
 
         if main_iframe:
             if decoded := await self._iframe_decode(self.name, main_iframe, url):
                 for iframe in decoded:
-                    data = await self.extract(iframe)
+                    data = await self.extract(iframe, name_override=current_source_name)
                     if data:
                         results.append(data)
 
@@ -209,7 +212,7 @@ class DiziBox(PluginBase):
             if alt_iframe:
                 if decoded := await self._iframe_decode(alt_name, alt_iframe, url):
                     for iframe in decoded:
-                        data = await self.extract(iframe, prefix=alt_name)
+                        data = await self.extract(iframe, name_override=alt_name)
                         if data:
                             results.append(data)
 

KekikStream/Plugins/DiziMom.py

@@ -1,8 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult, HTMLHelper
-from json             import dumps, loads
-import re
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, HTMLHelper
 
 class DiziMom(PluginBase):
     name        = "DiziMom"
@@ -31,23 +29,33 @@ class DiziMom(PluginBase):
                 href  = helper.select_attr("div.episode-name a", "href", item)
                 img   = helper.select_poster("div.cat-img img", item)
                 if title and href:
-                    results.append(MainPageResult(category=category, title=title.split(" izle")[0], url=self.fix_url(href), poster=self.fix_url(img)))
+                    results.append(MainPageResult(
+                        category = category,
+                        title    = title.split(" izle")[0],
+                        url      = self.fix_url(href),
+                        poster   = self.fix_url(img)
+                    ))
         else:
             for item in helper.select("div.single-item"):
                 title = helper.select_text("div.categorytitle a", item)
                 href  = helper.select_attr("div.categorytitle a", "href", item)
                 img   = helper.select_poster("div.cat-img img", item)
                 if title and href:
-                    results.append(MainPageResult(category=category, title=title.split(" izle")[0], url=self.fix_url(href), poster=self.fix_url(img)))
+                    results.append(MainPageResult(
+                        category = category,
+                        title    = title.split(" izle")[0],
+                        url      = self.fix_url(href),
+                        poster   = self.fix_url(img)
+                    ))
 
         return results
 
     async def search(self, query: str) -> list[SearchResult]:
-        url = f"{self.main_url}/?s={query}"
-        istek = await self.httpx.get(url)
+        url    = f"{self.main_url}/?s={query}"
+        istek  = await self.httpx.get(url)
         helper = HTMLHelper(istek.text)
-        items = helper.select("div.single-item")
-        
+        items  = helper.select("div.single-item")
+
         return [
             SearchResult(
                 title  = helper.select_text("div.categorytitle a", item).split(" izle")[0],
@@ -78,68 +86,78 @@ class DiziMom(PluginBase):
                 episodes.append(Episode(
                     season  = s or 1,
                     episode = e or 1,
-                    title   = self.clean_title(name.replace(title or "", "").strip()),
+                    title   = self.clean_title(name.replace(title, "").strip()),
                     url     = self.fix_url(href)
                 ))
 
         return SeriesInfo(
             url         = url,
-            poster      = self.fix_url(poster) if poster else None,
-            title       = title or "Bilinmiyor",
+            poster      = self.fix_url(poster),
+            title       = title,
             description = description,
             tags        = tags,
             rating      = rating,
-            year        = str(year) if year else None,
+            year        = year,
             actors      = actors,
             episodes    = episodes
         )
 
     async def load_links(self, url: str) -> list[ExtractResult]:
-        # Login simulation headers
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36",
-            "sec-ch-ua": 'Not/A)Brand";v="8", "Chromium";v="137", "Google Chrome";v="137"',
-            "sec-ch-ua-mobile": "?1",
-            "sec-ch-ua-platform": "Android"
-        }
-        
-        # Simulate login (as seen in Kotlin)
-        login_url = f"{self.main_url}/wp-login.php"
-        login_data = {
-            "log": "keyiflerolsun",
-            "pwd": "12345",
-            "rememberme": "forever",
-            "redirect_to": self.main_url
-        }
-        
-        await self.httpx.post(login_url, headers=headers, data=login_data)
-        
-        istek = await self.httpx.get(url, headers=headers)
+        await self.httpx.post(
+            url     = f"{self.main_url}/wp-login.php",
+            headers = {
+                "User-Agent"         : "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36",
+                "sec-ch-ua"          : 'Not/A)Brand";v="8", "Chromium";v="137", "Google Chrome";v="137"',
+                "sec-ch-ua-mobile"   : "?1",
+                "sec-ch-ua-platform" : "Android"
+            },
+            data    = {
+                "log"         : "keyiflerolsun",
+                "pwd"         : "12345",
+                "rememberme"  : "forever",
+                "redirect_to" : self.main_url
+            }
+        )
+
+        istek  = await self.httpx.get(url)
         helper = HTMLHelper(istek.text)
-        
-        iframes = []
-        
+
+        iframe_data = []
+
+        # Aktif kaynağın (main iframe) adını bul
+        current_name = helper.select_text("div.sources span.current_dil") or ""
         main_iframe = helper.select_attr("iframe[src]", "src")
+
+        # Bazen iframe doğrudan video p içinde olabilir
+        if not main_iframe:
+            main_iframe = helper.select_attr("div.video p iframe", "src")
+
         if main_iframe:
-            iframes.append(main_iframe)
-            
-        sources = helper.select("div.sources a")
+            iframe_data.append((main_iframe, current_name))
+
+        # Diğer kaynakları (Partlar) gez
+        sources = helper.select("div.sources a.post-page-numbers")
         for source in sources:
-            href = source.attrs.get("href")
+            href = helper.select_attr(None, "href", source)
+            name = helper.select_text("span.dil", source)
+
             if href:
-                sub_istek = await self.httpx.get(href, headers=headers)
+                # Part sayfasına git
+                sub_istek  = await self.httpx.get(href)
                 sub_helper = HTMLHelper(sub_istek.text)
-                sub_iframe = sub_helper.select_attr("div.video p iframe", "src")
+                sub_iframe = sub_helper.select_attr("div.video p iframe", "src") or sub_helper.select_attr("iframe[src]", "src")
+
                 if sub_iframe:
-                    iframes.append(sub_iframe)
-                    
+                    iframe_data.append((sub_iframe, name or f"{len(iframe_data)+1}.Kısım"))
+
         results = []
-        for iframe_url in iframes:
-            # Check for known extractors
-            if iframe_url.startswith("//"):
-                iframe_url = f"https:{iframe_url}"
-             
-            extract_result = await self.extract(iframe_url)
+        for iframe_url, source_name in iframe_data:
+            # URL düzeltme
+            iframe_url = self.fix_url(iframe_url)
+
+            # Prefix olarak kaynak adını kullan (1.Kısım | HDMomPlayer)
+            extract_result = await self.extract(iframe_url, prefix=source_name)
+
             if extract_result:
                 if isinstance(extract_result, list):
                     results.extend(extract_result)
@@ -147,9 +165,9 @@ class DiziMom(PluginBase):
                     results.append(extract_result)
             else:
                  results.append(ExtractResult(
-                    url  = iframe_url,
-                    name = f"{self.name} | External",
+                    url     = iframe_url,
+                    name    = f"{source_name} | External",
                     referer = self.main_url
                 ))
-                
+
         return results

KekikStream/Plugins/DiziPal.py

@@ -1,11 +1,11 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, Subtitle, ExtractResult, HTMLHelper
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, Subtitle, ExtractResult, HTMLHelper
 
 class DiziPal(PluginBase):
     name        = "DiziPal"
     language    = "tr"
-    main_url    = "https://dizipal.cc"
+    main_url    = "https://dizipal.uk"
     favicon     = f"https://www.google.com/s2/favicons?domain={main_url}&sz=64"
     description = "dizipal güncel, dizipal yeni ve gerçek adresi. dizipal en yeni dizi ve filmleri güvenli ve hızlı şekilde sunar."
 
@@ -46,7 +46,7 @@ class DiziPal(PluginBase):
                     category = category,
                     title    = title,
                     url      = self.fix_url(href),
-                    poster   = self.fix_url(poster) if poster else None,
+                    poster   = self.fix_url(poster),
                 ))
 
         return results
@@ -65,7 +65,7 @@ class DiziPal(PluginBase):
                 results.append(SearchResult(
                     title  = title,
                     url    = self.fix_url(href),
-                    poster = self.fix_url(poster) if poster else None,
+                    poster = self.fix_url(poster),
                 ))
 
         return results
@@ -82,8 +82,8 @@ class DiziPal(PluginBase):
         rating       = secici.meta_value("IMDB Puanı")
         duration_raw = secici.meta_value("Süre")
         if duration_raw:
-            parts = duration_raw.split()
-            saat = 0
+            parts  = duration_raw.split()
+            saat   = 0
             dakika = 0
 
             for p in parts:
@@ -95,7 +95,7 @@ class DiziPal(PluginBase):
             duration = saat * 60 + dakika
         else:
             duration = None
-    
+
         tags   = secici.meta_list("Tür")
         actors = secici.meta_list("Oyuncular")
         if not actors:
@@ -104,36 +104,50 @@ class DiziPal(PluginBase):
         if "/dizi/" in url:
             episodes = []
             for ep in secici.select("div.episode-item"):
-                name = secici.select_text("h4 a", ep)
-                href = secici.select_attr("a", "href", ep)
+                name       = secici.select_text("h4 a", ep)
+                href       = secici.select_attr("a", "href", ep)
                 link_title = secici.select_attr("a", "title", ep)
-                
+
                 h4_texts = secici.select_texts("h4", ep)
-                text = h4_texts[1] if len(h4_texts) > 1 else (h4_texts[0] if h4_texts else "")
+                text     = h4_texts[1] if len(h4_texts) > 1 else (h4_texts[0] if h4_texts else "")
 
                 full_text = f"{text} {link_title}" if link_title else text
 
                 if name and href:
                     s, e = secici.extract_season_episode(full_text or "")
-                    episodes.append(Episode(season=s, episode=e, title=name, url=self.fix_url(href)))
+                    episodes.append(Episode(
+                        season  = s,
+                        episode = e,
+                        title   = name,
+                        url     = self.fix_url(href)
+                    ))
 
             return SeriesInfo(
-                url=url, poster=poster.replace("https://test4test.online", self.main_url), title=title, description=description, tags=tags,
-                rating=rating, year=year, duration=duration, episodes=episodes or None, actors=actors
+                url         = url,
+                poster      = poster.replace("https://test4test.online", self.main_url),
+                title       = title,
+                description = description,
+                tags        = tags,
+                rating      = rating,
+                year        = year,
+                duration    = duration,
+                episodes    = episodes or None,
+                actors      = actors
             )
-        
+
         return MovieInfo(
-            url=url, poster=poster.replace("https://test4test.online", self.main_url), title=title, description=description, tags=tags,
-            rating=rating, year=year, duration=duration, actors=actors
+            url         = url,
+            poster      = poster.replace("https://test4test.online", self.main_url),
+            title       = title,
+            description = description,
+            tags        = tags,
+            rating      = rating,
+            year        = year,
+            duration    = duration,
+            actors      = actors
         )
 
     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"
-        })
-        self.httpx.headers.pop("X-Requested-With", None)
-
         istek  = await self.httpx.get(url)
         secici = HTMLHelper(istek.text)