KekikStream 2.1.3__tar.gz → 2.1.5__tar.gz

{kekikstream-2.1.3 → kekikstream-2.1.5}/KekikStream/Extractors/CloseLoad.py

@@ -1,7 +1,8 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import ExtractorBase, ExtractResult
+from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
 from Kekik.Sifreleme  import Packer, StreamDecoder
+from parsel           import Selector
 import re
 
 class CloseLoadExtractor(ExtractorBase):
@@ -15,12 +16,26 @@ class CloseLoadExtractor(ExtractorBase):
         istek = await self.httpx.get(url)
         istek.raise_for_status()
 
+        # Video URL'sini çıkar
         eval_func = re.compile(r'\s*(eval\(function[\s\S].*)\s*').findall(istek.text)[0]
         m3u_link  = StreamDecoder.extract_stream_url(Packer.unpack(eval_func))
 
+        # Subtitle'ları parse et (Kotlin referansı: track elementleri)
+        subtitles = []
+        secici = Selector(istek.text)
+        for track in secici.css("track"):
+            raw_src = track.css("::attr(src)").get() or ""
+            raw_src = raw_src.strip()
+            label   = track.css("::attr(label)").get() or track.css("::attr(srclang)").get() or "Altyazı"
+            
+            if raw_src:
+                full_url = raw_src if raw_src.startswith("http") else f"{self.main_url}{raw_src}"
+                subtitles.append(Subtitle(name=label, url=full_url))
+
         return ExtractResult(
             name      = self.name,
             url       = m3u_link,
             referer   = self.main_url,
-            subtitles = []
+            subtitles = subtitles
         )
+

{kekikstream-2.1.3 → kekikstream-2.1.5}/KekikStream/Plugins/FilmMakinesi.py

@@ -75,18 +75,22 @@ class FilmMakinesi(PluginBase):
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
-        title       = secici.css("h1.title::text").get().strip()
-        poster      = secici.css("img.cover-img::attr(src)").get().strip()
-        description = secici.css("div.info-description p::text").get().strip()
+        title       = secici.css("h1.title::text").get()
+        title       = title.strip() if title else ""
+        poster      = secici.css("img.cover-img::attr(src)").get()
+        poster      = poster.strip() if poster else ""
+        description = secici.css("div.info-description p::text").get()
+        description = description.strip() if description else ""
         rating      = secici.css("div.score::text").get()
         if rating:
             rating = rating.strip().split()[0]
-        year        = secici.css("span.date a::text").get().strip()
+        year        = secici.css("span.date a::text").get()
+        year        = year.strip() if year else ""
         actors      = secici.css("div.cast-name::text").getall()
         tags        = secici.css("div.genre a::text").getall()
         duration    = secici.css("div.time::text").get()
         if duration:
-            duration = duration.split()[1].strip()
+            duration = duration.split()[1].strip() if len(duration.split()) > 1 else ""
 
         return MovieInfo(
             url         = url,

{kekikstream-2.1.3 → kekikstream-2.1.5}/KekikStream/Plugins/FullHDFilm.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, ExtractResult, Subtitle
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult, Subtitle
 from parsel import Selector
 import re, base64
 
@@ -69,14 +69,13 @@ class FullHDFilm(PluginBase):
                     if veri.css("img::attr(alt)").get()
         ]
 
-    async def load_item(self, url: str) -> MovieInfo:
+    async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
-        title       = secici.css("h1::text").get()
-        poster      = self.fix_url(secici.css("div.poster img::attr(src)").get())
-        description = secici.css("div#details div.text::text").get() or \
-                      secici.css("div#details div::text").get()
+        title       = secici.css("h1::text").get() or ""
+        title       = title.strip() if title else ""
+        poster      = self.fix_url(secici.css("div.poster img::attr(src)").get() or "")
         
         actors_text = secici.css("div.oyuncular.info::text").get()
         if actors_text:
@@ -89,20 +88,72 @@ class FullHDFilm(PluginBase):
         tags   = secici.css("div.tur.info a::text").getall()
         rating = secici.css("div.imdb::text").re_first(r"IMDb\s*([\d\.]+)")
         
