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

KekikStream/Plugins/RecTV.py

@@ -2,6 +2,7 @@
 
 from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, Episode, SeriesInfo, ExtractResult, HTMLHelper
 from json             import dumps, loads
+import re, contextlib
 
 class RecTV(PluginBase):
     name        = "RecTV"
@@ -64,82 +65,60 @@ class RecTV(PluginBase):
                 for veri in tum_veri
         ]
 
-    async def load_item(self, url: str) -> MovieInfo:
+    async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         self.httpx.headers.update({"user-agent": "okhttp/4.12.0"})
         veri = loads(url)
 
-        match veri.get("type"):
-            case "serie":
-                dizi_istek = await self.httpx.get(f"{self.main_url}/api/season/by/serie/{veri.get('id')}/{self.sw_key}/")
-                dizi_veri  = dizi_istek.json()
-
-                episodes = []
-                for season in dizi_veri:
-                    for episode in season.get("episodes"):
-                        # Bölüm için gerekli bilgileri JSON olarak sakla
-                        ep_data = {
-                            "url"        : self.fix_url(episode.get("sources")[0].get("url")),
-                            "title"      : f"{veri.get('title')} | {season.get('title', '1. Sezon')} {episode.get('title', '1. Bölüm')}",
-                            "is_episode" : True
-                        }
-                        
-                        # Extract season/episode numbers using helper
-                        s1, _ = HTMLHelper.extract_season_episode(season.get("title") or "")
-                        _, e2 = HTMLHelper.extract_season_episode(episode.get("title") or "")
-
-                        ep_model = Episode(
-                            season  = s1 or 1,
-                            episode = e2 or 1,
-                            title   = episode.get("title"),
-                            url     = dumps(ep_data),
-                        )
-
-                        episodes.append(ep_model)
-
-                # Süreyi dakikaya çevir (Örn: "1h 59min")
-                duration_raw = veri.get("duration")
-                duration = None
-                if duration_raw:
-                    try:
-                        h = int(HTMLHelper(duration_raw).regex_first(r"(\d+)h") or 0)
-                        m = int(HTMLHelper(duration_raw).regex_first(r"(\d+)min") or 0)
-                        duration = h * 60 + m
-                    except: pass
-
-                return SeriesInfo(
-                    url         = url,
-                    poster      = self.fix_url(veri.get("image")),
-                    title       = veri.get("title"),
-                    description = veri.get("description"),
-                    tags        = [genre.get("title") for genre in veri.get("genres")] if veri.get("genres") else [],
-                    rating      = str(veri.get("imdb") or veri.get("rating") or ""),
-                    year        = str(veri.get("year") or ""),
-                    actors      = [],
-                    duration    = duration,
-                    episodes    = episodes
-                )
-            case _:
-                # Süreyi dakikaya çevir
-                duration_raw = veri.get("duration")
-                duration = None
-                if duration_raw:
-                    try:
-                        h = int(HTMLHelper(duration_raw).regex_first(r"(\d+)h") or 0)
-                        m = int(HTMLHelper(duration_raw).regex_first(r"(\d+)min") or 0)
-                        duration = h * 60 + m
-                    except: pass
-
-                return MovieInfo(
-                    url         = url,
-                    poster      = self.fix_url(veri.get("image")),
-                    title       = veri.get("title"),
-                    description = veri.get("description"),
-                    tags        = [genre.get("title") for genre in veri.get("genres")] if veri.get("genres") else [],
-                    rating      = str(veri.get("imdb") or veri.get("rating") or ""),
-                    year        = str(veri.get("year") or ""),
-                    actors      = [],
-                    duration    = duration
-                )
+        # Süreyi dakikaya çevir (Örn: "1h 59min")
+        duration_raw = veri.get("duration")
+        duration = None
+        if duration_raw:
+            with contextlib.suppress(Exception):
+                h = int(HTMLHelper(duration_raw).regex_first(r"(\d+)h") or 0)
+                m = int(HTMLHelper(duration_raw).regex_first(r"(\d+)min") or 0)
+                duration = h * 60 + m
+
+        common_info = {
+            "url"         : url,
+            "poster"      : self.fix_url(veri.get("image")),
+            "title"       : veri.get("title"),
+            "description" : veri.get("description"),
+            "tags"        : [genre.get("title") for genre in veri.get("genres")] if veri.get("genres") else [],
+            "rating"      : str(veri.get("imdb") or veri.get("rating") or ""),
+            "year"        : str(veri.get("year") or ""),
+            "duration"    : duration
+        }
+
+        if veri.get("type") == "serie":
+            dizi_istek = await self.httpx.get(f"{self.main_url}/api/season/by/serie/{veri.get('id')}/{self.sw_key}/")
+            dizi_veri  = dizi_istek.json()
+
+            episodes = []
+            for season in dizi_veri:
+                s_title = season.get("title", "").strip()
+                s, _    = HTMLHelper.extract_season_episode(s_title)
+                for ep in season.get("episodes"):
+                    e_title = ep.get("title", "").strip()
+                    _, e    = HTMLHelper.extract_season_episode(e_title)
+                    for source in ep.get("sources"):
+                        tag = ""
+                        clean_s = s_title
+                        if "dublaj" in s_title.lower():
+                            tag = " (Dublaj)"; clean_s = re.sub(r"\s*dublaj\s*", "", s_title, flags=re.I).strip()
+                        elif "altyaz" in s_title.lower():
+                            tag = " (Altyazı)"; clean_s = re.sub(r"\s*altyaz[ıi]\s*", "", s_title, flags=re.I).strip()
+
+                        ep_data = {"url": self.fix_url(source.get("url")), "title": f"{veri.get('title')} | {s_title} {e_title} - {source.get('title')}", "is_episode": True}
+                        episodes.append(Episode(
+                            season  = s or 1,
+                            episode = e or 1,
+                            title   = f"{clean_s} {e_title}{tag} - {source.get('title')}",
+                            url     = dumps(ep_data)
+                        ))
+
+            return SeriesInfo(**common_info, episodes=episodes, actors=[])
+
+        return MovieInfo(**common_info, actors=[])
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         try:

