KekikStream 2.2.6__tar.gz → 2.2.8__tar.gz

kekikstream-2.2.8/KekikStream/Extractors/CloseLoad.py

@@ -0,0 +1,77 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle
+from Kekik.Sifreleme   import Packer, StreamDecoder
+from selectolax.parser import HTMLParser
+import re, json
+
+class CloseLoadExtractor(ExtractorBase):
+    name     = "CloseLoad"
+    main_url = "https://closeload.filmmakinesi.to"
+
+    def _extract_from_json_ld(self, html: str) -> str | None:
+        """JSON-LD script tag'inden contentUrl'i çıkar (Kotlin versiyonundaki gibi)"""
+        secici = HTMLParser(html)
+        for script in secici.css("script[type='application/ld+json']"):
+            try:
+                data = json.loads(script.text(strip=True))
+                if content_url := data.get("contentUrl"):
+                    if content_url.startswith("http"):
+                        return content_url
+            except (json.JSONDecodeError, TypeError):
+                # Regex ile contentUrl'i çıkarmayı dene
+                match = re.search(r'"contentUrl"\s*:\s*"([^"]+)"', script.text())
+                if match and match.group(1).startswith("http"):
+                    return match.group(1)
+        return None
+
+    def _extract_from_packed(self, html: str) -> str | None:
+        """Packed JavaScript'ten video URL'sini çıkar (fallback)"""
+        try:
+            eval_func = re.compile(r'\s*(eval\(function[\s\S].*)').findall(html)
+            if eval_func:
+                return StreamDecoder.extract_stream_url(Packer.unpack(eval_func[0]))
+        except Exception:
+            pass
+        return None
+
+    async def extract(self, url, referer=None) -> ExtractResult:
+        if referer:
+            self.httpx.headers.update({"Referer": referer})
+        
+        self.httpx.headers.update({
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36 Edg/140.0.0.0",
+            "Origin": self.main_url
+        })
+
+        istek = await self.httpx.get(url)
+        istek.raise_for_status()
+
+        # Önce JSON-LD'den dene (daha güvenilir - Kotlin versiyonu gibi)
+        m3u_link = self._extract_from_json_ld(istek.text)
+        
+        # Fallback: Packed JavaScript'ten çıkar
+        if not m3u_link:
+            m3u_link = self._extract_from_packed(istek.text)
+
+        if not m3u_link:
+            raise Exception("Video URL bulunamadı (ne JSON-LD ne de packed script'ten)")
+
+        # Subtitle'ları parse et (Kotlin referansı: track elementleri)
+        subtitles = []
+        secici = HTMLParser(istek.text)
+        for track in secici.css("track"):
+            raw_src = track.attrs.get("src") or ""
+            raw_src = raw_src.strip()
+            label   = track.attrs.get("label") or track.attrs.get("srclang") 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
+        )

{kekikstream-2.2.6 → kekikstream-2.2.8}/KekikStream/Plugins/Dizilla.py

@@ -10,7 +10,7 @@ from base64            import b64decode
 class Dizilla(PluginBase):
     name        = "Dizilla"
     language    = "tr"
-    main_url    = "https://dizilla40.com"
+    main_url    = "https://dizilla.to"
     favicon     = f"https://www.google.com/s2/favicons?domain={main_url}&sz=64"
     description = "1080p yabancı dizi izle. Türkçe altyazılı veya dublaj seçenekleriyle 1080p çözünürlükte yabancı dizilere anında ulaş. Popüler dizileri kesintisiz izle."
 

{kekikstream-2.2.6 → kekikstream-2.2.8}/KekikStream/Plugins/HDFilmCehennemi.py

@@ -205,30 +205,23 @@ class HDFilmCehennemi(PluginBase):
 
         return results
 
