KekikStream 1.5.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

KekikStream/CLI/pypi_kontrol.py

@@ -1,16 +1,16 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from .             import konsol
-from rich.panel    import Panel
-from pkg_resources import get_distribution
-from requests      import get
-from subprocess    import check_call
+from .          import konsol
+from rich.panel import Panel
+from importlib  import metadata
+from requests   import get
+from subprocess import check_call
 import sys
 
 def pypi_kontrol_guncelle(paket_adi: str):
     try:
         konsol.print(f"[bold cyan] {paket_adi} Güncellemesi kontrol ediliyor...[/bold cyan]")
-        mevcut_surum = get_distribution(paket_adi).version
+        mevcut_surum = metadata.version(paket_adi)
         konsol.print(Panel(f"[cyan]Yüklü sürüm:[/cyan] [bold yellow]{mevcut_surum}[/bold yellow]"))
 
         istek = get(f"https://pypi.org/pypi/{paket_adi}/json")

KekikStream/Core/Media/MediaHandler.py

@@ -34,11 +34,11 @@ class MediaHandler:
         if "Cookie" in self.headers or extract_data.subtitles:
             return self.play_with_mpv(extract_data)
 
-        return self.play_with_vlc(extract_data)
+        return self.play_with_vlc(extract_data) or self.play_with_mpv(extract_data)
 
     def play_with_vlc(self, extract_data: ExtractResult):
         konsol.log(f"[yellow][»] VLC ile Oynatılıyor : {extract_data.url}")
-        konsol.print(self.headers)
+        # konsol.print(self.headers)
         try:
             vlc_command = ["vlc", "--quiet"]
 
@@ -62,16 +62,19 @@ class MediaHandler:
             with open(os.devnull, "w") as devnull:
                 subprocess.run(vlc_command, stdout=devnull, stderr=devnull, check=True)
 
+            return True
         except subprocess.CalledProcessError as hata:
             konsol.print(f"[red]VLC oynatma hatası: {hata}[/red]")
             konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})
+            return False
         except FileNotFoundError:
             konsol.print("[red]VLC bulunamadı! VLC kurulu olduğundan emin olun.[/red]")
-            konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})
+            # konsol.print({"title": self.title, "url": extract_data.url, "headers": self.headers})
+            return False
 
     def play_with_mpv(self, extract_data: ExtractResult):
         konsol.log(f"[yellow][»] MPV ile Oynatılıyor : {extract_data.url}")
-        konsol.print(self.headers)
+        # konsol.print(self.headers)
         try:
             mpv_command = ["mpv"]
 
@@ -98,7 +101,7 @@ class MediaHandler:
 
     def play_with_ytdlp(self, extract_data: ExtractResult):
         konsol.log(f"[yellow][»] yt-dlp ile Oynatılıyor : {extract_data.url}")
-        konsol.print(self.headers)
+        # konsol.print(self.headers)
         try:
             ytdlp_command = ["yt-dlp", "--quiet", "--no-warnings"]
 
@@ -131,7 +134,7 @@ class MediaHandler:
 
     def play_with_android_mxplayer(self, extract_data: ExtractResult):
         konsol.log(f"[yellow][»] MxPlayer ile Oynatılıyor : {extract_data.url}")
-        konsol.print(self.headers)
+        # konsol.print(self.headers)
         paketler = [
             "com.mxtech.videoplayer.ad/.ActivityScreen",  # Free sürüm
             "com.mxtech.videoplayer.pro/.ActivityScreen"  # Pro sürüm

KekikStream/Core/Plugin/PluginBase.py

@@ -1,11 +1,12 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from abc                  import ABC, abstractmethod
-from httpx                import AsyncClient, Timeout
-from cloudscraper         import CloudScraper
-from .PluginModels        import MainPageResult, SearchResult, MovieInfo
-from ..Media.MediaHandler import MediaHandler
-from urllib.parse         import urljoin
+from abc                          import ABC, abstractmethod
+from httpx                        import AsyncClient, Timeout
+from cloudscraper                 import CloudScraper
+from .PluginModels                import MainPageResult, SearchResult, MovieInfo
+from ..Media.MediaHandler         import MediaHandler
+from ..Extractor.ExtractorManager import ExtractorManager
+from urllib.parse                 import urljoin
 import re
 
 class PluginBase(ABC):
@@ -17,8 +18,6 @@ class PluginBase(ABC):
 
     main_page   = {}
 
-    _data       = {}
-
     async def url_update(self, new_url: str):
         self.favicon   = self.favicon.replace(self.main_url, new_url)
         self.main_page = {url.replace(self.main_url, new_url): category for url, category in self.main_page.items()}
@@ -34,6 +33,7 @@ class PluginBase(ABC):
         )
         self.media_handler = MediaHandler()
         self.cloudscraper  = CloudScraper()