-        # Açıklama usually above .others
+        # Description
         description = secici.xpath("//div[contains(@class, 'others')]/preceding-sibling::div[1]//text()").getall()
         description = "".join(description).strip() if description else None
 
-        return MovieInfo(
-            url         = url,
-            poster      = poster,
-            title       = self.clean_title(title) if title else "",
-            description = description,
-            tags        = tags,
-            year        = year,
-            actors      = actors,
-            rating      = rating.strip() if rating else None,
-        )
+        # Kotlin referansı: URL'de -dizi kontrolü veya tags içinde "dizi" kontrolü
+        is_series = "-dizi" in url.lower() or any("dizi" in tag.lower() for tag in tags)
+
+        if is_series:
+            episodes = []
+            part_elements = secici.css("li.psec")
+            part_names    = secici.css("li.psec a::text").getall()
+            
+            # pdata değerlerini çıkar
+            pdata_matches = re.findall(r"pdata\['([^']+)'\]\s*=\s*'([^']+)'", istek.text)
+            
+            for idx, (part_id, part_name) in enumerate(zip([el.css("::attr(id)").get() for el in part_elements], part_names)):
+                if not part_name:
+                    continue
+                    
+                part_name = part_name.strip()
+                
+                # Fragman'ları atla
+                if "fragman" in part_name.lower() or (part_id and "fragman" in part_id.lower()):
+                    continue
+                
+                # Sezon ve bölüm numarası çıkar
+                sz_match = re.search(r'(\d+)\s*sezon', part_id.lower() if part_id else "")
+                ep_match = re.search(r'^(\d+)\.', part_name)
+                
+                sz_num = int(sz_match.group(1)) if sz_match else 1
+                ep_num = int(ep_match.group(1)) if ep_match else idx + 1
+                
+                # pdata'dan video URL'si çık (varsa)
+                video_url = url  # Varsayılan olarak ana URL kullan
+                if idx < len(pdata_matches):
+                    video_url = pdata_matches[idx][1] if pdata_matches[idx][1] else url
+                
+                episodes.append(Episode(
+                    season  = sz_num,
+                    episode = ep_num,
+                    title   = f"{sz_num}. Sezon {ep_num}. Bölüm",
+                    url     = url  # Bölüm URL'leri load_links'te işlenecek
+                ))
+
+            return SeriesInfo(
+                url         = url,
+                poster      = poster,
+                title       = self.clean_title(title) if title else "",
+                description = description,
+                tags        = tags,
+                year        = year,
+                actors      = actors,
+                rating      = rating.strip() if rating else None,
+                episodes    = episodes
+            )
+        else:
+            return MovieInfo(
+                url         = url,
+                poster      = poster,
+                title       = self.clean_title(title) if title else "",
+                description = description,
+                tags        = tags,
+                year        = year,
+                actors      = actors,
+                rating      = rating.strip() if rating else None,
+            )
 
     def _get_iframe(self, source_code: str) -> str:
         """Base64 kodlu iframe'i çözümle"""

{kekikstream-2.1.3 → kekikstream-2.1.5}/KekikStream/Plugins/HDFilmCehennemi.py

@@ -1,6 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, Subtitle
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, Subtitle
 from parsel           import Selector
 from Kekik.Sifreleme  import Packer, StreamDecoder
 import random, string, re
@@ -71,36 +71,76 @@ class HDFilmCehennemi(PluginBase):
             
         return results
 
-    async def load_item(self, url: str) -> MovieInfo:
+    async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         istek  = await self.httpx.get(url, headers = {"Referer": f"{self.main_url}/"})
         secici = Selector(istek.text)
 
-        title       = secici.css("h1.section-title::text").get().strip()
-        poster      = secici.css("aside.post-info-poster img.lazyload::attr(data-src)").get().strip()
-        description = secici.css("article.post-info-content > p::text").get().strip()
+        title       = secici.css("h1.section-title::text").get()
+        title       = title.strip() if title else ""
+        poster      = secici.css("aside.post-info-poster img.lazyload::attr(data-src)").get() or ""
+        poster      = poster.strip() if poster else ""
+        description = secici.css("article.post-info-content > p::text").get() or ""
+        description = description.strip() if description else ""
         tags        = secici.css("div.post-info-genres a::text").getall()