-    def extract_hdch_url(self, unpacked: str) -> str:
-        """HDFilmCehennemi unpacked script'ten video URL'sini çıkar"""
-        # 1) Decode fonksiyonunun adını bul: function <NAME>(value_parts)
-        match_fn = re.search(r'function\s+(\w+)\s*\(\s*value_parts\s*\)', unpacked)
-        if not match_fn:
-            return ""
-        
-        fn_name = match_fn.group(1)
-        
-        # 2) Bu fonksiyonun array ile çağrıldığı yeri bul: <NAME>([ ... ])
-        array_call_regex = re.compile(rf'{re.escape(fn_name)}\(\s*\[(.*?)\]\s*\)', re.DOTALL)
-        match_call = array_call_regex.search(unpacked)
-        if not match_call:
-            return ""
-
-        array_body = match_call.group(1)
-
-        # 3) Array içindeki string parçalarını topla
-        parts = re.findall(r'["\']([^"\']+)["\']', array_body)
-        if not parts:
-            return ""
-
-        # 4) Özel decoder ile çöz
-        return StreamDecoder.extract_stream_url(unpacked)
+    def _extract_from_json_ld(self, html: str) -> str | None:
+        """JSON-LD script tag'inden contentUrl'i çıkar (Kotlin versiyonundaki gibi)"""
+        # Önce JSON-LD'den dene
+        json_ld_match = re.search(r'<script[^>]+type=["\']application/ld\+json["\'][^>]*>(.*?)</script>', html, re.DOTALL)
+        if json_ld_match:
+            try:
+                import json
+                data = json.loads(json_ld_match.group(1).strip())
+                if content_url := data.get("contentUrl"):
+                    if content_url.startswith("http"):
+                        return content_url
+            except Exception:
+                # Regex ile contentUrl'i çıkarmayı dene
+                match = re.search(r'"contentUrl"\s*:\s*"([^"]+)"', html)
+                if match and match.group(1).startswith("http"):
+                    return match.group(1)
+        return None
 
     async def invoke_local_source(self, iframe: str, source: str, url: str):
         self.httpx.headers.update({
@@ -240,18 +233,21 @@ class HDFilmCehennemi(PluginBase):
         if not istek.text:
             return await self.cehennempass(iframe.split("/")[-1])
 
-        # eval(function...) içeren packed script bul
-        eval_match = re.search(r'(eval\(function[\s\S]+)', istek.text)
-        if not eval_match:
-            return await self.cehennempass(iframe.split("/")[-1])
+        # Önce JSON-LD'den dene (Kotlin versiyonu gibi - daha güvenilir)
+        video_url = self._extract_from_json_ld(istek.text)
 
-        try:
-            unpacked = Packer.unpack(eval_match.group(1))
-        except Exception:
-            return await self.cehennempass(iframe.split("/")[-1])
-
-        # HDFilmCehennemi özel decoder ile video URL'sini çıkar
-        video_url = self.extract_hdch_url(unpacked)
+        # Fallback: Packed JavaScript'ten çıkar
+        if not video_url:
+            # eval(function...) içeren packed script bul
+            eval_match = re.search(r'(eval\(function[\s\S]+)', istek.text)
+            if not eval_match:
+                return await self.cehennempass(iframe.split("/")[-1])
+
+            try:
+                unpacked = Packer.unpack(eval_match.group(1))
+                video_url = StreamDecoder.extract_stream_url(unpacked)
+            except Exception:
+                return await self.cehennempass(iframe.split("/")[-1])
         
         if not video_url:
             return await self.cehennempass(iframe.split("/")[-1])

{kekikstream-2.2.6 → kekikstream-2.2.8}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.2.6
+Version: 2.2.8
 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
@@ -150,64 +150,71 @@ Vidmoly, Filemoon, Sibnet, Sendvid, Voe, Doodstream, Streamtape, Upstream, Daily
 
 ```mermaid
 graph TB
-    CLI[🖥️ CLI Interface]
-    Manager[🔌 Plugin Manager]
-    
-    subgraph Plugins
-        P1[📺 Dizilla]
-        P2[🎬 HDFilmCehennemi]
-        P3[🍿 Dizipal]
-        PN[... 20+ Plugin]
+    subgraph KekikStream[🎬 KekikStream]
+        CLI[🖥️ CLI Interface]
+        Manager[🔌 Plugin Manager]
+
+        subgraph Plugins
+            P1[📺 Dizilla]
+            P2[🎬 HDFilmCehennemi]
+            P3[🍿 Dizipal]
+            PN[... 20+ Plugin]
+        end
+
+        subgraph Extractors
+            E1[🔗 Vidmoly]
+            E2[🔗 Filemoon]
+            E3[🔗 Sibnet]
+            EN[... Extractors]
+        end
+
+        subgraph Players
+            MPV[🎥 MPV]
+            VLC[🎥 VLC]
+            MX[🎥 MX Player]
+        end
     end
-    
-    subgraph Extractors
-        E1[🔗 Vidmoly]
-        E2[🔗 Filemoon]
-        E3[🔗 Sibnet]
-        EN[... Extractors]
-    end
-    
-    subgraph Players
-        MPV[🎥 MPV]
-        VLC[🎥 VLC]
-        MX[🎥 MX Player]
-    end
-    
+
     CLI --> Manager
     Manager --> P1
     Manager --> P2
     Manager --> P3
     Manager --> PN
-    
+
     %% Her plugin otomatik olarak ihtiyaç duyduğu extractor'ı kullanır
     P1 -.-> E1
     P1 -.-> E2
     P1 -.-> E3
-    
+
     P2 -.-> E1
     P2 -.-> E2
     P2 -.-> E3
-    
+
     P3 -.-> E1
     P3 -.-> E2
     P3 -.-> E3
-    
+
     PN -.-> EN
-    
+
     E1 --> VLC
     E2 --> VLC
     E3 --> VLC
     EN --> VLC
-    
+
     E1 --> MPV
     E2 --> MPV
     E3 --> MPV
     EN --> MPV
-    
+
     E1 --> MX
     E2 --> MX
     E3 --> MX
     EN --> MX
+
+    style KekikStream fill:#2b2a29,stroke:#ef7f1a,stroke-width:2px
+    style Plugins fill:#242322,stroke:#0087a3,stroke-width:2px
+    style Extractors fill:#242322,stroke:#5a7c8c,stroke-width:2px
+    style Players fill:#242322,stroke:#0087a3,stroke-width:2px
 ```
 
 ---

{kekikstream-2.2.6 → kekikstream-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.2.6
+Version: 2.2.8
 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
@@ -150,64 +150,71 @@ Vidmoly, Filemoon, Sibnet, Sendvid, Voe, Doodstream, Streamtape, Upstream, Daily
 
 ```mermaid
 graph TB
-    CLI[🖥️ CLI Interface]
-    Manager[🔌 Plugin Manager]
-    
-    subgraph Plugins
-        P1[📺 Dizilla]
-        P2[🎬 HDFilmCehennemi]
-        P3[🍿 Dizipal]
-        PN[... 20+ Plugin]
+    subgraph KekikStream[🎬 KekikStream]
+        CLI[🖥️ CLI Interface]
+        Manager[🔌 Plugin Manager]
+
+        subgraph Plugins
+            P1[📺 Dizilla]
+            P2[🎬 HDFilmCehennemi]
+            P3[🍿 Dizipal]
+            PN[... 20+ Plugin]
+        end
+
+        subgraph Extractors
+            E1[🔗 Vidmoly]
+            E2[🔗 Filemoon]
+            E3[🔗 Sibnet]
+            EN[... Extractors]
+        end
+
+        subgraph Players
+            MPV[🎥 MPV]
+            VLC[🎥 VLC]
+            MX[🎥 MX Player]
+        end
     end
-    
-    subgraph Extractors
-        E1[🔗 Vidmoly]
-        E2[🔗 Filemoon]
-        E3[🔗 Sibnet]
-        EN[... Extractors]
-    end
-    
-    subgraph Players
-        MPV[🎥 MPV]
-        VLC[🎥 VLC]
-        MX[🎥 MX Player]
-    end
-    
+
     CLI --> Manager
     Manager --> P1
     Manager --> P2
     Manager --> P3
     Manager --> PN
-    
+
     %% Her plugin otomatik olarak ihtiyaç duyduğu extractor'ı kullanır
     P1 -.-> E1
     P1 -.-> E2
     P1 -.-> E3
-    
+
     P2 -.-> E1
     P2 -.-> E2
     P2 -.-> E3
-    
+
     P3 -.-> E1
     P3 -.-> E2
     P3 -.-> E3
-    
+
     PN -.-> EN
-    
+
     E1 --> VLC
     E2 --> VLC
     E3 --> VLC
     EN --> VLC
-    
+
     E1 --> MPV
     E2 --> MPV
     E3 --> MPV
     EN --> MPV
-    
+
     E1 --> MX
     E2 --> MX
     E3 --> MX
     EN --> MX
+
+    style KekikStream fill:#2b2a29,stroke:#ef7f1a,stroke-width:2px
+    style Plugins fill:#242322,stroke:#0087a3,stroke-width:2px
+    style Extractors fill:#242322,stroke:#5a7c8c,stroke-width:2px
+    style Players fill:#242322,stroke:#0087a3,stroke-width:2px
 ```
 
 ---

{kekikstream-2.2.6 → kekikstream-2.2.8}/README.md

@@ -113,64 +113,71 @@ Vidmoly, Filemoon, Sibnet, Sendvid, Voe, Doodstream, Streamtape, Upstream, Daily
 
 ```mermaid
 graph TB
-    CLI[🖥️ CLI Interface]
-    Manager[🔌 Plugin Manager]
-    
-    subgraph Plugins
-        P1[📺 Dizilla]
-        P2[🎬 HDFilmCehennemi]
-        P3[🍿 Dizipal]
-        PN[... 20+ Plugin]
+    subgraph KekikStream[🎬 KekikStream]
+        CLI[🖥️ CLI Interface]
+        Manager[🔌 Plugin Manager]
+
+        subgraph Plugins
+            P1[📺 Dizilla]
+            P2[🎬 HDFilmCehennemi]
+            P3[🍿 Dizipal]
+            PN[... 20+ Plugin]
+        end
+
+        subgraph Extractors
+            E1[🔗 Vidmoly]
+            E2[🔗 Filemoon]
+            E3[🔗 Sibnet]
+            EN[... Extractors]
+        end
+
+        subgraph Players
+            MPV[🎥 MPV]
+            VLC[🎥 VLC]
+            MX[🎥 MX Player]
+        end
     end
-    
-    subgraph Extractors
-        E1[🔗 Vidmoly]
-        E2[🔗 Filemoon]
-        E3[🔗 Sibnet]
-        EN[... Extractors]
-    end
-    
-    subgraph Players
-        MPV[🎥 MPV]
-        VLC[🎥 VLC]
-        MX[🎥 MX Player]
-    end
-    
+
     CLI --> Manager
     Manager --> P1
     Manager --> P2
     Manager --> P3
     Manager --> PN
-    
+
     %% Her plugin otomatik olarak ihtiyaç duyduğu extractor'ı kullanır
     P1 -.-> E1
     P1 -.-> E2
     P1 -.-> E3
-    
+
     P2 -.-> E1
     P2 -.-> E2
     P2 -.-> E3
-    
+
     P3 -.-> E1
     P3 -.-> E2
     P3 -.-> E3
-    
+
     PN -.-> EN
-    
+
     E1 --> VLC
     E2 --> VLC
     E3 --> VLC
     EN --> VLC
-    
+
     E1 --> MPV
     E2 --> MPV
     E3 --> MPV
     EN --> MPV
-    
+
     E1 --> MX
     E2 --> MX
     E3 --> MX
     EN --> MX
+
+    style KekikStream fill:#2b2a29,stroke:#ef7f1a,stroke-width:2px
+    style Plugins fill:#242322,stroke:#0087a3,stroke-width:2px
+    style Extractors fill:#242322,stroke:#5a7c8c,stroke-width:2px
+    style Players fill:#242322,stroke:#0087a3,stroke-width:2px
 ```
 
 ---

{kekikstream-2.2.6 → kekikstream-2.2.8}/setup.py

@@ -6,7 +6,7 @@ from io         import open
 setup(
     # ? Genel Bilgiler
     name         = "KekikStream",
-    version      = "2.2.6",
+    version      = "2.2.8",
     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"],

kekikstream-2.2.6/KekikStream/Extractors/CloseLoad.py

@@ -1,40 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Core  import ExtractorBase, ExtractResult, Subtitle
-from Kekik.Sifreleme   import Packer, StreamDecoder
-from selectolax.parser import HTMLParser
-import re
-
-class CloseLoadExtractor(ExtractorBase):
-    name     = "CloseLoad"
-    main_url = "https://closeload.filmmakinesi.to"
-
-    async def extract(self, url, referer=None) -> ExtractResult:
-        if referer:
-            self.httpx.headers.update({"Referer": referer})
-
-        istek = await self.httpx.get(url)
-        istek.raise_for_status()
-
-        # Video URL'sini çıkar
-        eval_func = re.compile(r'\s*(eval\(function[\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 = HTMLParser(istek.text)
-        for track in secici.css("track"):
-            raw_src = track.attrs.get("src") or ""
-            raw_src = raw_src.strip()
-            label   = track.attrs.get("label") or track.attrs.get("srclang") 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
-        )