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

KekikStream/Plugins/SelcukFlix.py

@@ -1,8 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult
-from selectolax.parser import HTMLParser
-import re, base64, json, urllib.parse
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult, HTMLHelper
+import base64, json, urllib.parse
 
 class SelcukFlix(PluginBase):
     name        = "SelcukFlix"
@@ -34,17 +33,13 @@ class SelcukFlix(PluginBase):
         if "tum-bolumler" in url:
             try:
                 resp = await self.httpx.get(url)
-                sel  = HTMLParser(resp.text)
+                sel  = HTMLHelper(resp.text)
 
-                for item in sel.css("div.col-span-3 a"):
-                    name_el   = item.css_first("h2")
-                    ep_el     = item.css_first("div.opacity-80")
-                    img_el    = item.css_first("div.image img")
-
-                    name    = name_el.text(strip=True) if name_el else None
-                    ep_info = ep_el.text(strip=True) if ep_el else None
-                    href    = item.attrs.get("href")
-                    poster  = img_el.attrs.get("src") if img_el else None
+                for item in sel.select("div.col-span-3 a"):
+                    name    = sel.select_text("h2", item)
+                    ep_info = sel.select_text("div.opacity-80", item)
+                    href    = sel.select_attr("a", "href", item)
+                    poster  = sel.select_attr("div.image img", "src", item)
 
                     if name and href:
                         title     = f"{name} - {ep_info}" if ep_info else name
@@ -188,91 +183,106 @@ class SelcukFlix(PluginBase):
 
     async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         resp = await self.httpx.get(url)
-        sel  = HTMLParser(resp.text)
+        sel  = HTMLHelper(resp.text)
+        
+        next_data_text = sel.select_text("script#__NEXT_DATA__")
+        if not next_data_text:
+            return SeriesInfo(url=url, title=sel.select_text("h1") or "Bilinmeyen")
 
-        next_data_el = sel.css_first("script#__NEXT_DATA__")
-        if not next_data_el:
-             return None
+        try:
+            next_data = json.loads(next_data_text)
+            secure_data_raw = next_data["props"]["pageProps"].get("secureData")
+            if not secure_data_raw:
+                 return SeriesInfo(url=url, title=sel.select_text("h1") or "Bilinmeyen")
+            
+            # Clean possible quotes from string before decoding
+            if isinstance(secure_data_raw, str):
+                secure_data_raw = secure_data_raw.strip('"')
 
-        next_data = next_data_el.text(strip=True)
-        if not next_data: 
-             return None
+            decoded_str = base64.b64decode(secure_data_raw).decode('utf-8')
+            content_details = json.loads(decoded_str)
+            
+            # Sometimes content_details might be a string (double encoded)
+            if isinstance(content_details, str):
+                content_details = json.loads(content_details)
 