KekikStream/Plugins/RoketDizi.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, MovieInfo, HTMLHelper
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, MovieInfo, HTMLHelper
 import base64, json
 
 class RoketDizi(PluginBase):
@@ -26,8 +26,6 @@ class RoketDizi(PluginBase):
         secici = HTMLHelper(istek.text)
 
         results = []
-
-        # Use div.new-added-list to find the container, then get items
         for item in secici.select("div.new-added-list > span"):
             title  = secici.select_text("span.line-clamp-1", item)
             href   = secici.select_attr("a", "href", item)
@@ -38,7 +36,7 @@ class RoketDizi(PluginBase):
                     category = category,
                     title    = self.clean_title(title),
                     url      = self.fix_url(href),
-                    poster   = self.fix_url(poster) if poster else None
+                    poster   = self.fix_url(poster)
                 ))
 
         return results
@@ -52,7 +50,7 @@ class RoketDizi(PluginBase):
                 "Referer"          : f"{self.main_url}/",
             }
         )
-        
+
         try:
             veri    = istek.json()
             encoded = veri.get("response", "")
@@ -76,7 +74,7 @@ class RoketDizi(PluginBase):
                     results.append(SearchResult(
                         title  = self.clean_title(title.strip()),
                         url    = self.fix_url(f"{self.main_url}/{slug}"),
-                        poster = self.fix_url(poster) if poster else None
+                        poster = self.fix_url(poster)
                     ))
 
             return results
@@ -87,39 +85,33 @@ class RoketDizi(PluginBase):
     async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         resp = await self.httpx.get(url)
         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")
 
         try:
-            next_data = json.loads(next_data_text)
+            next_data       = json.loads(next_data_text)
             secure_data_raw = next_data["props"]["pageProps"]["secureData"]
-            secure_data = json.loads(base64.b64decode(secure_data_raw).decode('utf-8'))
-            
+            secure_data     = json.loads(base64.b64decode(secure_data_raw).decode('utf-8'))
+
             content_item = secure_data.get("contentItem", {})
             content      = secure_data.get("content", {}).get("result", {})
-            
+
             title       = content_item.get("original_title") or content_item.get("culture_title")
             poster      = content_item.get("poster_url") or content_item.get("face_url")
             description = content_item.get("description")
             rating      = str(content_item.get("imdb_point") or "")
             year        = str(content_item.get("release_year") or "")
             tags        = content_item.get("categories", "").split(",")
-            
-            # Actors extraction from getSerieCastsById or getMovieCastsById
+
             actors = []
             casts_data = content.get("getSerieCastsById") or content.get("getMovieCastsById")
             if casts_data and casts_data.get("result"):
                 actors = [cast.get("name") for cast in casts_data["result"] if cast.get("name")]
 
-            # Episodes extraction
             episodes = []
             if "Series" in str(content.get("FindedType")):