+        self.ex_manager    = ExtractorManager()
         self.httpx.headers.update(self.cloudscraper.headers)
         self.httpx.cookies.update(self.cloudscraper.cookies)
 
@@ -53,8 +53,28 @@ class PluginBase(ABC):
         pass
 
     @abstractmethod
-    async def load_links(self, url: str) -> list[str]:
-        """Bir medya öğesi için oynatma bağlantılarını döndürür."""
+    async def load_links(self, url: str) -> list[dict]:
+        """
+        Bir medya öğesi için oynatma bağlantılarını döndürür.
+        
+        Args:
+            url: Medya URL'si
+            
+        Returns:
+            Dictionary listesi, her biri şu alanları içerir:
+            - url (str, zorunlu): Video URL'si
+            - name (str, zorunlu): Gösterim adı (tüm bilgileri içerir)
+            - referer (str, opsiyonel): Referer header
+            - subtitles (list, opsiyonel): Altyazı listesi
+        
+        Example:
+            [
+                {
+                    "url": "https://example.com/video.m3u8",
+                    "name": "HDFilmCehennemi | 1080p TR Dublaj"
+                }
+            ]
+        """
         pass
 
     async def close(self):

KekikStream/Extractors/CloseLoad.py

@@ -1,31 +1,12 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from KekikStream.Core import ExtractorBase, ExtractResult
-from Kekik.Sifreleme  import Packer
-import re, base64
-
-def get_m3u_link(data: str) -> str:
-    first = base64.b64decode(data)
-    first_reversed = first[::-1]
-    
-    second = base64.b64decode(first_reversed)
-    
-    parts = second.decode('utf-8').split("|")
-    if len(parts) < 2:
-        raise ValueError("Decoded data has an unexpected format.")
-    
-    return parts[1]
-
-def extract_data(raw_script: str) -> str:
-    pattern = re.compile(r'return result\}var .*?=.*?\("(.*?)"\)')
-    if match := pattern.search(raw_script):
-        return match[1]
-    else:
-        raise Exception("data not found")
+from Kekik.Sifreleme  import Packer, StreamDecoder
+import re
 
 class CloseLoadExtractor(ExtractorBase):
     name     = "CloseLoad"
-    main_url = "https://closeload.filmmakinesi.de"
+    main_url = "https://closeload.filmmakinesi.sh"
 
     async def extract(self, url, referer=None) -> ExtractResult:
         if referer:
@@ -35,7 +16,7 @@ class CloseLoadExtractor(ExtractorBase):
         istek.raise_for_status()
 
         eval_func = re.compile(r'\s*(eval\(function[\s\S].*)\s*').findall(istek.text)[0]
-        m3u_link  = get_m3u_link(extract_data(Packer.unpack(eval_func)))
+        m3u_link  = StreamDecoder.extract_stream_url(Packer.unpack(eval_func))
 
         await self.close()
         return ExtractResult(

KekikStream/Extractors/MolyStream.py

@@ -1,16 +1,34 @@
 # 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 parsel           import Selector
+import re
 
 class MolyStream(ExtractorBase):
     name     = "MolyStream"
     main_url = "https://dbx.molystream.org"
 
     async def extract(self, url, referer=None) -> ExtractResult:
+        if "doctype html" in url:
+            secici = Selector(url)
+            video  = secici.css("video#sheplayer source::attr(src)").get()
+        else:
+            video = url
+
+        matches = re.findall(
+            pattern = r"addSrtFile\(['\"]([^'\"]+\.srt)['\"]\s*,\s*['\"][a-z]{2}['\"]\s*,\s*['\"]([^'\"]+)['\"]",
+            string  = url
+        )
+
+        subtitles = [
+            Subtitle(name = name, url = self.fix_url(url))
+                for url, name in matches
+        ]
+
         return ExtractResult(
             name      = self.name,
-            url       = url,
-            referer   = url.replace("/sheila", ""),
+            url       = video,
+            referer   = video.replace("/sheila", ""),
             headers   = {"User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Firefox/101.0"},
-            subtitles = []
-        )
+            subtitles = subtitles
+        )

KekikStream/Extractors/RapidVid.py

@@ -2,7 +2,7 @@
 
 from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
 from Kekik.Sifreleme  import Packer, HexCodec
-import re
+import re, base64
 
 class RapidVid(ExtractorBase):
     name     = "RapidVid"