-        data         = json.loads(next_data)
-        secure_data  = data["props"]["pageProps"]["secureData"]
-        raw_data     = base64.b64decode(secure_data.replace('"', ''))
-        try:
-            decoded_str = raw_data.decode('utf-8')
-        except UnicodeDecodeError:
-            decoded_str = raw_data.decode('iso-8859-1')
-
-        content_details = json.loads(decoded_str)
-        item            = content_details.get("contentItem", {})
-
-        title           = item.get("original_title") or item.get("originalTitle") or ""
-        poster          = self.clean_image_url(item.get("poster_url") or item.get("posterUrl"))
-        description     = item.get("description") or item.get("used_description")
-        rating          = str(item.get("imdb_point") or item.get("imdbPoint", ""))
-        year            = item.get("release_year") or item.get("releaseYear")
-        duration        = item.get("total_minutes") or item.get("totalMinutes")
-
-        series_data     = content_details.get("relatedData", {}).get("seriesData")
-        if not series_data and "RelatedResults" in content_details:
-             series_data = content_details["RelatedResults"].get("getSerieSeasonAndEpisodes", {}).get("result")
-             if series_data and isinstance(series_data, list):
-                  pass
-
-        # Dizi mi film mi kontrol et (Kotlin referansı)
-        if series_data:
-            episodes = []
-            seasons_list = []
-            if isinstance(series_data, dict):
-                seasons_list = series_data.get("seasons", [])
-            elif isinstance(series_data, list):
-                seasons_list = series_data
-
-            for season in seasons_list:
-                if not isinstance(season, dict): continue
-                s_no = season.get("season_no") or season.get("seasonNo")
-                ep_list = season.get("episodes", [])
-                for ep in ep_list:
-                    episodes.append(Episode(
-                        season  = s_no,
-                        episode = ep.get("episode_no") or ep.get("episodeNo"),
-                        title   = ep.get("ep_text") or ep.get("epText"),
-                        url     = self.fix_url(ep.get("used_slug") or ep.get("usedSlug"))
-                    ))
+            print(f"DEBUG: type(content_details)={type(content_details)}")
+            item            = content_details.get("contentItem", {})
+            print(f"DEBUG: type(item)={type(item)}")
+            related_results = content_details.get("RelatedResults", {})
+
+            title           = item.get("original_title") or item.get("culture_title") or item.get("originalTitle") or ""
+            poster          = self.clean_image_url(item.get("poster_url") or item.get("posterUrl") or item.get("face_url"))
+            description     = item.get("description") or item.get("used_description")
+            rating          = str(item.get("imdb_point") or item.get("imdbPoint") or "")
+            year            = str(item.get("release_year") or item.get("releaseYear") or "")
+            duration        = item.get("total_minutes") or item.get("totalMinutes")
+
+            tags = []
+            tags_raw = item.get("category_names") or item.get("categoryNames") or item.get("categories")
+            if isinstance(tags_raw, str):
+                tags = [t.strip() for t in tags_raw.split(",")]
+            elif isinstance(tags_raw, list):
+                tags = [c.get("title") if isinstance(c, dict) else str(c) for c in tags_raw]
+
+            actors = []
+            actors_raw = item.get("actor_names") or item.get("actorNames")
+            if isinstance(actors_raw, str):
+                actors = [a.strip() for a in actors_raw.split(",")]
             
-            return SeriesInfo(
-                title       = title,
-                url         = url,
-                poster      = poster,
-                description = description,
-                rating      = rating,
-                year        = year,
-                episodes    = episodes
-            )
-        else:
-            # Film ise MovieInfo döndür
-            return MovieInfo(
-                title       = title,
-                url         = url,
-                poster      = poster,
-                description = description,
-                rating      = rating,
-                year        = year,
-                duration    = duration
-            )
+            # Casts from RelatedResults
+            casts_data = related_results.get("getSerieCastsById") or related_results.get("getMovieCastsById")
+            if casts_data and isinstance(casts_data, dict) and casts_data.get("result"):
+                actors = [cast.get("name") for cast in casts_data["result"] if cast.get("name")]
+
+            series_data = related_results.get("getSerieSeasonAndEpisodes")
+            if series_data and isinstance(series_data, dict) and series_data.get("result"):
+                episodes = []
+                for season in series_data["result"]:
+                    s_no = season.get("season_no") or season.get("seasonNo") or 1
+                    for ep in season.get("episodes", []):
+                        ep_slug = ep.get("used_slug") or ep.get("usedSlug")
+                        if ep_slug:
+                            episodes.append(Episode(
+                                season  = s_no,
+                                episode = ep.get("episode_no") or ep.get("episodeNo") or 1,
+                                title   = ep.get("ep_text") or ep.get("epText") or "",
+                                url     = self.fix_url(ep_slug)
+                            ))
+                
+                return SeriesInfo(
+                    url         = url,
+                    poster      = poster,
+                    title       = self.clean_title(title),
+                    description = description,
+                    tags        = tags,
+                    rating      = rating,
+                    year        = year,
+                    actors      = actors,
+                    duration    = duration,
+                    episodes    = episodes
+                )
+            else:
+                return MovieInfo(
+                    url         = url,
+                    poster      = poster,
+                    title       = self.clean_title(title),
+                    description = description,
+                    tags        = tags,
+                    rating      = rating,
+                    year        = year,
+                    actors      = actors,
+                    duration    = duration
+                )
+
+        except Exception:
+            return SeriesInfo(url=url, title=self.clean_title(sel.select_text("h1")) or "Bilinmeyen")
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         resp = await self.httpx.get(url)
-        sel  = HTMLParser(resp.text)
+        sel  = HTMLHelper(resp.text)
         
