KekikStream 0.2.7__tar.gz → 0.2.8__tar.gz

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream/Core/ExtractorLoader.py

@@ -11,33 +11,53 @@ class ExtractorLoader:
         self.local_extractors_dir  = Path(extractors_dir)
         self.global_extractors_dir = Path(__file__).parent.parent / extractors_dir
         if not self.local_extractors_dir.exists() and not self.global_extractors_dir.exists():
-            konsol.log(f"[red][!] Extractor dizini bulunamadı: {self.extractors_dir}[/red]")
+            konsol.log(f"[red][!] Extractor dizini bulunamadı: {self.global_extractors_dir}[/red]")
             cikis_yap(False)
 
     def load_all(self) -> list[ExtractorBase]:
         extractors = []
 
+        # Global Extractor'ları yükle
         if self.global_extractors_dir.exists():
             konsol.log(f"[green][*] Global Extractor dizininden yükleniyor: {self.global_extractors_dir}[/green]")
-            extractors.extend(self._load_from_directory(self.global_extractors_dir))
+            global_extractors = self._load_from_directory(self.global_extractors_dir)
+            konsol.log(f"[green]Global Extractor'lar: {[e.__name__ for e in global_extractors]}[/green]")
+            extractors.extend(global_extractors)
 
+        # Yerel Extractor'ları yükle
         if self.local_extractors_dir.exists():
             konsol.log(f"[green][*] Yerel Extractor dizininden yükleniyor: {self.local_extractors_dir}[/green]")
-            extractors.extend(self._load_from_directory(self.local_extractors_dir))
+            local_extractors = self._load_from_directory(self.local_extractors_dir)
+            konsol.log(f"[green]Yerel Extractor'lar: {[e.__name__ for e in local_extractors]}[/green]")
+            extractors.extend(local_extractors)
 
-        if not extractors:
-            konsol.print("[yellow][!] Yüklenecek bir Extractor bulunamadı![/yellow]")
+        # Benzersizliği sağlama (modül adı + sınıf adı bazında)
+        unique_extractors = []
+        seen = set()
+        for ext in extractors:
+            identifier = f"{ext.__module__}.{ext.__name__}"
+            if identifier not in seen:
+                unique_extractors.append(ext)
+                seen.add(identifier)
 
-        return extractors
+        konsol.log(f"[blue]Sonuç Extractor'lar: {[e.__name__ for e in unique_extractors]}[/blue]")
+
+        if not unique_extractors:
+            konsol.log("[yellow][!] Yüklenecek bir Extractor bulunamadı![/yellow]")
+
+        return unique_extractors
 
     def _load_from_directory(self, directory: Path) -> list[ExtractorBase]:
         extractors = []
         for file in os.listdir(directory):
             if file.endswith(".py") and not file.startswith("__"):
                 module_name = file[:-3]
+                konsol.log(f"[cyan]Modül yükleniyor: {module_name}[/cyan]")
                 if extractor := self._load_extractor(directory, module_name):
+                    konsol.log(f"[magenta]Extractor bulundu: {extractor.__name__}[/magenta]")
                     extractors.append(extractor)
 
+        konsol.log(f"[yellow]{directory} dizininden yüklenen Extractor'lar: {[e.__name__ for e in extractors]}[/yellow]")
         return extractors
 
     def _load_extractor(self, directory: Path, module_name: str):
@@ -50,12 +70,14 @@ class ExtractorLoader:
             module = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(module)
 
+            # Yalnızca doğru modülden gelen ExtractorBase sınıflarını yükle
             for attr in dir(module):
                 obj = getattr(module, attr)
-                if isinstance(obj, type) and issubclass(obj, ExtractorBase) and obj is not ExtractorBase:
+                if obj.__module__ == module_name and isinstance(obj, type) and issubclass(obj, ExtractorBase) and obj is not ExtractorBase:
+                    konsol.log(f"[green]Yüklenen sınıf: {module_name}.{obj.__name__} ({obj.__module__}.{obj.__name__})[/green]")
                     return obj
 
         except Exception as hata:
-            konsol.print(f"[red][!] Extractor yüklenirken hata oluştu: {module_name}\nHata: {hata}")
+            konsol.log(f"[red][!] Extractor yüklenirken hata oluştu: {module_name}\nHata: {hata}")
 
         return None

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream/Core/PluginBase.py

@@ -2,6 +2,7 @@
 
 from abc           import ABC, abstractmethod
 from httpx         import AsyncClient, Timeout
+from cloudscraper  import CloudScraper
 from .PluginModels import SearchResult, MovieInfo
 from .MediaHandler import MediaHandler
 from urllib.parse  import urljoin
@@ -21,6 +22,9 @@ class PluginBase(ABC):
             timeout = Timeout(10.0),
         )
         self.media_handler = MediaHandler()
+        self.cloudscraper  = CloudScraper()
+        self.oturum.headers.update(self.cloudscraper.headers)
+        self.oturum.cookies.update(self.cloudscraper.cookies)
 
     @abstractmethod
     async def search(self, query: str) -> list[SearchResult]:

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream/Extractors/Odnoklassniki.py