@@ -37,17 +37,11 @@ class RapidVid(ExtractorBase):
                 escaped_hex = extracted_value[1]
                 decoded_url = HexCodec.decode(escaped_hex)
             else:
-                eval_jwsetup = re.search(r'\};\s*(eval\(function[\s\S]*?)var played = \d+;', istek.text)
-                if not eval_jwsetup:
-                    raise ValueError("JWPlayer setup not found.")
+                av_encoded = re.search(r"av\('([^']+)'\)", istek.text)
+                if not av_encoded:
+                    raise ValueError("AV encoding not found.")
 
-                unpacked_jwsetup = Packer.unpack(Packer.unpack(eval_jwsetup[1]))
-                extracted_value  = re.search(r'file":"(.*)","label', unpacked_jwsetup)
-                if not extracted_value:
-                    raise ValueError("File URL not found in unpacked JWPlayer setup.")
-
-                escaped_hex = extracted_value[1].replace("\\\\x", "")
-                decoded_url = bytes.fromhex(escaped_hex).decode("utf-8")
+                decoded_url = self.decode_secret(av_encoded[1])
         except Exception as hata:
             raise RuntimeError(f"Extraction failed: {hata}") from hata
 
@@ -58,4 +52,28 @@ class RapidVid(ExtractorBase):
             referer   = self.main_url,
             headers   = {},
             subtitles = subtitles
-        )
+        )
+
+    def decode_secret(self, encoded_string: str) -> str:
+        # 1. Base64 ile şifrelenmiş string ters çevrilmiş, önce geri çeviriyoruz
+        reversed_input = encoded_string[::-1]
+
+        # 2. İlk base64 çözme işlemi
+        decoded_once = base64.b64decode(reversed_input).decode("utf-8")
+
+        decrypted_chars = []
+        key = "K9L"
+
+        # 3. Key'e göre karakter kaydırma geri alınıyor
+        for index, encoded_char in enumerate(decoded_once):
+            key_char = key[index % len(key)]
+            offset = (ord(key_char) % 5) + 1  # Her karakter için dinamik offset
+
+            original_char_code = ord(encoded_char) - offset
+            decrypted_chars.append(chr(original_char_code))
+
+        # 4. Karakterleri birleştirip ikinci base64 çözme işlemini yapıyoruz
+        intermediate_string = "".join(decrypted_chars)
+        final_decoded_bytes = base64.b64decode(intermediate_string)
+
+        return final_decoded_bytes.decode("utf-8")

KekikStream/Extractors/VidMoly.py

@@ -2,7 +2,8 @@
 # ! https://github.com/recloudstream/cloudstream/blob/master/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
 
 from KekikStream.Core import ExtractorBase, ExtractResult, Subtitle
-import re, asyncio, contextlib, json
+from parsel           import Selector
+import re, contextlib, json
 
 class VidMoly(ExtractorBase):
     name     = "VidMoly"
@@ -18,24 +19,26 @@ class VidMoly(ExtractorBase):
         })
 
         if self.main_url.endswith(".me"):
-            self.main_url = self.main_url.replace(".me", ".to")
-            url           = url.replace(".me", ".to")
+            self.main_url = self.main_url.replace(".me", ".net")
+            url = url.replace(".me", ".net")
 
-        # Embed URL oluştur
-        embed_url      = url.replace("/w/", "/embed-") + "-920x360.html" if "/w/" in url else url
-        script_content = None
-        attempts       = 0
+        response = await self.httpx.get(url)
+        if "Select number" in response.text:
+            secici = Selector(response.text)
+            response = await self.httpx.post(
+                url  = url,
+                data = {
+                    "op"        : secici.css("input[name='op']::attr(value)").get(),
+                    "file_code" : secici.css("input[name='file_code']::attr(value)").get(),
+                    "answer"    : secici.css("div.vhint b::text").get(),
+                    "ts"        : secici.css("input[name='ts']::attr(value)").get(),
+                    "nonce"     : secici.css("input[name='nonce']::attr(value)").get(),
+                    "ctok"      : secici.css("input[name='ctok']::attr(value)").get()
+                }
+            )
 
-        # Script verisini almak için deneme yap
-        while attempts < 10 and not script_content:
-            attempts += 1
-            response = await self.httpx.get(embed_url)
-            response.raise_for_status()
-
-            script_match   = re.search(r"sources:\s*\[(.*?)\],", response.text, re.DOTALL)
-            script_content = script_match[1] if script_match else None
-            if not script_content:
-                await asyncio.sleep(0.5)
+        script_match   = re.search(r"sources:\s*\[(.*?)\],", response.text, re.DOTALL)
+        script_content = script_match[1] if script_match else None
 
         if not script_content:
             raise ValueError("Gerekli script bulunamadı.")