-        rating      = secici.css("div.post-info-imdb-rating span::text").get().strip()
-        year        = secici.css("div.post-info-year-country a::text").get().strip()
+        rating      = secici.css("div.post-info-imdb-rating span::text").get() or ""
+        rating      = rating.strip() if rating else ""
+        year        = secici.css("div.post-info-year-country a::text").get() or ""
+        year        = year.strip() if year else ""
         actors      = secici.css("div.post-info-cast a > strong::text").getall()
-        duration    = secici.css("div.post-info-duration::text").get().replace("dakika", "").strip()
+        duration    = secici.css("div.post-info-duration::text").get() or "0"
+        duration    = duration.replace("dakika", "").strip()
 
-        
         try:
-            duration_minutes = int(duration[2:-1])
+            duration_minutes = int(re.search(r'\d+', duration).group()) if re.search(r'\d+', duration) else 0
         except Exception:
             duration_minutes = 0
 
-        return MovieInfo(
-            url         = url,
-            poster      = self.fix_url(poster),
-            title       = self.clean_title(title),
-            description = description,
-            tags        = tags,
-            rating      = rating,
-            year        = year,
-            actors      = actors,
-            duration    = duration_minutes
-        )
+        # Dizi mi film mi kontrol et (Kotlin referansı: div.seasons kontrolü)
+        is_series = len(secici.css("div.seasons").getall()) > 0
+
+        if is_series:
+            episodes = []
+            for ep in secici.css("div.seasons-tab-content a"):
+                ep_name = ep.css("h4::text").get()
+                ep_href = ep.css("::attr(href)").get()
+                if ep_name and ep_href:
+                    ep_name = ep_name.strip()
+                    # Regex ile sezon ve bölüm numarası çıkar
+                    ep_match = re.search(r'(\d+)\.\s*Bölüm', ep_name)
+                    sz_match = re.search(r'(\d+)\.\s*Sezon', ep_name)
+                    ep_num = int(ep_match.group(1)) if ep_match else 1
+                    sz_num = int(sz_match.group(1)) if sz_match else 1
+                    
+                    episodes.append(Episode(
+                        season  = sz_num,
+                        episode = ep_num,
+                        title   = ep_name,
+                        url     = self.fix_url(ep_href)
+                    ))
+
+            return SeriesInfo(
+                url         = url,
+                poster      = self.fix_url(poster),
+                title       = self.clean_title(title),
+                description = description,
+                tags        = tags,
+                rating      = rating,
+                year        = year,
+                actors      = actors,
+                episodes    = episodes
+            )
+        else:
+            return MovieInfo(
+                url         = url,
+                poster      = self.fix_url(poster),
+                title       = self.clean_title(title),
+                description = description,
+                tags        = tags,
+                rating      = rating,
+                year        = year,
+                actors      = actors,
+                duration    = duration_minutes
+            )
 
     def generate_random_cookie(self):
         return "".join(random.choices(string.ascii_letters + string.digits, k=16))

{kekikstream-2.1.3 → kekikstream-2.1.5}/KekikStream/Plugins/SelcukFlix.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
+from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode
 from parsel           import Selector
 import re, base64, json, urllib.parse
 
@@ -137,8 +137,13 @@ class SelcukFlix(PluginBase):
         search_url = f"{self.main_url}/api/bg/searchcontent?searchterm={query}"
 
         headers = {
+            "User-Agent"       : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:137.0) Gecko/20100101 Firefox/137.0",
             "Accept"           : "application/json, text/plain, */*",
+            "Accept-Language"  : "en-US,en;q=0.5",
             "X-Requested-With" : "XMLHttpRequest",
+            "Sec-Fetch-Site"   : "same-origin",
+            "Sec-Fetch-Mode"   : "cors",
+            "Sec-Fetch-Dest"   : "empty",
             "Referer"          : f"{self.main_url}/"
         }
 
