KekikStream 2.2.9__py3-none-any.whl → 2.3.1__py3-none-any.whl

KekikStream/Plugins/DiziYou.py

@@ -100,13 +100,23 @@ class DiziYou(PluginBase):
             year = year_match.group(1)
 
         desc_el = secici.css_first("div.diziyou_desc")
-        description = desc_el.text(strip=True) if desc_el else None
+        description = None
+        if desc_el:
+            # HTML'i al ve script + meta div'lerini temizle
+            desc_html = desc_el.html
+            # Script taglarını kaldır
+            desc_html = re.sub(r"<script.*?</script>", "", desc_html, flags=re.DOTALL)
+            # div#icerikcat2 ve sonrasını kaldır (meta bilgileri içeriyor)
+            desc_html = re.sub(r"<div id=\"icerikcat2\".*", "", desc_html, flags=re.DOTALL)
+            # Kalan HTML'den text çıkar
+            clean_sel = HTMLParser(desc_html)
+            description = clean_sel.text(strip=True)
 
         tags = [a.text(strip=True) for a in secici.css("div.genres a") if a.text(strip=True)]
 
-        # Rating - regex ile
+        # Rating - daha spesifik regex ile
         rating = None
-        rating_match = re.search(r"IMDB.*?([0-9.]+)", html_text, re.DOTALL | re.IGNORECASE)
+        rating_match = re.search(r"IMDB\s*:\s*</span>([0-9.]+)", html_text, re.DOTALL | re.IGNORECASE)
         if rating_match:
             rating = rating_match.group(1)
 

KekikStream/Plugins/Dizilla.py

@@ -6,6 +6,7 @@ from json              import loads
 from urllib.parse      import urlparse, urlunparse
 from Crypto.Cipher     import AES
 from base64            import b64decode
+import re
 
 class Dizilla(PluginBase):
     name        = "Dizilla"
@@ -45,7 +46,7 @@ class Dizilla(PluginBase):
                     category = category,
                     title    = veri.get("original_title"),
                     url      = self.fix_url(f"{self.main_url}/{veri.get('used_slug')}"),
-                    poster   = self.fix_url(veri.get("object_poster_url")),
+                    poster   = self.fix_poster_url(self.fix_url(veri.get("object_poster_url"))),
                 )
                     for veri in veriler
             ])
@@ -114,6 +115,20 @@ class Dizilla(PluginBase):
         # JSON decode
         return loads(decrypted.decode("utf-8"))
 
+    def fix_poster_url(self, url: str) -> str:
+        """AMP CDN URL'lerini düzelt."""
+        if not url:
+            return url
+        # AMP CDN URL'lerini orijinal URL'ye çevir
+        # https://images-macellan-online.cdn.ampproject.org/i/s/images.macellan.online/...
+        # -> https://images.macellan.online/...
+        if "cdn.ampproject.org" in url:
+            # /i/s/ veya /ii/s/ gibi AMP prefix'lerinden sonraki kısmı al
+            match = re.search(r"cdn\.ampproject\.org/[^/]+/s/(.+)$", url)
+            if match:
+                return f"https://{match.group(1)}"
+        return url
+
     async def search(self, query: str) -> list[SearchResult]:
         arama_istek = await self.httpx.post(f"{self.main_url}/api/bg/searchcontent?searchterm={query}")
         decrypted   = await self.decrypt_response(arama_istek.json().get("response"))
@@ -123,7 +138,7 @@ class Dizilla(PluginBase):
             SearchResult(
                 title  = veri.get("object_name"),
                 url    = self.fix_url(f"{self.main_url}/{veri.get('used_slug')}"),
-                poster = self.fix_url(veri.get("object_poster_url")),
+                poster = self.fix_poster_url(self.fix_url(veri.get("object_poster_url"))),
             )
                 for veri in arama_veri
         ]
@@ -176,8 +191,8 @@ class Dizilla(PluginBase):
             
             season_num = None
             try:
-                # URL'den sezon numarasını çek: ...-sezon-X
-                season_match = re.search(r"sezon-(\d+)", sezon_href)
+                # URL'den sezon numarasını çek: ...-N-sezon formatı
+                season_match = re.search(r"-(\d+)-sezon", sezon_href)
                 if season_match:
                     season_num = int(season_match.group(1))
             except:

KekikStream/Plugins/FilmMakinesi.py

@@ -1,7 +1,8 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, ExtractResult
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, SeriesInfo, Episode, ExtractResult
 from selectolax.parser import HTMLParser