KekikStream/Plugins/DiziBox.py

@@ -3,7 +3,7 @@
 from KekikStream.Core import kekik_cache, PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode
 from Kekik.Sifreleme  import CryptoJS
 from parsel           import Selector
-import re, urllib.parse, base64, contextlib, asyncio
+import re, urllib.parse, base64, contextlib, asyncio, time
 
 class DiziBox(PluginBase):
     name        = "DiziBox"
@@ -40,8 +40,12 @@ class DiziBox(PluginBase):
         f"{main_url}/dizi-arsivi/page/SAYFA/?tur[0]=yarisma&yil&imdb"    : "Yarışma"
     }
 
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
+        self.httpx.cookies.update({
+            "isTrustedUser" : "true",
+            "dbxu"          : str(time.time() * 1000).split(".")[0]
+        })
         istek = await self.httpx.get(
             url              = f"{url.replace('SAYFA', str(page))}",
             follow_redirects = True
@@ -58,12 +62,11 @@ class DiziBox(PluginBase):
                 for veri in secici.css("article.detailed-article")
         ]
 
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def search(self, query: str) -> list[SearchResult]:
         self.httpx.cookies.update({
-            "LockUser"      : "true",
             "isTrustedUser" : "true",
-            "dbxu"          : "1722403730363"
+            "dbxu"          : str(time.time() * 1000).split(".")[0]
         })
         istek  = await self.httpx.get(f"{self.main_url}/?s={query}")
         secici = Selector(istek.text)
@@ -77,7 +80,7 @@ class DiziBox(PluginBase):
                 for item in secici.css("article.detailed-article")
         ]
 
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def load_item(self, url: str) -> SeriesInfo:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
@@ -124,13 +127,18 @@ class DiziBox(PluginBase):
             actors      = actors,
         )
 
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def _iframe_decode(self, name:str, iframe_link:str, referer:str) -> list[str]:
         results = []
 
+        self.httpx.headers.update({"Referer": referer})
+        self.httpx.cookies.update({
+            "isTrustedUser" : "true",
+            "dbxu"          : str(time.time() * 1000).split(".")[0]
+        })
+
         if "/player/king/king.php" in iframe_link:
             iframe_link = iframe_link.replace("king.php?v=", "king.php?wmode=opaque&v=")
-            self.httpx.headers.update({"Referer": referer})
 
             istek  = await self.httpx.get(iframe_link)
             secici = Selector(istek.text)
@@ -150,7 +158,6 @@ class DiziBox(PluginBase):
 
         elif "/player/moly/moly.php" in iframe_link:
             iframe_link = iframe_link.replace("moly.php?h=", "moly.php?wmode=opaque&h=")
-            self.httpx.headers.update({"Referer": referer})
             while True:
                 await asyncio.sleep(.3)
                 with contextlib.suppress(Exception):
@@ -171,15 +178,20 @@ class DiziBox(PluginBase):
 
         return results
 
-    @kekik_cache(ttl=15*60)
-    async def load_links(self, url: str) -> list[str]:
+    #@kekik_cache(ttl=15*60)
+    async def load_links(self, url: str) -> list[dict]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
-        iframes = []
+        results = []
         if main_iframe := secici.css("div#video-area iframe::attr(src)").get():
             if decoded := await self._iframe_decode(self.name, main_iframe, url):
-                iframes.extend(decoded)
+                for iframe in decoded:
+                    extractor = self.ex_manager.find_extractor(iframe)
+                    results.append({
+                        "url"  : iframe,
+                        "name" : f"{extractor.name if extractor else 'Main Player'}"
+                    })
 
         for alternatif in secici.css("div.video-toolbar option[value]"):
             alt_name = alternatif.css("::text").get()
@@ -195,6 +207,11 @@ class DiziBox(PluginBase):
             alt_secici = Selector(alt_istek.text)
             if alt_iframe := alt_secici.css("div#video-area iframe::attr(src)").get():
                 if decoded := await self._iframe_decode(alt_name, alt_iframe, url):
-                    iframes.extend(decoded)
-
-        return iframes
+                    for iframe in decoded:
+                        extractor = self.ex_manager.find_extractor(iframe)
+                        results.append({
+                            "url"  : iframe,
+                            "name" : f"{extractor.name if extractor else alt_name}"
+                        })
+
+        return results

KekikStream/Plugins/DiziYou.py

@@ -7,7 +7,7 @@ import re
 class DiziYou(PluginBase):
     name        = "DiziYou"
     language    = "tr"
