KekikStream 2.4.0__tar.gz → 2.4.1__tar.gz

kekikstream-2.4.1/KekikStream/Extractors/HotStream.py

@@ -0,0 +1,45 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult, HTMLHelper
+from Kekik.Sifreleme import AESManager
+import re
+import json
+
+class HotStream(ExtractorBase):
+    name     = "HotStream"
+    main_url = "https://hotstream.club"
+
+    async def extract(self, url: str, referer: str = None) -> ExtractResult | None:
+        if referer:
+            self.httpx.headers.update({"Referer": referer})
+
+        istek = await self.httpx.get(url)
+        html = istek.text
+        helper = HTMLHelper(html)
+
+        m = re.search(r"bePlayer\('([^']+)',\s*'(\{[^']+\})'\)", html)
+        if not m:
+             # Try double quotes just in case
+             m = re.search(r'bePlayer\("([^"]+)",\s*"(\{[^"]+\})"\)', html)
+             
+        if m:
+            pass_val = m.group(1)
+            data_val = m.group(2)
+            
+            try:
+                decrypted = AESManager.decrypt(data_val, pass_val)
+                if decrypted:
+                    decrypted = decrypted.replace("\\", "")
+                    # Search for video_location in decrypted string
+                    m_loc = re.search(r'"video_location":"([^"]+)"', decrypted)
+                    if m_loc:
+                        video_url = m_loc.group(1).replace(r"\/", "/")
+                        return ExtractResult(
+                            name    = self.name,
+                            url     = video_url,
+                            referer = url
+                        )
+            except Exception:
+                pass
+
+        return None

kekikstream-2.4.1/KekikStream/Extractors/Vidoza.py

@@ -0,0 +1,25 @@
+# Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
+
+from KekikStream.Core import ExtractorBase, ExtractResult, HTMLHelper
+
+class Vidoza(ExtractorBase):
+    name     = "Vidoza"
+    main_url = "https://vidoza.net"
+
+    async def extract(self, url: str, referer: str = None) -> ExtractResult | None:
+        if referer:
+            self.httpx.headers.update({"Referer": referer})
+
+        istek  = await self.httpx.get(url)
+        helper = HTMLHelper(istek.text)
+        
+        video_url = helper.select_attr("source", "src")
+        
+        if video_url:
+            return ExtractResult(
+                name    = self.name,
+                url     = video_url,
+                referer = url
+            )
+            
+        return None

{kekikstream-2.4.0 → kekikstream-2.4.1}/KekikStream/Plugins/DiziMom.py

@@ -77,15 +77,16 @@ class DiziMom(PluginBase):
         rating = None
         actors = None
         
-        # Regex approach for specific fields might be safer/easier if structure varies
-        # Matches: Yapım Yılı : </span> 2025
-        year_val = helper.regex_first(r"Yapım Yılı\s*:\s*(?:</span>)?\s*(\d{4})")
-        if year_val:
-            year = int(year_val)
+        # Regex approach based on debug output (multiline support)
+        # Context: <span class="dizimeta"><i class="fas fa-globe"></i> Yapım Yılı : </span>\n 2022
+        year_val_all = helper.regex_all(r"Yapım Yılı\s*:\s*(?:</span>)?\s*(\d{4})", flags=re.DOTALL)
+        if year_val_all:
+             year = int(year_val_all[0])
             
-        rating_val = helper.regex_first(r"IMDB\s*:\s*([\d\.]+)")
-        if rating_val:
-            rating = rating_val
+        # Context: <span class="dizimeta"><i class="fas fa-star"></i> IMDB : </span>\n 4.5
+        rating_val_all = helper.regex_all(r"IMDB\s*:\s*(?:</span>)?\s*([\d\.]+)", flags=re.DOTALL)
+        if rating_val_all:
+            rating = rating_val_all[0]
             
         actors_val = helper.regex_first(r"Oyuncular\s*:\s*(.+?)(?:</div>|<br|$)")
         if not actors_val:
@@ -127,8 +128,6 @@ class DiziMom(PluginBase):
              
              # Clean footer text start
              # The footer block usually starts with "Dizimom, dizi ve film..."
-             # If we find "Dizimom," and it's not at the start (meaning it's part of the footer appended), split there.
-             # Note: The description might legitimately start with "Dizimom," strictly speaking, but unlikely for a series description.
              if "Dizimom," in description_raw:
                  description = description_raw.split("Dizimom,")[0].strip()
              elif "dizi izle film izle" in description_raw:

