KekikStream 2.0.0__tar.gz → 2.0.1__tar.gz

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Core/Extractor/ExtractorLoader.py

@@ -60,9 +60,10 @@ class ExtractorLoader:
             if file.endswith(".py") and not file.startswith("__"):
                 module_name = file[:-3] # .py uzantısını kaldır
                 # konsol.log(f"[cyan]Okunan Dosya\t\t: {module_name}[/cyan]")
-                if extractor := self._load_extractor(directory, module_name):
-                    # konsol.log(f"[magenta]Extractor Yüklendi\t: {extractor.__name__}[/magenta]")
-                    extractors.append(extractor)
+                module_extractors = self._load_extractor(directory, module_name)
+                if module_extractors:
+                    # konsol.log(f"[magenta]Extractor Yüklendi\t: {[e.__name__ for e in module_extractors]}[/magenta]")
+                    extractors.extend(module_extractors)
 
         # konsol.log(f"[yellow]{directory} dizininden yüklenen Extractor'lar: {[e.__name__ for e in extractors]}[/yellow]")
         return extractors
@@ -73,21 +74,25 @@ class ExtractorLoader:
             path = directory / f"{module_name}.py"
             spec = importlib.util.spec_from_file_location(module_name, path)
             if not spec or not spec.loader:
-                return None
+                return []
 
             # Modülü içe aktar
             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
+            # Yalnızca doğru modülden gelen ExtractorBase sınıflarını yükle (TÜM CLASS'LAR)
+            extractors = []
             for attr in dir(module):
                 obj = getattr(module, attr)
-                if obj.__module__ == module_name and isinstance(obj, type) and issubclass(obj, ExtractorBase) and obj is not ExtractorBase:
+                # isinstance kontrolünü __module__ kontrolünden ÖNCE yap
+                if isinstance(obj, type) and issubclass(obj, ExtractorBase) and obj is not ExtractorBase and obj.__module__ == module_name:
                     # konsol.log(f"[green]Yüklenen sınıf\t\t: {module_name}.{obj.__name__} ({obj.__module__}.{obj.__name__})[/green]")
-                    return obj
+                    extractors.append(obj)
+            
+            return extractors
 
         except Exception as hata:
             konsol.log(f"[red][!] Extractor yüklenirken hata oluştu: {module_name}\nHata: {hata}")
             konsol.print(f"[dim]{traceback.format_exc()}[/dim]")
 
-        return None
+        return []

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Extractors/CloseLoad.py

@@ -6,7 +6,7 @@ import re
 
 class CloseLoadExtractor(ExtractorBase):
     name     = "CloseLoad"
-    main_url = "https://closeload.filmmakinesi.sh"
+    main_url = "https://closeload.filmmakinesi.to"
 
     async def extract(self, url, referer=None) -> ExtractResult:
         if referer:

kekikstream-2.0.1/KekikStream/Extractors/ContentX_.py

@@ -0,0 +1,40 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Extractors.ContentX import ContentX
+
+# DPlayer82 Family - https://dplayer82.site subdomains
+class SNDPlayer(ContentX):
+    name     = "SNDPlayer"
+    main_url = "https://sn.dplayer82.site"
+
+class FourDPlayer(ContentX):
+    name     = "FourDPlayer"
+    main_url = "https://four.dplayer82.site"
+
+class ORGDPlayer(ContentX):
+    name     = "ORGDPlayer"
+    main_url = "https://org.dplayer82.site"
+
+# Hotlinger
+class Hotlinger(ContentX):
+    name     = "Hotlinger"
+    main_url = "https://hotlinger.com"
+
+# Pichive Family
+class Pichive(ContentX):
+    name     = "Pichive"
+    main_url = "https://pichive.me"
+
+class FourPichive(ContentX):
+    name     = "FourPichive"
+    main_url = "https://four.pichive.me"
+
+# PlayRu Family
+class FourPlayRu(ContentX):
+    name     = "FourPlayRu"
+    main_url = "https://four.playru.net"
+
+# CX Family
+class FourCX(ContentX):
+    name     = "FourCX"
+    main_url = "https://four.contentx.me"

kekikstream-2.0.0/KekikStream/Extractors/OkRuHTTP.py → kekikstream-2.0.1/KekikStream/Extractors/Odnoklassniki_.py

@@ -4,4 +4,8 @@ from KekikStream.Extractors.Odnoklassniki import Odnoklassniki
 
 class OkRuHTTP(Odnoklassniki):
     name     = "OkRuHTTP"
