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

KekikStream/Plugins/SetFilmIzle.py

@@ -1,7 +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, HTMLHelper
-import json, asyncio
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult, HTMLHelper
+import asyncio, contextlib
 
 class SetFilmIzle(PluginBase):
     name        = "SetFilmIzle"
@@ -35,7 +35,7 @@ class SetFilmIzle(PluginBase):
 
     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:
+        with contextlib.suppress(Exception):
             resp = self.cloudscraper.post(
                 f"{self.main_url}/wp-admin/admin-ajax.php",
                 headers = {
@@ -49,17 +49,15 @@ class SetFilmIzle(PluginBase):
             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:
+        with contextlib.suppress(Exception):
             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 ""
+
+        return ""
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = self.cloudscraper.get(url)
@@ -76,7 +74,7 @@ class SetFilmIzle(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
@@ -106,8 +104,8 @@ class SetFilmIzle(PluginBase):
             return []
 
         secici  = HTMLHelper(html)
-        results = []
 
+        results = []
         for item in secici.select("div.items article"):
             title  = secici.select_text("h2", item)
             href   = secici.select_attr("a", "href", item)
@@ -117,7 +115,7 @@ class SetFilmIzle(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
@@ -125,95 +123,39 @@ class SetFilmIzle(PluginBase):
     async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         istek  = self.cloudscraper.get(url)
         secici = HTMLHelper(istek.text)
-        html_text = istek.text
-
-        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 = secici.select_attr("div.poster img", "src")
 
+        title       = self.clean_title(secici.select_text("h1") or secici.select_text(".titles h1") or secici.select_attr("meta[property='og:title']", "content"))
+        poster      = secici.select_poster("div.poster img")
         description = secici.select_text("div.wp-content p")
+        rating      = secici.select_text("b#repimdb strong") or secici.regex_first(r"([\d.]+)", secici.select_text("div.imdb"))
+        year        = secici.extract_year("div.extra span.valor")
+        tags        = secici.select_texts("div.sgeneros a")
+        duration    = int(secici.regex_first(r"(\d+)", secici.select_text("span.runtime")) or 0)
+        actors      = secici.select_texts("span.valor a[href*='/oyuncu/']")
+
+        common_info = {
+            "url"         : url,
+            "poster"      : self.fix_url(poster),
+            "title"       : title,
+            "description" : description,
+            "tags"        : tags,
+            "rating"      : rating,
+            "year"        : year,
+            "duration"    : duration,
+            "actors"      : actors
+        }
 
-        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.select("div.sgeneros a") if a.text(strip=True)]
-
-        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 = [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 = 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_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.select("div#info span"):
-                span_text = span.text(strip=True) if span.text() else ""
-                if "Dakika" in span_text:
-                    duration = secici.regex_first(r"\d+", span_text) and int(secici.regex_first(r"\d+", span_text))
-                    break
-
+        if "/dizi/" in url:
             episodes = []
             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
-                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)
+                href = secici.select_attr("h4.episodiotitle a", "href", ep_item)
+                name = secici.select_direct_text("h4.episodiotitle a", ep_item)
+                if href and name:
+                    s, e = secici.extract_season_episode(name)
+                    episodes.append(Episode(season=s or 1, episode=e or 1, title=name, url=self.fix_url(href)))
+            return SeriesInfo(**common_info, episodes=episodes)
 
-                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,
-                    episode = ep_episode,
-                    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,
-                episodes    = episodes
-            )
-
-        return MovieInfo(
-            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
-        )
+        return MovieInfo(**common_info)
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
@@ -231,14 +173,14 @@ class SetFilmIzle(PluginBase):
         semaphore = asyncio.Semaphore(5)
         tasks = []
 
-        async def fetch_and_extract(player):
+        async def fetch_and_extract(player) -> list[ExtractResult]:
             async with semaphore:
                 source_id   = player.attrs.get("data-post-id")
-                player_name = player.attrs.get("data-player-name")
+                player_name = player.attrs.get("data-player-name") or secici.select_text("b", player)
                 part_key    = player.attrs.get("data-part-key")
 
                 if not source_id or "event" in source_id or source_id == "":
-                    return None
+                    return []
 
                 try:
                     resp = self.cloudscraper.post(
@@ -248,17 +190,17 @@ class SetFilmIzle(PluginBase):
                             "action"      : "get_video_url",
                             "nonce"       : nonce,
                             "post_id"     : source_id,
-                            "player_name" : player_name or "",
+                            "player_name" : player.attrs.get("data-player-name") or "",
                             "part_key"    : part_key or ""
                         }
                     )
                     data = resp.json()
                 except:
-                    return None
+                    return []
 
                 iframe_url = data.get("data", {}).get("url")
                 if not iframe_url:
-                    return None
+                    return []
 
                 if "setplay" not in iframe_url and part_key:
                     iframe_url = f"{iframe_url}?partKey={part_key}"
@@ -267,10 +209,40 @@ class SetFilmIzle(PluginBase):
                 if not label and part_key:
                     label = part_key.replace("_", " ").title()
 
-                return await self.extract(iframe_url, prefix=label if label else None)
+                # İsimlendirme Formatı: "FastPlay | Türkçe Dublaj"
+                final_name = player_name
+                if label:
+                    final_name = f"{final_name} | {label}" if final_name else label
+
+                # Extract et
+                extracted = await self.extract(iframe_url)
+                if not extracted:
+                    return []
+
+                results = []
+                items = extracted if isinstance(extracted, list) else [extracted]
+                for item in items:
+                    if final_name:
+                        item.name = final_name
+                    results.append(item)
+
+                return results
 
-        for player in secici.select("nav.player a"):
+        # Selector Güncellemesi: data-player-name içeren tüm a tagleri
+        players = secici.select("a[data-player-name]")
+        if not players:
+            # Fallback legacy selector
+            players = secici.select("nav.player a")
+
+        for player in players:
             tasks.append(fetch_and_extract(player))
 
-        results = await asyncio.gather(*tasks)
-        return [r for r in results if r]
+        results_groups = await asyncio.gather(*tasks)
+
+        # Flatten
+        final_results = []
+        for group in results_groups:
+             if group:
+                 final_results.extend(group)
+
+        return final_results

KekikStream/Plugins/SezonlukDizi.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
-import asyncio
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, HTMLHelper
+import asyncio, contextlib
 
 class SezonlukDizi(PluginBase):
     name        = "SezonlukDizi"
@@ -40,10 +40,10 @@ class SezonlukDizi(PluginBase):
 
     async def _get_asp_data(self) -> dict:
         js_req = await self.httpx.get(f"{self.main_url}/js/site.min.js")
-        js = HTMLHelper(js_req.text)
-        alt = js.regex_first(r"dataAlternatif(.*?)\.asp")
-        emb = js.regex_first(r"dataEmbed(.*?)\.asp")
-        
+        js     = HTMLHelper(js_req.text)
+        alt    = js.regex_first(r"dataAlternatif(.*?)\.asp")
+        emb    = js.regex_first(r"dataEmbed(.*?)\.asp")
+
         return {
             "alternatif": alt or "",
             "embed":      emb or ""
@@ -64,13 +64,13 @@ class SezonlukDizi(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
 
     async def search(self, query: str) -> list[SearchResult]:
-        istek  = await self.httpx.get(f"{self.main_url}/diziler.asp?adi={query}")
+        istek  = await self.httpx.get(f"{self.main_url}/diziler.asp?q={query}")
         secici = HTMLHelper(istek.text)
 
         results = []
@@ -83,7 +83,7 @@ class SezonlukDizi(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
@@ -92,67 +92,40 @@ class SezonlukDizi(PluginBase):
         istek  = await self.httpx.get(url)
         secici = HTMLHelper(istek.text)
 
-        title    = secici.select_text("div.header") or ""
-
-        poster    = secici.select_attr("div.image img", "data-src") or ""
-
-        # year: re_first yerine re.search
-        year_text = secici.select_text("div.extra span") or ""
-        year = secici.regex_first(r"(\d{4})", year_text)
-
-        # xpath normalized-space yerine doğrudan ID ile element bulup text al
-        description = secici.select_text("span#tartismayorum-konu") or ""
-
-        tags = [a.text(strip=True) for a in secici.select("div.labels a[href*='tur']") if a.text(strip=True)]
-
-        # rating: regex ile çıkar
-        rating_text = secici.select_text("div.dizipuani a div") or ""
-        rating = secici.regex_first(r"[\d.,]+", rating_text)
-
-        actors = []
-
-        actors_istek  = await self.httpx.get(f"{self.main_url}/oyuncular/{url.split('/')[-1]}")
-        actors_secici = HTMLHelper(actors_istek.text)
-        for actor in actors_secici.select("div.doubling div.ui"):
-            header_text = actors_secici.select_text("div.header", actor)
-            if header_text:
-                actors.append(header_text)
-
-        episodes_istek  = await self.httpx.get(f"{self.main_url}/bolumler/{url.split('/')[-1]}")
-        episodes_secici = HTMLHelper(episodes_istek.text)
-        episodes        = []
-
-        for sezon in episodes_secici.select("table.unstackable"):
-            for bolum in episodes_secici.select("tbody tr", sezon):
-                # td:nth-of-type selectolax'ta desteklenmiyor, alternatif yol: tüm td'leri alıp indexle
-                tds = episodes_secici.select("td", bolum)
-                if len(tds) < 4:
-                    continue
-
-                # 4. td'den isim ve href
-                ep_name    = episodes_secici.select_text("a", tds[3])
-                ep_href    = episodes_secici.select_attr("a", "href", tds[3])
-
-                # 3. td'den episode (re_first yerine regex)
-                ep_episode_text = episodes_secici.select_text("a", tds[2]) or ""
-                ep_episode = episodes_secici.regex_first(r"(\d+)", ep_episode_text)
-
-                # 2. td'den season (re_first yerine regex)
-                ep_season_text = tds[1].text(strip=True) if tds[1] else ""
-                ep_season = secici.regex_first(r"(\d+)", ep_season_text)
-
-                if ep_name and ep_href:
-                    episode = Episode(
-                        season  = ep_season,
-                        episode = ep_episode,
-                        title   = ep_name,
-                        url     = self.fix_url(ep_href),
-                    )
-                    episodes.append(episode)
+        title       = secici.select_text("div.header") or ""
+        poster      = secici.select_poster("div.image img")
+        year        = secici.extract_year("div.extra span")
+        description = secici.select_text("span#tartismayorum-konu")
+        tags        = secici.select_texts("div.labels a[href*='tur']")
+        rating      = secici.regex_first(r"[\d.,]+", secici.select_text("div.dizipuani a div"))
+
+        # Actors extraction
+        id_slug = url.split('/')[-1]
+        a_resp  = await self.httpx.get(f"{self.main_url}/oyuncular/{id_slug}")
+        a_sel   = HTMLHelper(a_resp.text)
+        actors  = a_sel.select_texts("div.doubling div.ui div.header")
+
+        # Episodes extraction
+        e_resp   = await self.httpx.get(f"{self.main_url}/bolumler/{id_slug}")
+        e_sel    = HTMLHelper(e_resp.text)
+        episodes = []
+        for row in e_sel.select("table.unstackable tbody tr"):
+            tds = e_sel.select("td", row)
+            if len(tds) >= 4:
+                name = e_sel.select_text("a", tds[3])
+                href = e_sel.select_attr("a", "href", tds[3])
+                if name and href:
+                    s, e = e_sel.extract_season_episode(f"{tds[1].text(strip=True)} {tds[2].text(strip=True)}")
+                    episodes.append(Episode(
+                        season  = s or 1,
+                        episode = e or 1,
+                        title   = name,
+                        url     = self.fix_url(href)
+                    ))
 
         return SeriesInfo(
             url         = url,
-            poster      = self.fix_url(poster) if poster else None,
+            poster      = self.fix_url(poster),
             title       = title,
             description = description,
             tags        = tags,
@@ -163,10 +136,10 @@ class SezonlukDizi(PluginBase):
         )
 
     async def load_links(self, url: str) -> list[ExtractResult]:
-        istek  = await self.httpx.get(url)
-        secici = HTMLHelper(istek.text)
+        istek    = await self.httpx.get(url)
+        secici   = HTMLHelper(istek.text)
         asp_data = await self._get_asp_data()
-        
+
         bid = secici.select_attr("div#dilsec", "data-id")
         if not bid:
             return []
@@ -174,41 +147,64 @@ class SezonlukDizi(PluginBase):
         semaphore = asyncio.Semaphore(5)
         tasks = []
 
-        async def fetch_and_extract(veri, dil_etiketi):
+        async def fetch_and_extract(veri, dil_etiketi) -> list[ExtractResult]:
             async with semaphore:
                 try:
                     embed_resp = await self.httpx.post(
-                        f"{self.main_url}/ajax/dataEmbed{asp_data['embed']}.asp",
+                        url     = f"{self.main_url}/ajax/dataEmbed{asp_data['embed']}.asp",
                         headers = {"X-Requested-With": "XMLHttpRequest"},
                         data    = {"id": str(veri.get("id"))}
                     )
                     embed_secici = HTMLHelper(embed_resp.text)
-                    iframe_src = embed_secici.select_attr("iframe", "src")
-                    
-                    if iframe_src:
-                        if "link.asp" in iframe_src:
-                            return None
-                            
-                        iframe_url = self.fix_url(iframe_src)
-                        return await self.extract(iframe_url, referer=f"{self.main_url}/", prefix=f"{dil_etiketi} - {veri.get('baslik')}")
-                except:
-                    pass
-                return None
+                    iframe_src   = embed_secici.select_attr("iframe", "src") or embed_secici.regex_first(r'src="(.*?)"')
+
+                    if not iframe_src:
+                        return []
+
+                    iframe_url = self.fix_url(iframe_src)
+
+                    real_url = iframe_url
+                    if "url=" in iframe_url:
+                        real_url = HTMLHelper(iframe_url).regex_first(r"url=([^&]+)")
+                        if real_url:
+                            real_url = self.fix_url(real_url)
+
+                    source_name = veri.get('baslik') or "SezonlukDizi"
+                    full_name   = f"{dil_etiketi} - {source_name}"
+
+                    extracted = await self.extract(real_url, referer=f"{self.main_url}/")
+
+                    if not extracted:
+                         return []
+
+                    results = []
+                    items   = extracted if isinstance(extracted, list) else [extracted]
+                    for item in items:
+                        item.name = full_name
+                        results.append(item)
+                    return results
+
+                except Exception:
+                    return []
 
         for dil_kodu, dil_etiketi in [("1", "Altyazı"), ("0", "Dublaj")]:
-            altyazi_resp = await self.httpx.post(
-                f"{self.main_url}/ajax/dataAlternatif{asp_data['alternatif']}.asp",
-                headers = {"X-Requested-With": "XMLHttpRequest"},
-                data    = {"bid": bid, "dil": dil_kodu}
-            )
-            
-            try:
+            with contextlib.suppress(Exception):
+                altyazi_resp = await self.httpx.post(
+                    url     = f"{self.main_url}/ajax/dataAlternatif{asp_data['alternatif']}.asp",
+                    headers = {"X-Requested-With": "XMLHttpRequest"},
+                    data    = {"bid": bid, "dil": dil_kodu}
+                )
+
                 data_json = altyazi_resp.json()
                 if data_json.get("status") == "success" and data_json.get("data"):
                     for veri in data_json["data"]:
                         tasks.append(fetch_and_extract(veri, dil_etiketi))
-            except:
-                continue
 
-        results = await asyncio.gather(*tasks)
-        return [r for r in results if r]
+        results_groups = await asyncio.gather(*tasks)
+
+        final_results = []
+        for group in results_groups:
+             if group:
+                 final_results.extend(group)
+
+        return final_results