KekikStream 1.9.4__tar.gz → 1.9.6__tar.gz

{kekikstream-1.9.4 → kekikstream-1.9.6}/KekikStream/Core/Extractor/ExtractorManager.py

@@ -47,7 +47,9 @@ class ExtractorManager:
         """
         Verilen bağlantıyı işleyebilecek çıkarıcıyı bul
         """
+        # Lazy loading: İlk kullanımda extractorları initialize et
         self._ensure_initialized()
+
         # Cached instance'ları kullan
         for extractor in self._extractor_instances:
             if extractor.can_handle_url(link):
@@ -59,6 +61,9 @@ class ExtractorManager:
         """
         Bağlantıları uygun çıkarıcılarla eşleştir
         """
+        # Lazy loading: İlk kullanımda extractorları initialize et
+        self._ensure_initialized()
+        
         mapping = {}
         for link in links:
             # Cached instance'ları kullan

{kekikstream-1.9.4 → kekikstream-1.9.6}/KekikStream/Plugins/RoketDizi.py

@@ -11,86 +11,74 @@ class RoketDizi(PluginBase):
     favicon     = f"https://www.google.com/s2/favicons?domain={main_url}&sz=64"
     description = "Türkiye'nin en tatlış yabancı dizi izleme sitesi. Türkçe dublaj, altyazılı, eski ve yeni yabancı dizilerin yanı sıra kore (asya) dizileri izleyebilirsiniz."
 
-
-
     main_page = {
-       "dizi/tur/aksiyon"     : "Aksiyon",
-       "dizi/tur/bilim-kurgu" : "Bilim Kurgu",
-       "dizi/tur/gerilim"     : "Gerilim",
-       "dizi/tur/fantastik"   : "Fantastik",
-       "dizi/tur/komedi"      : "Komedi",
-       "dizi/tur/korku"       : "Korku",
-       "dizi/tur/macera"      : "Macera",
-       "dizi/tur/suc"         : "Suç"
+       f"{main_url}/dizi/tur/aksiyon"     : "Aksiyon",
+       f"{main_url}/dizi/tur/bilim-kurgu" : "Bilim Kurgu",
+       f"{main_url}/dizi/tur/gerilim"     : "Gerilim",
+       f"{main_url}/dizi/tur/fantastik"   : "Fantastik",
+       f"{main_url}/dizi/tur/komedi"      : "Komedi",
+       f"{main_url}/dizi/tur/korku"       : "Korku",
+       f"{main_url}/dizi/tur/macera"      : "Macera",
+       f"{main_url}/dizi/tur/suc"         : "Suç"
     }
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
-        full_url = f"{self.main_url}/{url}?&page={page}"
-        resp     = await self.httpx.get(full_url)
-        sel      = Selector(resp.text)
+        istek  = await self.httpx.get(f"{url}?&page={page}")
+        secici = Selector(istek.text)
 
         results = []
 
-        for item in sel.css("div.w-full.p-4 span.bg-\\[\\#232323\\]"):
-             title  = item.css("span.font-normal.line-clamp-1::text").get()
-             href   = item.css("a::attr(href)").get()
-             poster = item.css("img::attr(src)").get()
-             
-             if title and href:
-                 results.append(MainPageResult(
-                     category = category,
-                     title    = title,
-                     url      = self.fix_url(href),
-                     poster   = self.fix_url(poster)
-                 ))
+        for item in secici.css("div.w-full.p-4 span.bg-\\[\\#232323\\]"):
+            title  = item.css("span.font-normal.line-clamp-1::text").get()
+            href   = item.css("a::attr(href)").get()
+            poster = item.css("img::attr(src)").get()
+
+            if title and href:
+                results.append(MainPageResult(
+                    category = category,
+                    title    = self.clean_title(title),
+                    url      = self.fix_url(href),
+                    poster   = self.fix_url(poster)
+                ))
+
         return results
 
     async def search(self, query: str) -> list[SearchResult]:
-        post_url = f"{self.main_url}/api/bg/searchContent?searchterm={query}"
-        
-        headers = {
-            "Accept"           : "application/json, text/javascript, */*; q=0.01",
-            "X-Requested-With" : "XMLHttpRequest",
-            "Referer"          : f"{self.main_url}/",
-        }
-        
-        search_req = await self.httpx.post(post_url, headers=headers)
+        istek = await self.httpx.post(
+            url     = f"{self.main_url}/api/bg/searchContent?searchterm={query}",
+            headers = {
+                "Accept"           : "application/json, text/javascript, */*; q=0.01",
+                "X-Requested-With" : "XMLHttpRequest",
+                "Referer"          : f"{self.main_url}/",
+            }
+        )
         
         try:
-            resp_json = search_req.json()
-            
-            # Response is base64 encoded!
-            if not resp_json.get("success"):
-                return []
-            
-            encoded_response = resp_json.get("response", "")
-            if not encoded_response:
+            veri    = istek.json()
+            encoded = veri.get("response", "")
+            if not encoded:
                 return []
-            
-            # Decode base64
-            decoded = base64.b64decode(encoded_response).decode('utf-8')
-            data = json.loads(decoded)
-            
-            if not data.get("state"):
+
+            decoded = base64.b64decode(encoded).decode("utf-8")
+            veri    = json.loads(decoded)
+
+            if not veri.get("state"):
                 return []
-            
+
             results = []