-    main_url = "http://ok.ru"
+    main_url = "http://ok.ru"
+
+class OkRuSSL(Odnoklassniki):
+    name     = "OkRuSSL"
+    main_url = "https://ok.ru"

kekikstream-2.0.0/KekikStream/Extractors/HDStreamAble.py → kekikstream-2.0.1/KekikStream/Extractors/PeaceMakerst_.py

@@ -4,4 +4,4 @@ from KekikStream.Extractors.PeaceMakerst import PeaceMakerst
 
 class HDStreamAble(PeaceMakerst):
     name     = "HDStreamAble"
-    main_url = "https://hdstreamable.com"
+    main_url = "https://hdstreamable.com"

kekikstream-2.0.1/KekikStream/Extractors/RapidVid_.py

@@ -0,0 +1,7 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Extractors.RapidVid import RapidVid
+
+class RapidFilm(RapidVid):
+    name     = "RapidFilm"
+    main_url = "https://rapid.filmmakinesi.to"

kekikstream-2.0.0/KekikStream/Extractors/VidMolyMe.py → kekikstream-2.0.1/KekikStream/Extractors/VidMoly_.py

@@ -4,4 +4,4 @@ from KekikStream.Extractors.VidMoly import VidMoly
 
 class VidMolyMe(VidMoly):
     name     = "VidMolyMe"
-    main_url = "https://vidmoly.me"
+    main_url = "https://vidmoly.me"

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Plugins/Dizilla.py

@@ -137,7 +137,7 @@ class Dizilla(PluginBase):
         year        = veri.get("datePublished").split("-")[0]
         
         # Tags extraction from page content (h3 tag)
-        tags_raw = secici.css("h3.text-white.opacity-60::text").get()
+        tags_raw = secici.css("div.poster.poster h3::text").get()
         tags     = [t.strip() for t in tags_raw.split(",")] if tags_raw else []
 
         rating = veri.get("aggregateRating", {}).get("ratingValue")

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Plugins/FilmMakinesi.py

@@ -83,6 +83,7 @@ class FilmMakinesi(PluginBase):
             rating = rating.strip().split()[0]
         year        = secici.css("span.date a::text").get().strip()
         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()
@@ -92,6 +93,7 @@ class FilmMakinesi(PluginBase):
             poster      = self.fix_url(poster),
             title       = self.clean_title(title),
             description = description,
+            tags        = tags,
             rating      = rating,
             year        = year,
             actors      = actors,

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Plugins/JetFilmizle.py

@@ -74,8 +74,15 @@ class JetFilmizle(PluginBase):
         rating_raw  = secici.css("section.movie-exp div.imdb_puan span::text").get()
         rating      = rating_raw.strip() if rating_raw else None
         