@@ -1,5 +1,6 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
+from KekikStream.CLI  import konsol
 from KekikStream.Core import ExtractorBase, ExtractResult
 import re
 import json
@@ -16,18 +17,11 @@ class Odnoklassniki(ExtractorBase):
             "User-Agent": "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36"
         })
 
-        try:
-            # İlk isteği yap, ancak yönlendirmeyi manuel olarak kontrol et.
-            istek = await self.oturum.get(url, follow_redirects=False)
-            if istek.status_code == 302:  # Yönlendirme varsa
-                redirected_url = istek.headers.get("Location")
-                if not redirected_url:
-                    raise ValueError("Redirect location not found.")
-
-                # Yönlendirilmiş URL'yi kullanarak isteği yeniden yap.
-                url = redirected_url if redirected_url.startswith("http") else f"https://{redirected_url}"
-                istek = await self.oturum.get(url)
+        if "/video/" in url:
+            url = url.replace("/video/", "/videoembed/")
 
+        try:
+            istek = await self.fetch_with_redirects(url)
             istek.raise_for_status()
         except Exception as e:
             raise RuntimeError(f"Failed to fetch the URL: {url}, Error: {e}")
@@ -91,4 +85,25 @@ class Odnoklassniki(ExtractorBase):
             url       = best_video,
             referer   = self.main_url,
             subtitles = []
-        )
+        )
+
+    async def fetch_with_redirects(self, url, max_redirects=5):
+        """Yönlendirmeleri takip eden bir fonksiyon"""
+        redirects = 0
+        while redirects < max_redirects:
+            istek = await self.oturum.get(url, follow_redirects=False)
+            
+            if istek.status_code in [301, 302]:  # Yönlendirme varsa
+                redirected_url = istek.headers.get("Location")
+                print(redirected_url)
+                if not redirected_url:
+                    raise ValueError("Redirect location not found.")
+                
+                url = redirected_url if redirected_url.startswith("http") else f"https://{redirected_url}"
+                redirects += 1
+            else:
+                break  # Yönlendirme yoksa çık
+
+        if redirects == max_redirects:
+            raise RuntimeError(f"Max redirects ({max_redirects}) reached.")
+        return istek

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream/Managers/UIManager.py

@@ -9,6 +9,7 @@ import os
 class UIManager:
     @staticmethod
     def clear_console():
+        # return True
         os.system("cls" if os.name == "nt" else "clear")
 
     @staticmethod

kekikstream-0.2.8/KekikStream/Plugins/DiziBox.py

@@ -0,0 +1,115 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import PluginBase, SearchResult, SeriesInfo, Episode
+from Kekik.Sifreleme  import CryptoJS
+from parsel           import Selector
+import re, urllib.parse, base64
+
+class DiziBox(PluginBase):
+    name     = "DiziBox"
+    main_url = "https://www.dizibox.plus"
+
+    async def search(self, query: str) -> list[SearchResult]:
+        self.oturum.cookies.update({
+            "LockUser"      : "true",
+            "isTrustedUser" : "true",
+            "dbxu"          : "1722403730363"
+        })
+        istek  = await self.oturum.get(f"{self.main_url}/?s={query}")
+        secici = Selector(istek.text)
+
+        return [
+            SearchResult(
+                title  = item.css("h3 a::text").get(),
+                url    = self.fix_url(item.css("h3 a::attr(href)").get()),
+                poster = self.fix_url(item.css("img::attr(src)").get()),
+            )
+            for item in secici.css("article.detailed-article")
+        ]
+
+    async def load_item(self, url: str) -> SeriesInfo:
+        istek  = await self.oturum.get(url)
+        secici = Selector(istek.text)
+
+        title       = secici.css("div.tv-overview h1 a::text").get()
+        poster      = self.fix_url(secici.css("div.tv-overview figure img::attr(src)").get())
+        description = secici.css("div.tv-story p::text").get()
+        year        = secici.css("a[href*='/yil/']::text").re_first(r"(\d{4})")
+        tags        = secici.css("a[href*='/tur/']::text").getall()
+        rating      = secici.css("span.label-imdb b::text").re_first(r"[\d.,]+")
+        actors      = [actor.css("::text").get() for actor in secici.css("a[href*='/oyuncu/']")]
+
+        episodes = []
+        for sezon_link in secici.css("div#seasons-list a::attr(href)").getall():
+            sezon_url    = self.fix_url(sezon_link)
+            sezon_istek  = await self.oturum.get(sezon_url)
+            sezon_secici = Selector(sezon_istek.text)
+
+            for bolum in sezon_secici.css("article.grid-box"):
+                ep_title   = bolum.css("div.post-title a::text").get()
+                ep_href    = self.fix_url(bolum.css("div.post-title a::attr(href)").get())
+                ep_season  = bolum.css("div.post-title a::text").re_first(r"(\d+)\. ?Sezon")
+                ep_episode = bolum.css("div.post-title a::text").re_first(r"(\d+)\. ?Bölüm")
+
+                if ep_title and ep_href:
+                    episodes.append(Episode(
+                        season  = ep_season,
+                        episode = ep_episode,
+                        title   = ep_title.strip(),
+                        url     = ep_href,
+                    ))
+
+        return SeriesInfo(
+            url         = url,
+            poster      = poster,
+            title       = title,
+            description = description,
+            tags        = tags,
+            rating      = rating,
+            year        = year,
+            episodes    = episodes,
+            actors      = actors,
+        )
+
+    async def _iframe_decode(self, name:str, iframe_link:str, referer:str) -> list[str]:
+        results = []
+
+        if "/player/king/king.php" in iframe_link:
+            print(name, iframe_link)
+        elif "/player/moly/moly.php" in iframe_link:
+            print(name, iframe_link)
+        elif "/player/haydi.php" in iframe_link:
+            okru_url = base64.b64decode(iframe_link.split("?v=")[-1]).decode("utf-8")
+            results.append(okru_url)
+
+        return results
+
+    async def load_links(self, url: str) -> list[str]:
+        istek  = await self.oturum.get(url)
+        secici = Selector(istek.text)
+
+        iframes = []
+        main_iframe  = secici.css("div#video-area iframe::attr(src)").get()
+        if main_iframe:
+            if decoded := await self._iframe_decode(self.name, main_iframe, url):
+                iframes.extend(decoded)
+
+        for alternatif in secici.css("div.video-toolbar option[value]"):
+            alt_name = alternatif.css("::text").get()
+            alt_link = alternatif.css("::attr(value)").get()
+
+            if not alt_link:
+                continue
+
+            self.oturum.headers.update({"Referer": url})
+            alt_istek = await self.oturum.get(alt_link)
+            alt_istek.raise_for_status()
+
+            alt_secici = Selector(alt_istek.text)
+            alt_iframe = alt_secici.css("div#video-area iframe::attr(src)").get()
+
+            if alt_iframe:
+                if decoded := await self._iframe_decode(alt_name, alt_iframe, url):
+                    iframes.extend(decoded)
+
+        return iframes

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream/__init__.py