{kekikstream-2.4.0 → kekikstream-2.4.1}/KekikStream/Plugins/Filmatek.py

@@ -3,6 +3,7 @@
 from KekikStream.Core import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult, HTMLHelper
 import re
 from json import loads
+from urllib.parse import unquote
 
 class Filmatek(PluginBase):
     name        = "Filmatek"
@@ -97,8 +98,15 @@ class Filmatek(PluginBase):
         year_text = helper.select_text("span.date")
         year = year_text.strip()[-4:] if year_text else None
         
-        score_text = helper.select_text("span.dt_rating_vmanual")
-        rating = score_text.strip() if score_text else None
+        # Rating extraction updated
+        rating = helper.select_text("span.dt_rating_vgs") or helper.select_text("span.dt_rating_vmanual")
+        
+        # Duration extraction
+        duration = None
+        duration_text = helper.select_text("span.runtime")
+        if duration_text:
+            # "80 Dak." -> "80"
+            duration = duration_text.split()[0]
 
         tags = helper.select_all_text("div.sgeneros a")
 
@@ -118,6 +126,7 @@ class Filmatek(PluginBase):
             poster      = poster,
             year        = year,
             rating      = rating,
+            duration    = duration,
             tags        = tags,
             actors      = actors
         )
@@ -169,6 +178,14 @@ class Filmatek(PluginBase):
                         
                     iframe_url = self.fix_url(iframe_url)
                     
+                    # Unwrap internal JWPlayer
+                    if "jwplayer/?source=" in iframe_url:
+                        try:
+                            raw_source = iframe_url.split("source=")[1].split("&")[0]
+                            iframe_url = unquote(raw_source)
+                        except:
+                            pass
+                    
                     extracted = await self.extract(iframe_url)
                     if extracted:
                         if isinstance(extracted, list):

{kekikstream-2.4.0 → kekikstream-2.4.1}/KekikStream/Plugins/Full4kizle.py

@@ -11,16 +11,31 @@ class Full4kizle(PluginBase):
     description = "Filmci Baba, film izleme sitesi 4k Full film izle, 1080p ve 4k kalite de sinema filmleri ve dizileri, tek parça hd kalitede türkçe dublajlı filmler seyret."
 
     main_page = {
-        f"{main_url}/Kategori/en-populer-filmler/page"        : "En Popüler Filmler",
-        f"{main_url}/Kategori/vizyondaki-filmler-izle/page"   : "Vizyondaki Filmler",
-        f"{main_url}/Kategori/yerli-filmler-izle/page"        : "Yerli Filmler",
-        f"{main_url}/Kategori/yabanci-diziler/page"           : "Yabancı Diziler",
-        f"{main_url}/Kategori/netflix-filmleri-izle/page"     : "Netflix Filmleri",
-        f"{main_url}/Kategori/netflix-dizileri/page"          : "Netflix Dizileri",
-        f"{main_url}/Kategori/anime-izle/page"                : "Anime İzle",
-        f"{main_url}/Kategori/cizgi-filmler/page"             : "Çizgi Filmler",
+        f"{main_url}/Kategori/en-populer-filmler/page"              : "En Popüler Filmler",
+        f"{main_url}/Kategori/tur/aksiyon-filmleri/page"            : "Aksiyon",
+        f"{main_url}/Kategori/tur/macera-filmleri/page"             : "Macera",
+        f"{main_url}/Kategori/tur/bilim-kurgu-filmleri/page"        : "Bilim Kurgu",
+        f"{main_url}/Kategori/tur/fantastik-filmler/page"           : "Fantastik",
+        f"{main_url}/Kategori/tur/korku-filmleri/page"              : "Korku",
+        f"{main_url}/Kategori/tur/gerilim-filmleri-hd/page"         : "Gerilim",
+        f"{main_url}/Kategori/tur/gizem-filmleri/page"              : "Gizem",
+        f"{main_url}/Kategori/tur/dram-filmleri-hd/page"            : "Dram",
+        f"{main_url}/Kategori/tur/komedi-filmleri-hd/page"          : "Komedi",
+        f"{main_url}/Kategori/tur/romantik-filmler/page"            : "Romantik",
+        f"{main_url}/Kategori/tur/aile-filmleri/page"               : "Aile",
+        f"{main_url}/Kategori/tur/animasyon-filmleri/page"          : "Animasyon",
+        f"{main_url}/Kategori/tur/biyografi-filmleri/page"          : "Biyografi",
+        f"{main_url}/Kategori/tur/polisiye-suc-filmleri/page"       : "Polisiye / Suç",
+        f"{main_url}/Kategori/tur/savas-filmleri/page"              : "Savaş",
+        f"{main_url}/Kategori/tur/western-filmler/page"             : "Western",
+        f"{main_url}/Kategori/tur/hint-filmleri/page"               : "Hint Filmleri",
+        f"{main_url}/Kategori/tur/kore-filmleri/page"               : "Kore Filmleri",
+        f"{main_url}/Kategori/tur/yerli-filmler-izle/page"          : "Yerli Filmler",
+        f"{main_url}/Kategori/tur/yerli-diziler/page"               : "Yerli Diziler",
+        f"{main_url}/Kategori/tur/18-erotik-filmler/page"           : "+18 Erotik Filmler",
     }
 