-                # Check for episodes in SecureData -> RelatedResults -> getEpisodeSources (this might be for the current episode)
-                # Usually full episode list isn't in secureData, but we can get it from HTML or another API
-                # However, many times Next.js pages have them in props
-                # Let's fallback to the previous regex method for episodes if not in JSON
                 all_urls = HTMLHelper(resp.text).regex_all(r'"url":"([^"]*)"')
                 episodes_dict = {}
                 for u in all_urls:
@@ -138,7 +130,7 @@ class RoketDizi(PluginBase):
 
                 return SeriesInfo(
                     url         = url,
-                    poster      = self.fix_url(poster) if poster else None,
+                    poster      = self.fix_url(poster),
                     title       = self.clean_title(title),
                     description = description,
                     tags        = tags,
@@ -150,7 +142,7 @@ class RoketDizi(PluginBase):
             else:
                 return MovieInfo(
                     url         = url,
-                    poster      = self.fix_url(poster) if poster else None,
+                    poster      = self.fix_url(poster),
                     title       = self.clean_title(title),
                     description = description,
                     tags        = tags,
@@ -169,17 +161,16 @@ class RoketDizi(PluginBase):
     async def load_links(self, url: str) -> list[ExtractResult]:
         resp = await self.httpx.get(url)
         sel  = HTMLHelper(resp.text)
-        
+
         next_data = sel.select_text("script#__NEXT_DATA__")
         if not next_data:
             return []
 
         try:
-            data = json.loads(next_data)
-            secure_data = data["props"]["pageProps"]["secureData"]
+            data         = json.loads(next_data)
+            secure_data  = data["props"]["pageProps"]["secureData"]
             decoded_json = json.loads(base64.b64decode(secure_data).decode('utf-8'))
 
-            # secureData içindeki RelatedResults -> getEpisodeSources -> result dizisini al
             sources = decoded_json.get("RelatedResults", {}).get("getEpisodeSources", {}).get("result", [])
 
             seen_urls = set()
@@ -191,7 +182,7 @@ class RoketDizi(PluginBase):
                 iframe_url = HTMLHelper(source_content).regex_first(r'<iframe[^>]*src=["\']([^"\']*)["\']')
                 if not iframe_url:
                     continue
-                
+
                 # Fix URL protocol
                 if not iframe_url.startswith("http"):
                     if iframe_url.startswith("//"):
@@ -200,8 +191,8 @@ class RoketDizi(PluginBase):
                         iframe_url = "https://" + iframe_url
 
                 iframe_url = self.fix_url(iframe_url)
-                
-                # Deduplicate  
+
+                # Deduplicate
                 if iframe_url in seen_urls:
                     continue
                 seen_urls.add(iframe_url)

KekikStream/Plugins/SelcukFlix.py

@@ -52,7 +52,7 @@ class SelcukFlix(PluginBase):
                             category = category,
                             title    = title,
                             url      = final_url,
-                            poster   = self.fix_url(poster) if poster else None
+                            poster   = self.fix_url(poster)
                         ))
             except Exception:
                 pass
@@ -187,54 +187,55 @@ class SelcukFlix(PluginBase):
         
         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")
+            return SeriesInfo(url=url, title=self.clean_title(sel.select_text("h1")) or "Bilinmeyen")
 
         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")
+                  return SeriesInfo(url=url, title=self.clean_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('"')
 
-            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)
+            content_details = json.loads(base64.b64decode(secure_data_raw).decode('utf-8'))
+            if isinstance(content_details, str): content_details = json.loads(content_details)
 
-            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")
+            title       = self.clean_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(",")]
+                tags = [t.strip() for t in tags_raw.split(",") if t.strip()]
             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(",")]
-            
-            # 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")]
 
+            common_info = {
+                "url"         : url,
+                "poster"      : poster,
+                "title"       : title,
+                "description" : description,
+                "tags"        : tags,
+                "rating"      : rating,
+                "year"        : year,
+                "actors"      : actors,
+                "duration"    : duration
+            }
+
             series_data = related_results.get("getSerieSeasonAndEpisodes")
             if series_data and isinstance(series_data, dict) and series_data.get("result"):
                 episodes = []
@@ -249,31 +250,12 @@ class SelcukFlix(PluginBase):
                                 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
-                )
+                return SeriesInfo(**common_info, episodes=episodes)
+
+            return MovieInfo(**common_info)
+
+        except Exception:
+            return SeriesInfo(url=url, title=self.clean_title(sel.select_text("h1")) or "Bilinmeyen")
 
         except Exception:
             return SeriesInfo(url=url, title=self.clean_title(sel.select_text("h1")) or "Bilinmeyen")