-        next_data_el = sel.css_first("script#__NEXT_DATA__")
-        if not next_data_el:
-            return []
-
-        next_data = next_data_el.text(strip=True)
+        next_data = sel.select_text("script#__NEXT_DATA__")
         if not next_data:
             return []
 
@@ -312,9 +322,8 @@ class SelcukFlix(PluginBase):
                                 source_content = res[0].get("source_content") or res[0].get("sourceContent")
 
             if source_content:
-                iframe_sel = HTMLParser(source_content)
-                iframe_el = iframe_sel.css_first("iframe")
-                iframe_src = iframe_el.attrs.get("src") if iframe_el else None
+                iframe_sel = HTMLHelper(source_content)
+                iframe_src = iframe_sel.select_attr("iframe", "src")
                 if iframe_src:
                     iframe_src = self.fix_url(iframe_src)
                     # Hotlinger domain değişimi (Kotlin referansı)

KekikStream/Plugins/SetFilmIzle.py

@@ -1,8 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult
-from selectolax.parser import HTMLParser
-import re, json, asyncio
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult, HTMLHelper
+import json, asyncio
 
 class SetFilmIzle(PluginBase):
     name        = "SetFilmIzle"
@@ -34,8 +33,8 @@ class SetFilmIzle(PluginBase):
         f"{main_url}/tur/western/"     : "Western"
     }
 
-    def _get_nonce(self, nonce_type: str = "video_nonce", referer: str = None) -> str:
-        """Site cache'lenmiş nonce'ları expire olabiliyor, fresh nonce al"""
+    def _get_nonce(self, nonce_type: str = "video", referer: str = None) -> str:
+        """Site cache'lenmiş nonce'ları expire olabiliyor, fresh nonce al veya sayfadan çek"""
         try:
             resp = self.cloudscraper.post(
                 f"{self.main_url}/wp-admin/admin-ajax.php",
@@ -46,24 +45,31 @@ class SetFilmIzle(PluginBase):
                 },
                 data = "action=st_cache_refresh_nonces"
             )
-            nonces = resp.json().get("data", {}).get("nonces", {})
-            return nonces.get(nonce_type, "")
+            data = resp.json()
+            if data and data.get("success"):
+                nonces = data.get("data", {}).get("nonces", {})
+                return nonces.get(nonce_type if nonce_type != "search" else "dt_ajax_search", "")
+        except:
+            pass
+
+        # AJAX başarısızsa sayfadan çekmeyi dene
+        try:
+            main_resp = self.cloudscraper.get(referer or self.main_url)
+            # STMOVIE_AJAX = { ... nonces: { search: "...", ... } }
+            nonce = HTMLHelper(main_resp.text).regex_first(rf'"{nonce_type}":\s*"([^"]+)"')
+            return nonce or ""
         except:
             return ""
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = self.cloudscraper.get(url)
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
         results = []