+
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         target_url = f"{url}/{page}/"
         istek = await self.httpx.get(target_url)
@@ -92,14 +107,81 @@ class Full4kizle(PluginBase):
         
         description = helper.select_text(".excerpt p")
         
-        year_text = helper.select_text(".release a")
-        year = year_text.strip() if year_text else None
+        # Robust metadata extraction using Regex
+        
+        # Initialize year first
+        year = None
         
+        # Try .release first (legacy) or directly regex
+        rel_text = helper.select_text(".release")
+        if rel_text:
+             m_y = re.search(r"(\d{4})", rel_text)
+             if m_y: year = m_y.group(1)
+             
+        # Year fallbacks
+        if not year:
+            # Try finding year in text like "Yapım: 2024" or just isolated year in release date
+            m_year = helper.regex_first(r"Yapım:\s*(\d{4})") or helper.regex_first(r"Yıl:\s*(\d{4})")
+            if m_year:
+                year = m_year
+
+        # Rating
         rating_text = helper.select_text(".imdb-rating")
-        rating = None
         if rating_text:
-            rating_text = rating_text.replace("IMDB Puanı", "").strip()
-            rating = rating_text
+            rating = rating_text.replace("IMDB Puanı", "").strip()
+        else:
+            rating = helper.regex_first(r"IMDB\s*:\s*([\d\.]+)")
+
+        # Duration
+        duration = None
+        duration_val = helper.regex_first(r"Süre:\s*(\d+)")
+        if duration_val:
+            duration = int(duration_val)
+
+        # Actors - Extract from actor links
+        actors = None
+        actors_list = []
+        
+        # Site uses: <a href=".../oyuncular/...">Actor Name</a>
+        actor_els = helper.select("a[href*='/oyuncular/']")
+        if actor_els:
+            actors_list = [el.text(strip=True) for el in actor_els if el.text(strip=True)]
+        
+        # Fallback: Try .cast-list selector
+        if not actors_list:
+            actor_els = helper.select(".cast-list .actor-name, .cast-list a")
+            if actor_els:
+                actors_list = [el.text(strip=True) for el in actor_els if el.text(strip=True)]
+        
+        if actors_list:
+            actors = ", ".join(actors_list)
+
+
+        # Tags (Genres) - Extract from genre links
+        tags = None
+        tags_list = []
+        
+        # Site uses: <a href=".../tur/...">Genre Name</a> or <a href=".../Kategori/tur/...">
+        tag_els = helper.select("a[href*='/tur/'], a[href*='/Kategori/tur/']")
+        if tag_els:
+            tags_list = [el.text(strip=True) for el in tag_els if el.text(strip=True)]
+        
+        # Fallback: Try .genres selector
+        if not tags_list:
+            tag_els = helper.select(".genres a, .genre a")
+            if tag_els:
+                tags_list = [el.text(strip=True) for el in tag_els if el.text(strip=True)]
+        
+        # Remove duplicates while preserving order
+        if tags_list:
+            seen = set()
+            unique_tags = []
+            for tag in tags_list:
+                if tag not in seen:
+                    seen.add(tag)
+                    unique_tags.append(tag)
+            tags = unique_tags if unique_tags else None
+
             
         # Check for Episodes to decide if Series or Movie
         ep_elements = helper.select(".parts-middle a, .parts-middle .part.active")