@@ -185,7 +185,12 @@ class KekikStream:
             konsol.print("[bold red]Uygun Extractor bulunamadı.[/bold red]")
             return
 
-        extract_data = await extractor.extract(selected_link, referer=self.current_plugin.main_url)
+        try:
+            extract_data = await extractor.extract(selected_link, referer=self.current_plugin.main_url)
+        except Exception as hata:
+            konsol.print(f"[bold red]{extractor.name} » hata oluştu: {hata}[/bold red]")
+            await self.handle_no_results()
+            return
 
         if isinstance(extract_data, list):
             selected_data = await self.ui_manager.select_from_list(

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream/requirements.txt

@@ -3,6 +3,7 @@ wheel
 
 Kekik
 httpx
+cloudscraper
 parsel
 
 pydantic

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.2.7
+Version: 0.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
@@ -17,6 +17,7 @@ Requires-Dist: setuptools
 Requires-Dist: wheel
 Requires-Dist: Kekik
 Requires-Dist: httpx
+Requires-Dist: cloudscraper
 Requires-Dist: parsel
 Requires-Dist: pydantic
 Requires-Dist: InquirerPy

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ KekikStream/Managers/MediaManager.py
 KekikStream/Managers/PluginManager.py
 KekikStream/Managers/UIManager.py
 KekikStream/Managers/__init__.py
+KekikStream/Plugins/DiziBox.py
 KekikStream/Plugins/FilmMakinesi.py
 KekikStream/Plugins/FullHDFilmizlesene.py
 KekikStream/Plugins/JetFilmizle.py

{kekikstream-0.2.7 → kekikstream-0.2.8}/KekikStream.egg-info/requires.txt

@@ -2,6 +2,7 @@ setuptools
 wheel
 Kekik
 httpx
+cloudscraper
 parsel
 pydantic
 InquirerPy

{kekikstream-0.2.7 → kekikstream-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KekikStream
-Version: 0.2.7
+Version: 0.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
@@ -17,6 +17,7 @@ Requires-Dist: setuptools
 Requires-Dist: wheel
 Requires-Dist: Kekik
 Requires-Dist: httpx
+Requires-Dist: cloudscraper
 Requires-Dist: parsel
 Requires-Dist: pydantic
 Requires-Dist: InquirerPy

{kekikstream-0.2.7 → kekikstream-0.2.8}/setup.py

@@ -6,7 +6,7 @@ from io         import open
 setup(
     # ? Genel Bilgiler
     name         = "KekikStream",
-    version      = "0.2.7",
+    version      = "0.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"],
@@ -29,6 +29,7 @@ setup(
         "wheel",
         "Kekik",
         "httpx",
+        "cloudscraper",
         "parsel",
         "pydantic",
         "InquirerPy",