-        for item in secici.css("div.items article"):
-            title_el = item.css_first("h2")
-            link_el  = item.css_first("a")
-            img_el   = item.css_first("img")
-
-            title  = title_el.text(strip=True) if title_el else None
-            href   = link_el.attrs.get("href") if link_el else None
-            poster = img_el.attrs.get("data-src") if img_el else None
+        for item in secici.select("div.items article"):
+            title  = secici.select_text("h2", item)
+            href   = secici.select_attr("a", "href", item)
+            poster = secici.select_attr("img", "data-src", item)
 
             if title and href:
                 results.append(MainPageResult(
@@ -99,17 +105,13 @@ class SetFilmIzle(PluginBase):
         except:
             return []
 
-        secici  = HTMLParser(html)
+        secici  = HTMLHelper(html)
         results = []
 
-        for item in secici.css("div.items article"):
-            title_el = item.css_first("h2")
-            link_el  = item.css_first("a")
-            img_el   = item.css_first("img")
-
-            title  = title_el.text(strip=True) if title_el else None
-            href   = link_el.attrs.get("href") if link_el else None
-            poster = img_el.attrs.get("data-src") if img_el else None
+        for item in secici.select("div.items article"):
+            title  = secici.select_text("h2", item)
+            href   = secici.select_attr("a", "href", item)
+            poster = secici.select_attr("img", "data-src", item)
 
             if title and href:
                 results.append(SearchResult(
@@ -121,79 +123,66 @@ class SetFilmIzle(PluginBase):
         return results
 
     async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
-        istek  = await self.httpx.get(url)
-        secici = HTMLParser(istek.text)
+        istek  = self.cloudscraper.get(url)
+        secici = HTMLHelper(istek.text)
         html_text = istek.text
 
-        title_el = secici.css_first("h1") or secici.css_first(".titles h1")
-        raw_title = title_el.text(strip=True) if title_el else ""
-        if not raw_title:
-             # Alternatif title yeri
-             title_meta = secici.css_first("meta[property='og:title']")
-             raw_title = title_meta.attrs.get("content", "") if title_meta else ""
-        
-        title = re.sub(r"\s*izle.*$", "", raw_title, flags=re.IGNORECASE).strip()
+        raw_title = secici.select_text("h1") or secici.select_text(".titles h1") or secici.select_attr("meta[property='og:title']", "content") or ""
+        title = HTMLHelper(raw_title).regex_replace(r"(?i)\s*izle.*$", "", flags=0).strip()
 
-        poster_el = secici.css_first("div.poster img")
-        poster    = poster_el.attrs.get("src") if poster_el else None
+        poster = secici.select_attr("div.poster img", "src")
 
-        desc_el     = secici.css_first("div.wp-content p")
-        description = desc_el.text(strip=True) if desc_el else None
+        description = secici.select_text("div.wp-content p")
 
-        year_el = secici.css_first("div.extra span.C a")
-        year = None
-        if year_el:
-            year_text = year_el.text(strip=True)
-            year_match = re.search(r"\d{4}", year_text)
-            year = year_match.group() if year_match else None
+        rating = secici.select_text("b#repimdb strong") or secici.regex_first(r'repimdb"><strong>\s*([^<]+)</strong>', html_text)
+        
+        # Yıl için info bölümünden veya regex ile yakala
+        year = secici.regex_first(r'(\d{4})', secici.select_text("div.extra span.valor") or secici.select_text("span.valor") or "")
+        if not year:
+            year = secici.regex_first(r'<span>(\d{4})</span>', html_text) or secici.regex_first(r'(\d{4})', html_text)
 
-        tags = [a.text(strip=True) for a in secici.css("div.sgeneros a") if a.text(strip=True)]
+        tags = [a.text(strip=True) for a in secici.select("div.sgeneros a") if a.text(strip=True)]
 
-        duration_el = secici.css_first("span.runtime")
-        duration = None
-        if duration_el:
-            duration_text = duration_el.text(strip=True)
-            dur_match = re.search(r"\d+", duration_text)
-            duration = int(dur_match.group()) if dur_match else None
+        duration_text = secici.select_text("span.runtime")
+        duration = int(secici.regex_first(r"\d+", duration_text)) if duration_text and secici.regex_first(r"\d+", duration_text) else None
 
-        actors = [span.text(strip=True) for span in secici.css("span.valor a > span") if span.text(strip=True)]
+        actors = [a.text(strip=True) for a in secici.select("span.valor a") if "/oyuncu/" in (a.attrs.get("href") or "")]
+        if not actors:
+             actors = secici.regex_all(r'href="[^"]*/oyuncu/[^"]*">([^<]+)</a>')
 
-        trailer_match = re.search(r'embed/([^?]*)\?rel', html_text)
-        trailer = f"https://www.youtube.com/embed/{trailer_match.group(1)}" if trailer_match else None
+        trailer = None
+        if trailer_id := secici.regex_first(r'embed/([^?]*)\?rel', html_text):
+            trailer = f"https://www.youtube.com/embed/{trailer_id}"
 
         # Dizi mi film mi kontrol et
         is_series = "/dizi/" in url
 
         if is_series:
-            year_link_el = secici.css_first("a[href*='/yil/']")
-            if year_link_el:
-                year_elem = year_link_el.text(strip=True)
-                year_match = re.search(r"\d{4}", year_elem)
-                year = year_match.group() if year_match else year
+            year_elem = secici.select_text("a[href*='/yil/']")
+            if year_elem:
+                year = secici.regex_first(r"\d{4}", year_elem) or year
 
             # Duration from info section
-            for span in secici.css("div#info span"):
+            for span in secici.select("div#info span"):
                 span_text = span.text(strip=True) if span.text() else ""
                 if "Dakika" in span_text:
-                    dur_match = re.search(r"\d+", span_text)
-                    duration = int(dur_match.group()) if dur_match else duration
+                    duration = secici.regex_first(r"\d+", span_text) and int(secici.regex_first(r"\d+", span_text))
                     break
 
             episodes = []
-            for ep_item in secici.css("div#episodes ul.episodios li"):
-                ep_title_el = ep_item.css_first("h4.episodiotitle a")
-                ep_href = ep_title_el.attrs.get("href") if ep_title_el else None
-                ep_name = ep_title_el.text(strip=True) if ep_title_el else None
+            for ep_item in secici.select("div#episodes ul.episodios li"):
+                ep_href = secici.select_attr("h4.episodiotitle a", "href", ep_item)
+                ep_name = secici.select_text("h4.episodiotitle a", ep_item)
 
                 if not ep_href or not ep_name:
                     continue
 
                 ep_detail = ep_name
-                season_match = re.search(r"(\d+)\.\s*Sezon", ep_detail)
-                episode_match = re.search(r"Sezon\s+(\d+)\.\s*Bölüm", ep_detail)
+                ep_season = secici.regex_first(r"(\d+)\.\s*Sezon", ep_detail) or 1
+                ep_episode = secici.regex_first(r"Sezon\s+(\d+)\.\s*Bölüm", ep_detail)
 
-                ep_season = int(season_match.group(1)) if season_match else 1
-                ep_episode = int(episode_match.group(1)) if episode_match else None
+                ep_season = int(ep_season) if isinstance(ep_season, str) and ep_season.isdigit() else 1
+                ep_episode = int(ep_episode) if isinstance(ep_episode, str) and ep_episode.isdigit() else None
 
                 episodes.append(Episode(
                     season  = ep_season,
@@ -201,13 +190,13 @@ class SetFilmIzle(PluginBase):
                     title   = ep_name,
                     url     = self.fix_url(ep_href)
                 ))
-
             return SeriesInfo(
                 url         = url,
                 poster      = self.fix_url(poster) if poster else None,
                 title       = title,
                 description = description,
                 tags        = tags,
+                rating      = rating,
                 year        = year,
                 duration    = duration,
                 actors      = actors,
@@ -220,6 +209,7 @@ class SetFilmIzle(PluginBase):
             title       = title,
             description = description,
             tags        = tags,
+            rating      = rating,
             year        = year,
             duration    = duration,
             actors      = actors
@@ -227,9 +217,9 @@ class SetFilmIzle(PluginBase):
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
-        nonce = secici.css_first("div#playex").attrs.get("data-nonce") if secici.css_first("div#playex") else ""
+        nonce = secici.select_attr("div#playex", "data-nonce") or ""
 
         # partKey to dil label mapping
         part_key_labels = {
@@ -279,7 +269,7 @@ class SetFilmIzle(PluginBase):
 
                 return await self.extract(iframe_url, prefix=label if label else None)
 
-        for player in secici.css("nav.player a"):
+        for player in secici.select("nav.player a"):
             tasks.append(fetch_and_extract(player))
 
         results = await asyncio.gather(*tasks)