@@ -151,15 +156,16 @@ class SelcukFlix(PluginBase):
             try:
                 decoded_str = raw_data.decode('utf-8')
             except UnicodeDecodeError:
-                decoded_str = raw_data.decode('iso-8859-1').encode('utf-8').decode('utf-8')
+                decoded_str = raw_data.decode('iso-8859-1')
 
             search_data = json.loads(decoded_str)
 
             results = []
             for item in search_data.get("result", []):
-                title  = item.get("title")
-                slug   = item.get("slug")
-                poster = item.get("poster")
+                # API field isimleri: object_name, used_slug, object_poster_url
+                title  = item.get("object_name") or item.get("title")
+                slug   = item.get("used_slug") or item.get("slug")
+                poster = item.get("object_poster_url") or item.get("poster")
 
                 if poster:
                     poster = self.clean_image_url(poster)
@@ -176,7 +182,7 @@ class SelcukFlix(PluginBase):
         except Exception:
             return []
 
-    async def load_item(self, url: str) -> SeriesInfo:
+    async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         resp = await self.httpx.get(url)
         sel  = Selector(resp.text)
 
@@ -190,15 +196,17 @@ class SelcukFlix(PluginBase):
         try:
             decoded_str = raw_data.decode('utf-8')
         except UnicodeDecodeError:
-            decoded_str = raw_data.decode('iso-8859-1') # .encode('utf-8').decode('utf-8') implied
+            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")
+        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:
@@ -206,17 +214,18 @@ class SelcukFlix(PluginBase):
              if series_data and isinstance(series_data, list):
                   pass
 
-        episodes = []
+        # Dizi mi film mi kontrol et (Kotlin referansı)
         if series_data:
-             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:
+            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") # Try snake_case too
+                s_no = season.get("season_no") or season.get("seasonNo")
                 ep_list = season.get("episodes", [])
                 for ep in ep_list:
                     episodes.append(Episode(
@@ -225,15 +234,27 @@ class SelcukFlix(PluginBase):
                         title   = ep.get("ep_text") or ep.get("epText"),
                         url     = self.fix_url(ep.get("used_slug") or ep.get("usedSlug"))
                     ))
-        
-        return SeriesInfo(
-            title       = title,
-            url         = url,
-            poster      = poster,
-            description = description,
-            rating      = rating,
-            episodes    = episodes
-        )
+            
+            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
+            )
 
     async def load_links(self, url: str) -> list[dict]:
         resp = await self.httpx.get(url)
@@ -248,42 +269,45 @@ class SelcukFlix(PluginBase):
             secure_data = data["props"]["pageProps"]["secureData"]
             raw_data = base64.b64decode(secure_data.replace('"', ''))
             
-            # Try UTF-8 first, fallback to ISO-8859-1 (matching Kotlin)
             try:
                 decoded_str = raw_data.decode('utf-8')
             except UnicodeDecodeError:
                 decoded_str = raw_data.decode('iso-8859-1')
             
             content_details = json.loads(decoded_str)
-            related_data = content_details.get("relatedData", {})
+            related_results = content_details.get("RelatedResults", {})
             
             source_content = None
             
-            # Check if Series (episode) or Movie
+            # Dizi (bölüm) için
             if "/dizi/" in url:
-                if related_data.get("episodeSources", {}).get("state"):
-                    res = related_data["episodeSources"].get("result", [])
+                episode_sources = related_results.get("getEpisodeSources", {})
+                if episode_sources.get("state"):
+                    res = episode_sources.get("result", [])
                     if res:
-                        source_content = res[0].get("sourceContent")
+                        source_content = res[0].get("source_content") or res[0].get("sourceContent")
             else:
-                # Movie
-                if related_data.get("movieParts", {}).get("state"):
-                    movie_parts = related_data["movieParts"].get("result", [])
-                    if movie_parts:
-                        first_part_id = movie_parts[0].get("id")
-                        # RelatedResults -> getMoviePartSourcesById_ID
-                        rr = content_details.get("RelatedResults", {})
+                # Film için
+                movie_parts = related_results.get("getMoviePartsById", {})
+                if movie_parts.get("state"):
+                    parts = movie_parts.get("result", [])
+                    if parts:
+                        first_part_id = parts[0].get("id")
                         key = f"getMoviePartSourcesById_{first_part_id}"