-            result_items = data.get("result", [])
-            
-            for item in result_items:
-                title = item.get("object_name", "")
-                slug = item.get("used_slug", "")
+
+            for item in veri.get("result", []):
+                title  = item.get("object_name", "")
+                slug   = item.get("used_slug", "")
                 poster = item.get("object_poster_url", "")
-                
+
                 if title and slug:
-                    # Construct full URL from slug
-                    full_url = f"{self.main_url}/{slug}"
                     results.append(SearchResult(
-                        title  = title.strip(),
-                        url    = full_url,
+                        title  = self.clean_title(title.strip()),
+                        url    = self.fix_url(f"{self.main_url}/{slug}"),
                         poster = self.fix_url(poster) if poster else None
                     ))
-            
+
             return results
 
         except Exception:
@@ -100,24 +88,24 @@ class RoketDizi(PluginBase):
         # Note: Handling both Movie and Series logic in one, returning SeriesInfo generally or MovieInfo
         resp = await self.httpx.get(url)
         sel  = Selector(resp.text)
-        
+
         title       = sel.css("h1.text-white::text").get()
         poster      = sel.css("div.w-full.page-top img::attr(src)").get()
         description = sel.css("div.mt-2.text-sm::text").get()
-        
+
         # Tags - genre bilgileri (Detaylar bölümünde)
         tags = []
         genre_text = sel.css("h3.text-white.opacity-90::text").get()
         if genre_text:
             tags = [t.strip() for t in genre_text.split(",")]
-        
+
         # Rating
-        rating = sel.css("div.flex.items-center span.text-white.text-sm::text").get()
-        
+        rating = sel.css("span.text-white.text-sm.font-bold::text").get()
+
         # Year ve Actors - Detaylar (Details) bölümünden
         year = None
         actors = []
-        
+
         # Detaylar bölümündeki tüm flex-col div'leri al
         detail_items = sel.css("div.flex.flex-col")
         for item in detail_items:
@@ -144,7 +132,7 @@ class RoketDizi(PluginBase):
         # Check urls for episodes
         all_urls = re.findall(r'"url":"([^"]*)"', resp.text)
         is_series = any("bolum-" in u for u in all_urls)
-        
+
         episodes = []
         if is_series:
             # Dict kullanarak duplicate'leri önle ama sıralı tut
@@ -153,10 +141,10 @@ class RoketDizi(PluginBase):
                 if "bolum" in u and u not in episodes_dict:
                     season_match = re.search(r'/sezon-(\d+)', u)
                     ep_match     = re.search(r'/bolum-(\d+)', u)
-                    
+
                     season = int(season_match.group(1)) if season_match else 1
                     episode_num = int(ep_match.group(1)) if ep_match else 1
-                    
+
                     # Key olarak (season, episode) tuple kullan
                     key = (season, episode_num)
                     episodes_dict[key] = Episode(
@@ -165,10 +153,10 @@ class RoketDizi(PluginBase):
                         title   = f"{season}. Sezon {episode_num}. Bölüm",
                         url     = self.fix_url(u)
                     )
-            
+
             # Sıralı liste oluştur
             episodes = [episodes_dict[key] for key in sorted(episodes_dict.keys())]
-        
+
         return SeriesInfo(
             title       = title,
             url         = url,
@@ -188,31 +176,51 @@ class RoketDizi(PluginBase):
         next_data = sel.css("script#__NEXT_DATA__::text").get()
         if not next_data:
             return []
-            
+
         try:
             data = json.loads(next_data)
             secure_data = data["props"]["pageProps"]["secureData"]
-            decoded = base64.b64decode(secure_data).decode('utf-8')
-            
+            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", [])
+
             results = []
-            matches = re.findall(r'iframe src=\\"([^"]*)\\"', decoded)
-            for m in matches:
-                iframe_url = m.replace('\\', '')
+            for source in sources:
+                source_content = source.get("source_content", "")
+
+                # iframe URL'ini source_content'ten çıkar
+                iframe_match = re.search(r'<iframe[^>]*src=["\']([^"\']*)["\']', source_content)
+                if not iframe_match:
+                    continue
+
+                iframe_url = iframe_match.group(1)
                 if "http" not in iframe_url:
                      if iframe_url.startswith("//"):
                          iframe_url = "https:" + iframe_url
                      else:
-                         iframe_url = "https://" + iframe_url # fallback
-                
+                         iframe_url = "https://" + iframe_url
+
                 # Check extractor
                 extractor = self.ex_manager.find_extractor(iframe_url)
-                name = extractor.name if extractor else "Iframe"
-                
+
+                # Metadata'dan bilgileri al
+                source_name   = source.get("source_name", extractor.name if extractor else "Iframe")
+                language_name = source.get("language_name", "")
+                quality_name  = source.get("quality_name", "")
+
+                # İsmi oluştur
+                name_parts = [source_name]
+                if language_name:
+                    name_parts.append(language_name)
+                if quality_name:
+                    name_parts.append(quality_name)
+
                 results.append({
-                    "url": iframe_url,
-                    "name": name
+                    "url"  : iframe_url,
+                    "name" : " | ".join(name_parts)
                 })
-            
+
             return results
 
         except Exception:

{kekikstream-1.9.4 → kekikstream-1.9.6}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 1.9.4
+Version: 1.9.6
 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

{kekikstream-1.9.4 → kekikstream-1.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 1.9.4
+Version: 1.9.6
 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

{kekikstream-1.9.4 → kekikstream-1.9.6}/setup.py

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