-    main_url    = "https://www.diziyou2.com"
+    main_url    = "https://www.diziyou.mx"
     favicon     = f"https://www.google.com/s2/favicons?domain={main_url}&sz=64"
     description = "Diziyou en kaliteli Türkçe dublaj ve altyazılı yabancı dizi izleme sitesidir. Güncel ve efsanevi dizileri 1080p Full HD kalitede izlemek için hemen tıkla!"
 
@@ -29,9 +29,7 @@ class DiziYou(PluginBase):
         f"{main_url}/dizi-arsivi/page/SAYFA/?tur=Vah%C5%9Fi+Bat%C4%B1" : "Vahşi Batı"
     }
 
-    _data = {}
-
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = await self.httpx.get(f"{url.replace('SAYFA', str(page))}")
         secici = Selector(istek.text)
@@ -46,7 +44,7 @@ class DiziYou(PluginBase):
                 for veri in secici.css("div.single-item")
         ]
 
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def search(self, query: str) -> list[SearchResult]:
         istek  = await self.httpx.get(f"{self.main_url}/?s={query}")
         secici = Selector(istek.text)
@@ -60,7 +58,7 @@ class DiziYou(PluginBase):
                 for afis in secici.css("div.incontent div#list-series")
         ]
 
-    @kekik_cache(ttl=60*60)
+    #@kekik_cache(ttl=60*60)
     async def load_item(self, url: str) -> SeriesInfo:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
@@ -68,7 +66,9 @@ class DiziYou(PluginBase):
         title       = secici.css("h1::text").get().strip()
         poster      = self.fix_url(secici.css("div.category_image img::attr(src)").get().strip())
         year        = secici.xpath("//span[contains(., 'Yapım Yılı')]/following-sibling::text()[1]").get()
-        description = secici.css("div.diziyou_desc::text").get().strip()
+        description = secici.css("div.diziyou_desc::text").get()
+        if description:
+            description = description.strip()
         tags        = secici.css("div.genres a::text").getall()
         rating      = secici.xpath("//span[contains(., 'IMDB')]/following-sibling::text()[1]").get()
         _actors     = secici.xpath("//span[contains(., 'Oyuncular')]/following-sibling::text()[1]").get()
@@ -107,8 +107,8 @@ class DiziYou(PluginBase):
             actors      = actors
         )
 
-    @kekik_cache(ttl=15*60)
-    async def load_links(self, url: str) -> list[str]:
+    #@kekik_cache(ttl=15*60)
+    async def load_links(self, url: str) -> list[dict]:
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
@@ -130,7 +130,7 @@ class DiziYou(PluginBase):
                         url  = self.fix_url(f"{self.main_url.replace('www', 'storage')}/subtitles/{item_id}/tr.vtt"),
                     ))
                     veri = {
-                        "dil": "Orjinal Dil",
+                        "dil": "Orjinal Dil (TR Altyazı)",
                         "url": f"{self.main_url.replace('www', 'storage')}/episodes/{item_id}/play.m3u8"
                     }
                     if veri not in stream_urls:
@@ -141,28 +141,27 @@ class DiziYou(PluginBase):
                         url  = self.fix_url(f"{self.main_url.replace('www', 'storage')}/subtitles/{item_id}/en.vtt"),
                     ))
                     veri = {
-                        "dil": "Orjinal Dil",
+                        "dil": "Orjinal Dil (EN Altyazı)",
                         "url": f"{self.main_url.replace('www', 'storage')}/episodes/{item_id}/play.m3u8"
                     }
                     if veri not in stream_urls:
                         stream_urls.append(veri)
                 case "turkceDublaj":
                     stream_urls.append({
-                        "dil": "Dublaj",
+                        "dil": "Türkçe Dublaj",
                         "url": f"{self.main_url.replace('www', 'storage')}/episodes/{item_id}_tr/play.m3u8"
                     })
 
-
+        results = []
         for stream in stream_urls:
-            self._data[stream.get("url")] = {
-                "ext_name"  : f"{self.name} | {stream.get('dil')}",
-                "name"      : f"{self.name} | {stream.get('dil')} | {item_title} - {ep_name}",
+            results.append({
+                "url"       : stream.get("url"),
+                "name"      : f"{stream.get('dil')}",
                 "referer"   : url,
-                "headers"   : self.media_handler.headers,
                 "subtitles" : subtitles
-            }
+            })
 
-        return [stream.get("url") for stream in stream_urls]
+        return results
 
     async def play(self, name: str, url: str, referer: str, subtitles: list[Subtitle]):
         extract_result = ExtractResult(name=name, url=url, referer=referer, subtitles=subtitles)