-                        if key in rr:
-                            res = rr[key].get("result", [])
+                        if key in related_results:
+                            res = related_results[key].get("result", [])
                             if res:
-                                source_content = res[0].get("source_content")
+                                source_content = res[0].get("source_content") or res[0].get("sourceContent")
 
             if source_content:
                 iframe_sel = Selector(source_content)
                 iframe_src = iframe_sel.css("iframe::attr(src)").get()
                 if iframe_src:
                     iframe_src = self.fix_url(iframe_src)
+                    # Hotlinger domain değişimi (Kotlin referansı)
+                    if "sn.dplayer74.site" in iframe_src:
+                        iframe_src = iframe_src.replace("sn.dplayer74.site", "sn.hotlinger.com")
+                    
                     data = await self.extract(iframe_src)
                     if data:
                         return [data]

{kekikstream-2.1.3 → kekikstream-2.1.5}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.1.3
+Version: 2.1.5
 Summary: terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı
 Home-page: https://github.com/keyiflerolsun/KekikStream
 Author: keyiflerolsun
@@ -292,6 +292,8 @@ Projeyi geliştirmek için katkılarınızı bekliyoruz!
 
 - [keyiflerolsun/Kekik-cloudstream](https://github.com/keyiflerolsun/Kekik-cloudstream)  
 - [keyiflerolsun/seyirTurk-Parser](https://github.com/keyiflerolsun/seyirTurk-Parser)
+- [feroxx/Kekik-cloudstream](https://github.com/feroxx/Kekik-cloudstream)
+- [kerimmkirac/cs-kerim](https://github.com/kerimmkirac/cs-kerim)
 
 ## 🌐 Telif Hakkı ve Lisans
 

{kekikstream-2.1.3 → kekikstream-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.1.3
+Version: 2.1.5
 Summary: terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı
 Home-page: https://github.com/keyiflerolsun/KekikStream
 Author: keyiflerolsun
@@ -292,6 +292,8 @@ Projeyi geliştirmek için katkılarınızı bekliyoruz!
 
 - [keyiflerolsun/Kekik-cloudstream](https://github.com/keyiflerolsun/Kekik-cloudstream)  
 - [keyiflerolsun/seyirTurk-Parser](https://github.com/keyiflerolsun/seyirTurk-Parser)
+- [feroxx/Kekik-cloudstream](https://github.com/feroxx/Kekik-cloudstream)
+- [kerimmkirac/cs-kerim](https://github.com/kerimmkirac/cs-kerim)
 
 ## 🌐 Telif Hakkı ve Lisans
 

{kekikstream-2.1.3 → kekikstream-2.1.5}/README.md

@@ -255,6 +255,8 @@ Projeyi geliştirmek için katkılarınızı bekliyoruz!
 
 - [keyiflerolsun/Kekik-cloudstream](https://github.com/keyiflerolsun/Kekik-cloudstream)  
 - [keyiflerolsun/seyirTurk-Parser](https://github.com/keyiflerolsun/seyirTurk-Parser)
+- [feroxx/Kekik-cloudstream](https://github.com/feroxx/Kekik-cloudstream)
+- [kerimmkirac/cs-kerim](https://github.com/kerimmkirac/cs-kerim)
 
 ## 🌐 Telif Hakkı ve Lisans
 

{kekikstream-2.1.3 → kekikstream-2.1.5}/setup.py

@@ -6,7 +6,7 @@ from io         import open
 setup(
     # ? Genel Bilgiler
     name         = "KekikStream",
-    version      = "2.1.3",
+    version      = "2.1.5",
     url          = "https://github.com/keyiflerolsun/KekikStream",
     description  = "terminal üzerinden medya içeriği aramanızı ve VLC/MPV gibi popüler medya oynatıcılar aracılığıyla doğrudan izlemenizi sağlayan modüler ve genişletilebilir bir bıdı bıdı",
     keywords     = ["KekikStream", "KekikAkademi", "keyiflerolsun"],