+import re
 
 class FilmMakinesi(PluginBase):
     name        = "FilmMakinesi"
@@ -81,7 +82,7 @@ class FilmMakinesi(PluginBase):
 
         return results
 
-    async def load_item(self, url: str) -> MovieInfo:
+    async def load_item(self, url: str) -> MovieInfo | SeriesInfo:
         istek  = await self.httpx.get(url)
         secici = HTMLParser(istek.text)
 
@@ -115,6 +116,60 @@ class FilmMakinesi(PluginBase):
             if len(parts) > 1:
                 duration = parts[1].strip()
 
+        # Dizi mi kontrol et - sezon/bölüm linkleri var mı?
+        episodes = []
+        all_links = secici.css("a[href]")
+        for link in all_links:
+            href = link.attrs.get("href", "")
+            match = re.search(r"/sezon-(\d+)/bolum-(\d+)", href)
+            if match:
+                season_no = int(match.group(1))
+                ep_no = int(match.group(2))
+                
+                # Bölüm başlığını çıkar - text'ten gerçek ismi al
+                # Format: "22 Eylül 2014 / 44 dk /1. Sezon / 1. BölümPilot"
+                full_text = link.text(strip=True)
+                # "Bölüm" kelimesinden sonraki kısmı al
+                ep_title = ""
+                if "Bölüm" in full_text:
+                    parts = full_text.split("Bölüm")
+                    if len(parts) > 1:
+                        ep_title = parts[-1].strip()
+                
+                episodes.append(Episode(
+                    season  = season_no,
+                    episode = ep_no,
+                    title   = ep_title,
+                    url     = self.fix_url(href)
+                ))
+        
+        # Bölümler varsa SeriesInfo döndür
+        if episodes:
+            # Tekrar eden bölümleri kaldır
+            seen = set()
+            unique_episodes = []
+            for ep in episodes:
+                key = (ep.season, ep.episode)
+                if key not in seen:
+                    seen.add(key)
+                    unique_episodes.append(ep)
+            
+            # Sırala
+            unique_episodes.sort(key=lambda x: (x.season or 0, x.episode or 0))
+            
+            return SeriesInfo(
+                url         = url,
+                poster      = self.fix_url(poster) if poster else None,
+                title       = self.clean_title(title),
+                description = description,
+                tags        = tags,
+                rating      = rating,
+                year        = year,
+                actors      = actors,
+                duration    = duration,
+                episodes    = unique_episodes
+            )
+
         return MovieInfo(
             url         = url,
             poster      = self.fix_url(poster) if poster else None,

KekikStream/Plugins/HDFilmCehennemi.py

@@ -72,14 +72,14 @@ class HDFilmCehennemi(PluginBase):
             title  = title_el.text(strip=True) if title_el else None
             href   = link_el.attrs.get("href") if link_el else None
             poster = (img_el.attrs.get("data-src") or img_el.attrs.get("src")) if img_el else None
-            
+
             if title and href:
                 results.append(SearchResult(
                     title  = title,
                     url    = self.fix_url(href),
-                    poster = self.fix_url(poster) if poster else None,
+                    poster = self.fix_url(poster).replace("/thumb/", "/list/") if poster else None,
                 ))
-            
+
         return results
 
     async def load_item(self, url: str) -> MovieInfo | SeriesInfo:

KekikStream/Plugins/Sinefy.py

@@ -175,49 +175,60 @@ class Sinefy(PluginBase):
         year    = year_el.text(strip=True) if year_el else None
         
         episodes = []
-        season_elements = sel.css("section.episodes-box")
+        episodes_box = sel.css_first("section.episodes-box")
         
-        if season_elements:
-            # Get season links
-            season_links = []
-            menu = sel.css("div.ui.vertical.fluid.tabular.menu a")
-            for link in menu:
-                href = link.attrs.get("href")
-                if href:
-                    season_links.append(self.fix_url(href))
+        if episodes_box:
+            # Sezon menüsünden sezon linklerini al
+            season_menu = episodes_box.css("div.ui.vertical.fluid.tabular.menu a.item")
             
-            for s_url in season_links:
-                target_url = s_url if "/bolum-" in s_url else f"{s_url}/bolum-1"
-                
-                try:
-                    s_resp = await self.httpx.get(target_url)
-                    s_sel  = HTMLParser(s_resp.text)
-                    ep_links = s_sel.css("div.ui.list.celled a.item")
+            # Sezon tab içeriklerini al
+            season_tabs = episodes_box.css("div.ui.tab")
+            
+            # Eğer birden fazla sezon varsa, her sezon tab'ından bölümleri çek
+            if season_tabs:
+                for idx, season_tab in enumerate(season_tabs):
+                    # Sezon numarasını belirle
+                    current_season_no = idx + 1
+                    
+                    # Menüden sezon numarasını almaya çalış
+                    if idx < len(season_menu):
+                        menu_href = season_menu[idx].attrs.get("href", "")
+                        match = re.search(r"sezon-(\d+)", menu_href)
+                        if match:
+                            current_season_no = int(match.group(1))
                     
-                    current_season_no = 1
-                    match = re.search(r"sezon-(\d+)", target_url)
-                    if match:
-                        current_season_no = int(match.group(1))
+                    # Bu sezon tab'ından bölüm linklerini çek
+                    ep_links = season_tab.css("a[href*='bolum']")
                     
+                    seen_urls = set()
                     for ep_link in ep_links:
                         href = ep_link.attrs.get("href")
-                        name_el = ep_link.css_first("div.content div.header")
-                        name = name_el.text(strip=True) if name_el else ""
+                        if not href or href in seen_urls:
+                            continue
+                        seen_urls.add(href)
                         
-                        if href:
-                            ep_no = 0
-                            match_ep = re.search(r"bolum-(\d+)", href)
-                            if match_ep:
-                                ep_no = int(match_ep.group(1))
-                                
+                        # Bölüm numarasını URL'den çıkar
+                        ep_no = 0
+                        match_ep = re.search(r"bolum-(\d+)", href)
+                        if match_ep:
+                            ep_no = int(match_ep.group(1))
+                        
+                        # Bölüm başlığını çıkar (önce title attribute, sonra text)
+                        name = ep_link.attrs.get("title", "")
+                        if not name:
+                            name_el = ep_link.css_first("div.content div.header")
+                            if name_el:
+                                name = name_el.text(strip=True)
+                            else:
+                                name = ep_link.text(strip=True)
+                        
+                        if href and ep_no > 0:
                             episodes.append(Episode(
-                                season = current_season_no,
+                                season  = current_season_no,
                                 episode = ep_no,
-                                title = name,
-                                url = self.fix_url(href)
+                                title   = name.strip() if name else f"{ep_no}. Bölüm",
+                                url     = self.fix_url(href)
                             ))
-                except Exception:
-                    pass
         
         if episodes:
             return SeriesInfo(

{kekikstream-2.2.9.dist-info → kekikstream-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KekikStream
-Version: 2.2.9
+Version: 2.3.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.2.9.dist-info → kekikstream-2.3.1.dist-info}/RECORD

@@ -53,14 +53,14 @@ KekikStream/Extractors/YildizKisaFilm.py,sha256=R_JlrOVeMiDlXYcuTdItnKvidyx8_u3B
 KekikStream/Plugins/BelgeselX.py,sha256=Rr8fxpAOjApBVLH0r6f8xxxWVw8csyYF6HR8UQ_Nh4w,8930
 KekikStream/Plugins/DiziBox.py,sha256=2RGkYEpKsoznE0Gr822-Cw7n-aF_cjyi7Z-79RdJFao,11754
 KekikStream/Plugins/DiziPal.py,sha256=oo8pA6mfgpZoZV7B6EBwMec4dlUkMlDpaLnvQsxVhg0,11481
-KekikStream/Plugins/DiziYou.py,sha256=FryU5EQR7xcMTkfcc6l-V73kqlbsFVCAPk5ss2zu8gM,9906
-KekikStream/Plugins/Dizilla.py,sha256=HZ-A-ecFW2zdykNIjpv38n0FYRh1t8D03CrPresMSkk,13914
+KekikStream/Plugins/DiziYou.py,sha256=52JCeNG9l6xUHp_Q_Q812TSe-WI2FkqEc82WtD7uZA0,10447
+KekikStream/Plugins/Dizilla.py,sha256=nVKpKxv4FJx0ifhz76ugi73i78gSwLzr-TYMh8lMxXs,14582
 KekikStream/Plugins/FilmBip.py,sha256=tTp1gLHC1rVn0vY39jwxpF_fHC5_F0pqcCUCDItgHn0,7103
-KekikStream/Plugins/FilmMakinesi.py,sha256=jdQ1Ger72Wf402h-RpOx1TmvCWD0_gDSafKkAFMUJSg,6571
+KekikStream/Plugins/FilmMakinesi.py,sha256=tjNcTreesqJCIby1uloLMl2e_dnaUtJe2Wbp7FhzjlY,8733
 KekikStream/Plugins/FilmModu.py,sha256=ZUrBAq1mK2na8YuZEmev64tGhLrql-n-KK1wYDLICn0,7730
 KekikStream/Plugins/FullHDFilm.py,sha256=B8ckb2TftuzfAgxNBs_rkIuAHc9YNVqjG_H9Y3QqGQM,10822
 KekikStream/Plugins/FullHDFilmizlesene.py,sha256=Y6wzW4JnALT91FR_RAmbi1KhM6m7NYlCBh8UGXkKeSs,7900
-KekikStream/Plugins/HDFilmCehennemi.py,sha256=Snwdnt1AhmKN535J4G8US8DeJVNpXZtxxW7hUo7Szp0,13867
+KekikStream/Plugins/HDFilmCehennemi.py,sha256=JDW1FifATpO46fvgzLno9lCLufaORek6nayHTgui0zY,13872
 KekikStream/Plugins/JetFilmizle.py,sha256=zqSk1NbOsClViJfETX64jiqREaEDfRskQseIBOzwl-c,8860
 KekikStream/Plugins/KultFilmler.py,sha256=eUWXuo3I_qg3Z8k9uM-Xyy4DLfK1jKeFR2I284MjNks,10240
 KekikStream/Plugins/RecTV.py,sha256=Nj4AdeetPMzvZ-VKUdUGhBC1SiFSBRYRebODgE2UeI8,7228
@@ -69,14 +69,14 @@ KekikStream/Plugins/SelcukFlix.py,sha256=hsoKh5cZ0xDeJ7MtRUQPX-mWFcrTrsaLy2dDaVw
 KekikStream/Plugins/SetFilmIzle.py,sha256=cCl5dO77GyTAv0IAsvybBZyz74ZAwySxoIJMSOtLg5A,11501
 KekikStream/Plugins/SezonlukDizi.py,sha256=xIc6Ez8Xt3iyKykJDB52MygpotIjrTTLjgMD1HVL85c,10828
 KekikStream/Plugins/SineWix.py,sha256=z0r90lggAugEWE1g9vg8gZsInBObUZPnVFQwq7GYmJs,7052
-KekikStream/Plugins/Sinefy.py,sha256=v75WZ4tcjTuD6jPJ6erUqjwG0Nje0Im9-fknui9rAAM,10843
+KekikStream/Plugins/Sinefy.py,sha256=VVsi3iD1a1LcIx44vynH5olS0Kqh9DAsuuHtBiYUpxo,11612
 KekikStream/Plugins/SinemaCX.py,sha256=6mYz7Yqja_weEfCiLrzMhji1eiSKaYHj0vX4aomDWvs,8628
 KekikStream/Plugins/Sinezy.py,sha256=zBpxUpIIfdnZdolPdkxLMkTsWeGUMW1lht3dNwp_AYU,6756
 KekikStream/Plugins/SuperFilmGeldi.py,sha256=zrTMpAP4NTxhQ4lgprBPXkihE7oQu2jNY7IFA7NWWYA,7144
 KekikStream/Plugins/UgurFilm.py,sha256=S4Zrml9I3W3iW_2feLJWSkvsVZHpQQQlXRJk4E8li-c,5999
-kekikstream-2.2.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-kekikstream-2.2.9.dist-info/METADATA,sha256=4p0VW2Lg3Asz8x9KQ2CFCdbsuO6nPfPLy7_yyOMqJr8,10761
-kekikstream-2.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kekikstream-2.2.9.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
-kekikstream-2.2.9.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
-kekikstream-2.2.9.dist-info/RECORD,,
+kekikstream-2.3.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+kekikstream-2.3.1.dist-info/METADATA,sha256=DPkT2_z1KRVJpBXa7WUeibtryqu8V1icKZu1G8VdVxU,10761
+kekikstream-2.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kekikstream-2.3.1.dist-info/entry_points.txt,sha256=dFwdiTx8djyehI0Gsz-rZwjAfZzUzoBSrmzRu9ubjJc,50
+kekikstream-2.3.1.dist-info/top_level.txt,sha256=DNmGJDXl27Drdfobrak8KYLmocW_uznVYFJOzcjUgmY,12
+kekikstream-2.3.1.dist-info/RECORD,,