@@ -113,8 +195,9 @@ class Full4kizle(PluginBase):
                 poster      = poster,
                 year        = year,
                 rating      = rating,
-                tags        = None, # Tags usually in genres list, implementation skipped for now or add if easy
-                actors      = None  # Actors not extracted in Kotlin reference provided
+                duration    = duration,
+                tags        = tags,
+                actors      = actors
             )
         else:
             # Series
@@ -155,8 +238,9 @@ class Full4kizle(PluginBase):
                 poster      = poster,
                 year        = year,
                 rating      = rating,
-                tags        = None,
-                actors      = None,
+                duration    = duration,
+                tags        = tags,
+                actors      = actors,
                 episodes    = episodes
             )
 

{kekikstream-2.4.0 → kekikstream-2.4.1}/KekikStream/Plugins/Watch32.py

@@ -12,12 +12,34 @@ class Watch32(PluginBase):
     description = "Watch Your Favorite Movies & TV Shows Online - Streaming For Free. With Movies & TV Shows Full HD. Find Your Movies & Watch NOW!"
 
     main_page = {
-        f"{main_url}/movie?page="      : "Popular Movies",
-        f"{main_url}/tv-show?page="    : "Popular TV Shows",
-        f"{main_url}/coming-soon?page=" : "Coming Soon",
-        f"{main_url}/top-imdb?page="   : "Top IMDB Rating",
+        # Main Categories
+        f"{main_url}/movie?page="           : "Popular Movies",
+        f"{main_url}/tv-show?page="         : "Popular TV Shows",
+        f"{main_url}/coming-soon?page="     : "Coming Soon",
+        f"{main_url}/top-imdb?page="        : "Top IMDB Rating",
+        # Genre Categories
+        f"{main_url}/genre/action?page="    : "Action",
+        f"{main_url}/genre/adventure?page=" : "Adventure",
+        f"{main_url}/genre/animation?page=" : "Animation",
+        f"{main_url}/genre/biography?page=" : "Biography",
+        f"{main_url}/genre/comedy?page="    : "Comedy",
+        f"{main_url}/genre/crime?page="     : "Crime",
+        f"{main_url}/genre/documentary?page=" : "Documentary",
+        f"{main_url}/genre/drama?page="     : "Drama",
+        f"{main_url}/genre/family?page="    : "Family",
+        f"{main_url}/genre/fantasy?page="   : "Fantasy",
+        f"{main_url}/genre/history?page="   : "History",
+        f"{main_url}/genre/horror?page="    : "Horror",
+        f"{main_url}/genre/music?page="     : "Music",
+        f"{main_url}/genre/mystery?page="   : "Mystery",
+        f"{main_url}/genre/romance?page="   : "Romance",
+        f"{main_url}/genre/science-fiction?page=" : "Science Fiction",
+        f"{main_url}/genre/thriller?page="  : "Thriller",
+        f"{main_url}/genre/war?page="       : "War",
+        f"{main_url}/genre/western?page="   : "Western",
     }
 
+
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = await self.httpx.get(f"{url}{page}")
         helper = HTMLHelper(istek.text)

{kekikstream-2.4.0 → kekikstream-2.4.1}/KekikStream.egg-info/PKG-INFO

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

@@ -35,6 +35,7 @@ KekikStream/Extractors/ExPlay.py
 KekikStream/Extractors/Filemoon.py
 KekikStream/Extractors/HDMomPlayer.py
 KekikStream/Extractors/HDPlayerSystem.py
+KekikStream/Extractors/HotStream.py
 KekikStream/Extractors/JFVid.py
 KekikStream/Extractors/JetTv.py
 KekikStream/Extractors/MailRu.py
@@ -61,6 +62,7 @@ KekikStream/Extractors/VidMoxy.py
 KekikStream/Extractors/VidPapi.py
 KekikStream/Extractors/VideoSeyred.py
 KekikStream/Extractors/Videostr.py
+KekikStream/Extractors/Vidoza.py
 KekikStream/Extractors/YTDLP.py
 KekikStream/Extractors/YildizKisaFilm.py
 KekikStream/Plugins/BelgeselX.py

{kekikstream-2.4.0 → kekikstream-2.4.1}/PKG-INFO

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

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