-        year        = secici.xpath("//div[@class='yap' and (contains(., 'Vizyon') or contains(., 'Yapım'))]/text()").get()
-        year        = year.strip() if year else None
+        
+        # Year - div.yap içinde 4 haneli sayı ara
+        year_div = secici.xpath("//div[@class='yap' and (contains(., 'Vizyon') or contains(., 'Yapım'))]/text()").get()
+        year = None
+        if year_div:
+            year_match = re.search(r'(\d{4})', year_div.strip())
+            if year_match:
+                year = year_match.group(1)
+        
         actors      = secici.css("div[itemprop='actor'] a span::text").getall()
 
         return MovieInfo(
@@ -93,42 +100,50 @@ class JetFilmizle(PluginBase):
         istek  = await self.httpx.get(url)
         secici = Selector(istek.text)
 
-        iframes = []
-        if main_iframe := secici.css("div#movie iframe::attr(data-src), div#movie iframe::attr(data), div#movie iframe::attr(src)").get():
-            iframes.append(self.fix_url(main_iframe))
+        results = []
 
-        for part in secici.css("div.film_part a"):
-            part_href = part.attrib.get("href")
-            if not part_href:
+        # 1) Ana iframe'leri kontrol et
+        for iframe in secici.css("iframe"):
+            src = (iframe.css("::attr(src)").get() or 
+                   iframe.css("::attr(data-src)").get() or
+                   iframe.css("::attr(data-lazy-src)").get())
+            
+            if src and src != "about:blank":
+                iframe_url = self.fix_url(src)
+                extractor = self.ex_manager.find_extractor(iframe_url)
+                results.append({
+                    "url": iframe_url,
+                    "name": extractor.name if extractor else "Ana Player"
+                })
+
+        # 2) Sayfa numaralarından linkleri topla (Fragman hariç)
+        page_links = []
+        for link in secici.css("a.post-page-numbers"):
+            isim = link.css("span::text").get() or ""
+            if isim != "Fragman":
+                href = link.css("::attr(href)").get()
+                if href:
+                    page_links.append((self.fix_url(href), isim))
+
+        # 3) Her sayfa linkindeki iframe'leri bul
+        for page_url, isim in page_links:
+            try:
+                page_resp = await self.httpx.get(page_url)
+                page_sel = Selector(page_resp.text)
+                
+                for iframe in page_sel.css("div#movie iframe"):
+                    src = (iframe.css("::attr(src)").get() or 
+                           iframe.css("::attr(data-src)").get() or
+                           iframe.css("::attr(data-lazy-src)").get())
+                    
+                    if src and src != "about:blank":
+                        iframe_url = self.fix_url(src)
+                        extractor = self.ex_manager.find_extractor(iframe_url)
+                        results.append({
+                            "url": iframe_url,
+                            "name": f"{extractor.name if extractor else 'Player'} | {isim}"
+                        })
+            except Exception:
                 continue
 
-            part_istek  = await self.httpx.get(part_href)
-            part_secici = Selector(part_istek.text)
-
-            if iframe := part_secici.css("div#movie iframe::attr(data-src), div#movie iframe::attr(data), div#movie iframe::attr(src)").get():
-                iframes.append(self.fix_url(iframe))
-            else:
-                for link in part_secici.css("div#movie p a"):
-                    if download_link := link.attrib.get("href"):
-                        iframes.append(self.fix_url(download_link))
-
-        processed_iframes = []
-        for iframe in iframes:
-            if "jetv.xyz" in iframe:
-                jetv_istek  = await self.httpx.get(iframe)
-                jetv_secici = Selector(jetv_istek.text)
-
-                if jetv_iframe := jetv_secici.css("iframe::attr(src)").get():
-                    processed_iframes.append(self.fix_url(jetv_iframe))
-            else:
-                processed_iframes.append(iframe)
-
-        results = []
-        for idx, iframe in enumerate(processed_iframes):
-            extractor = self.ex_manager.find_extractor(iframe)
-            results.append({
-                "url"  : iframe,
-                "name" : f"{extractor.name if extractor else f'Player {idx + 1}'}"
-            })
-
         return results

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Plugins/Sinefy.py

@@ -153,6 +153,7 @@ class Sinefy(PluginBase):
         tags        = sel.css("div.item.categories a::text").getall()
         rating      = sel.css("span.color-imdb::text").get()
         actors      = sel.css("div.content h5::text").getall()
+        year        = sel.css("span.item.year::text").get()  # Year bilgisi eklendi
         
         episodes = []
         season_elements = sel.css("section.episodes-box")
@@ -207,6 +208,7 @@ class Sinefy(PluginBase):
                 rating   = rating,
                 tags     = tags,
                 actors   = actors,
+                year     = year,
                 episodes = episodes
             )
         else:
@@ -217,7 +219,8 @@ class Sinefy(PluginBase):
                 description = description,
                 rating      = rating,
                 tags        = tags,
-                actors      = actors
+                actors      = actors,
+                year        = year
             )
 
     async def load_links(self, url: str) -> list[dict]:

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream/Plugins/Sinezy.py

@@ -94,6 +94,20 @@ class Sinezy(PluginBase):
 
         tags   = sel.css("div.detail span a::text").getall()
         actors = sel.css("span.oyn p::text").getall()        # Might need splitting logic
+        
+        year = None
+        info_text = sel.css("span.info::text").get()
+        if info_text:
+            year_match = re.search(r'\b(19\d{2}|20\d{2})\b', info_text)
+            if year_match:
+                year = year_match.group(1)
+        
+        # Bulunamadıysa tüm sayfada ara
+        if not year:
+            all_text = " ".join(sel.css("::text").getall())
+            year_match = re.search(r'\b(19\d{2}|20\d{2})\b', all_text)
+            if year_match:
+                year = year_match.group(1)
 
         return MovieInfo(
             title       = title,
@@ -102,7 +116,8 @@ class Sinezy(PluginBase):
             description = description,
             tags        = tags,
             rating      = rating,
-            actors      = actors
+            actors      = actors,
+            year        = year
         )
 
     async def load_links(self, url: str) -> list[dict]:

{kekikstream-2.0.0 → kekikstream-2.0.1}/KekikStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.0.0
+Version: 2.0.1
 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-2.0.0 → kekikstream-2.0.1}/KekikStream.egg-info/SOURCES.txt

@@ -27,29 +27,24 @@ KekikStream/Core/Plugin/PluginModels.py
 KekikStream/Core/UI/UIManager.py
 KekikStream/Extractors/CloseLoad.py
 KekikStream/Extractors/ContentX.py
+KekikStream/Extractors/ContentX_.py
 KekikStream/Extractors/DzenRu.py
 KekikStream/Extractors/ExPlay.py
 KekikStream/Extractors/FirePlayer.py
-KekikStream/Extractors/FourCX.py
-KekikStream/Extractors/FourPichive.py
-KekikStream/Extractors/FourPlayRu.py
 KekikStream/Extractors/HDPlayerSystem.py
-KekikStream/Extractors/HDStreamAble.py
-KekikStream/Extractors/Hotlinger.py
 KekikStream/Extractors/JetTv.py
 KekikStream/Extractors/MailRu.py
 KekikStream/Extractors/MixPlayHD.py
 KekikStream/Extractors/MixTiger.py
 KekikStream/Extractors/MolyStream.py
 KekikStream/Extractors/Odnoklassniki.py
-KekikStream/Extractors/OkRuHTTP.py
-KekikStream/Extractors/OkRuSSL.py
+KekikStream/Extractors/Odnoklassniki_.py
 KekikStream/Extractors/PeaceMakerst.py
-KekikStream/Extractors/Pichive.py
+KekikStream/Extractors/PeaceMakerst_.py
 KekikStream/Extractors/PixelDrain.py
-KekikStream/Extractors/PlayRu.py
 KekikStream/Extractors/PlayerFilmIzle.py
 KekikStream/Extractors/RapidVid.py
+KekikStream/Extractors/RapidVid_.py
 KekikStream/Extractors/SetPlay.py
 KekikStream/Extractors/SetPrime.py
 KekikStream/Extractors/SibNet.py
@@ -60,7 +55,7 @@ KekikStream/Extractors/TurboImgz.py
 KekikStream/Extractors/TurkeyPlayer.py
 KekikStream/Extractors/VidHide.py
 KekikStream/Extractors/VidMoly.py
-KekikStream/Extractors/VidMolyMe.py
+KekikStream/Extractors/VidMoly_.py
 KekikStream/Extractors/VidMoxy.py
 KekikStream/Extractors/VidPapi.py
 KekikStream/Extractors/VideoSeyred.py

{kekikstream-2.0.0 → kekikstream-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.0.0
+Version: 2.0.1
 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-2.0.0 → kekikstream-2.0.1}/setup.py

@@ -6,7 +6,7 @@ from io         import open
 setup(
     # ? Genel Bilgiler
     name         = "KekikStream",
-    version      = "2.0.0",
+    version      = "2.0.1",
     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.0.0/KekikStream/Extractors/FourCX.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.ContentX import ContentX
-
-class FourCX(ContentX):
-    name     = "FourCX"
-    main_url = "https://four.contentx.me"

kekikstream-2.0.0/KekikStream/Extractors/FourPichive.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.ContentX import ContentX
-
-class FourPichive(ContentX):
-    name     = "FourPichive"
-    main_url = "https://four.pichive.online"

kekikstream-2.0.0/KekikStream/Extractors/FourPlayRu.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.ContentX import ContentX
-
-class FourPlayRu(ContentX):
-    name     = "FourPlayRu"
-    main_url = "https://four.playru.net"

kekikstream-2.0.0/KekikStream/Extractors/Hotlinger.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.ContentX import ContentX
-
-class Hotlinger(ContentX):
-    name     = "Hotlinger"
-    main_url = "https://hotlinger.com"

kekikstream-2.0.0/KekikStream/Extractors/OkRuSSL.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.Odnoklassniki import Odnoklassniki
-
-class OkRuSSL(Odnoklassniki):
-    name     = "OkRuSSL"
-    main_url = "https://ok.ru"

kekikstream-2.0.0/KekikStream/Extractors/Pichive.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.ContentX import ContentX
-
-class Pichive(ContentX):
-    name     = "Pichive"
-    main_url = "https://pichive.online"

kekikstream-2.0.0/KekikStream/Extractors/PlayRu.py

@@ -1,7 +0,0 @@
-# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-from KekikStream.Extractors.ContentX import ContentX
-
-class PlayRu(ContentX):
-    name     = "PlayRu"
-    main_url = "https://playru.net"