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

KekikStream/Plugins/SezonlukDizi.py

@@ -1,8 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult
-from selectolax.parser import HTMLParser
-import re, asyncio
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult, HTMLHelper
+import asyncio
 
 class SezonlukDizi(PluginBase):
     name        = "SezonlukDizi"
@@ -41,26 +40,24 @@ class SezonlukDizi(PluginBase):
 
     async def _get_asp_data(self) -> dict:
         js_req = await self.httpx.get(f"{self.main_url}/js/site.min.js")
-        alt_match   = re.search(r"dataAlternatif(.*?)\.asp", js_req.text)
-        embed_match = re.search(r"dataEmbed(.*?)\.asp", js_req.text)
+        js = HTMLHelper(js_req.text)
+        alt = js.regex_first(r"dataAlternatif(.*?)\.asp")
+        emb = js.regex_first(r"dataEmbed(.*?)\.asp")
         
         return {
-            "alternatif": alt_match.group(1) if alt_match else "",
-            "embed":      embed_match.group(1) if embed_match else ""
+            "alternatif": alt or "",
+            "embed":      emb or ""
         }
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = await self.httpx.get(f"{url}{page}")
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
         results = []
-        for veri in secici.css("div.afis a"):
-            desc_el = veri.css_first("div.description")
-            img_el  = veri.css_first("img")
-
-            title  = desc_el.text(strip=True) if desc_el else None
-            href   = veri.attrs.get("href")
-            poster = img_el.attrs.get("data-src") if img_el else None
+        for veri in secici.select("div.afis a"):
+            title  = secici.select_text("div.description", veri)
+            href   = secici.select_attr("a", "href", veri)
+            poster = secici.select_attr("img", "data-src", veri)
 
             if title and href:
                 results.append(MainPageResult(
@@ -74,16 +71,13 @@ class SezonlukDizi(PluginBase):
 
     async def search(self, query: str) -> list[SearchResult]:
         istek  = await self.httpx.get(f"{self.main_url}/diziler.asp?adi={query}")
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
         results = []
-        for afis in secici.css("div.afis a"):
-            desc_el = afis.css_first("div.description")
-            img_el  = afis.css_first("img")
-
-            title  = desc_el.text(strip=True) if desc_el else None
-            href   = afis.attrs.get("href")
-            poster = img_el.attrs.get("data-src") if img_el else None
+        for afis in secici.select("div.afis a"):
+            title  = secici.select_text("div.description", afis)
+            href   = secici.select_attr("a", "href", afis)
+            poster = secici.select_attr("img", "data-src", afis)
 
             if title and href:
                 results.append(SearchResult(
@@ -96,67 +90,56 @@ class SezonlukDizi(PluginBase):
 
     async def load_item(self, url: str) -> SeriesInfo:
         istek  = await self.httpx.get(url)
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
-        title_el = secici.css_first("div.header")
-        title    = title_el.text(strip=True) if title_el else ""
+        title    = secici.select_text("div.header") or ""
 
-        poster_el = secici.css_first("div.image img")
-        poster    = poster_el.attrs.get("data-src", "").strip() if poster_el else ""
+        poster    = secici.select_attr("div.image img", "data-src") or ""
 
         # year: re_first yerine re.search
-        year_el = secici.css_first("div.extra span")
-        year_text = year_el.text(strip=True) if year_el else ""
-        year_match = re.search(r"(\d{4})", year_text)
-        year = year_match.group(1) if year_match else None
+        year_text = secici.select_text("div.extra span") or ""
+        year = secici.regex_first(r"(\d{4})", year_text)
 
         # xpath normalized-space yerine doğrudan ID ile element bulup text al
-        desc_el = secici.css_first("span#tartismayorum-konu")
-        description = desc_el.text(strip=True) if desc_el else ""
+        description = secici.select_text("span#tartismayorum-konu") or ""
 
-        tags = [a.text(strip=True) for a in secici.css("div.labels a[href*='tur']") if a.text(strip=True)]
+        tags = [a.text(strip=True) for a in secici.select("div.labels a[href*='tur']") if a.text(strip=True)]
 
-        # rating: re_first yerine re.search
-        rating_el = secici.css_first("div.dizipuani a div")
-        rating_text = rating_el.text(strip=True) if rating_el else ""
-        rating_match = re.search(r"[\d.,]+", rating_text)
-        rating = rating_match.group() if rating_match else None
+        # rating: regex ile çıkar
+        rating_text = secici.select_text("div.dizipuani a div") or ""
+        rating = secici.regex_first(r"[\d.,]+", rating_text)
 
         actors = []
 
         actors_istek  = await self.httpx.get(f"{self.main_url}/oyuncular/{url.split('/')[-1]}")
-        actors_secici = HTMLParser(actors_istek.text)
-        for actor in actors_secici.css("div.doubling div.ui"):
-            header_el = actor.css_first("div.header")
-            if header_el and header_el.text(strip=True):
-                actors.append(header_el.text(strip=True))
+        actors_secici = HTMLHelper(actors_istek.text)
+        for actor in actors_secici.select("div.doubling div.ui"):
+            header_text = actors_secici.select_text("div.header", actor)
+            if header_text:
+                actors.append(header_text)
 
         episodes_istek  = await self.httpx.get(f"{self.main_url}/bolumler/{url.split('/')[-1]}")
-        episodes_secici = HTMLParser(episodes_istek.text)
+        episodes_secici = HTMLHelper(episodes_istek.text)
         episodes        = []
 
-        for sezon in episodes_secici.css("table.unstackable"):
-            for bolum in sezon.css("tbody tr"):
+        for sezon in episodes_secici.select("table.unstackable"):
+            for bolum in episodes_secici.select("tbody tr", sezon):
                 # td:nth-of-type selectolax'ta desteklenmiyor, alternatif yol: tüm td'leri alıp indexle
-                tds = bolum.css("td")
+                tds = episodes_secici.select("td", bolum)
                 if len(tds) < 4:
                     continue
 
                 # 4. td'den isim ve href
-                ep_name_el = tds[3].css_first("a")
-                ep_name    = ep_name_el.text(strip=True) if ep_name_el else None
-                ep_href    = ep_name_el.attrs.get("href") if ep_name_el else None
+                ep_name    = episodes_secici.select_text("a", tds[3])
+                ep_href    = episodes_secici.select_attr("a", "href", tds[3])
 
-                # 3. td'den episode (re_first yerine re.search)
-                ep_episode_el = tds[2].css_first("a")
-                ep_episode_text = ep_episode_el.text(strip=True) if ep_episode_el else ""
-                ep_episode_match = re.search(r"(\d+)", ep_episode_text)
-                ep_episode = ep_episode_match.group(1) if ep_episode_match else None
+                # 3. td'den episode (re_first yerine regex)
+                ep_episode_text = episodes_secici.select_text("a", tds[2]) or ""
+                ep_episode = episodes_secici.regex_first(r"(\d+)", ep_episode_text)
 
-                # 2. td'den season (re_first yerine re.search)
+                # 2. td'den season (re_first yerine regex)
                 ep_season_text = tds[1].text(strip=True) if tds[1] else ""
-                ep_season_match = re.search(r"(\d+)", ep_season_text)
-                ep_season = ep_season_match.group(1) if ep_season_match else None
+                ep_season = secici.regex_first(r"(\d+)", ep_season_text)
 
                 if ep_name and ep_href:
                     episode = Episode(
@@ -181,10 +164,10 @@ class SezonlukDizi(PluginBase):
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
         asp_data = await self._get_asp_data()
         
-        bid = secici.css_first("div#dilsec").attrs.get("data-id") if secici.css_first("div#dilsec") else None
+        bid = secici.select_attr("div#dilsec", "data-id")
         if not bid:
             return []
 
@@ -199,9 +182,8 @@ class SezonlukDizi(PluginBase):
                         headers = {"X-Requested-With": "XMLHttpRequest"},
                         data    = {"id": str(veri.get("id"))}
                     )
-                    embed_secici = HTMLParser(embed_resp.text)
-                    iframe_el = embed_secici.css_first("iframe")
-                    iframe_src = iframe_el.attrs.get("src") if iframe_el else None
+                    embed_secici = HTMLHelper(embed_resp.text)
+                    iframe_src = embed_secici.select_attr("iframe", "src")
                     
                     if iframe_src:
                         if "link.asp" in iframe_src:

KekikStream/Plugins/Sinefy.py

@@ -1,8 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
-from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, MovieInfo, ExtractResult
-from selectolax.parser import HTMLParser
-import re, json, urllib.parse
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, MovieInfo, ExtractResult, HTMLHelper
+import json, urllib.parse
 
 class Sinefy(PluginBase):
     name        = "Sinefy"
@@ -44,17 +43,13 @@ class Sinefy(PluginBase):
             full_url = f"{url}&page={page}"
 
         resp = await self.httpx.get(full_url)
-        sel  = HTMLParser(resp.text)
+        sel  = HTMLHelper(resp.text)
 
         results = []
-        for item in sel.css("div.poster-with-subject, div.dark-segment div.poster-md.poster"):
-            h2_el = item.css_first("h2")
-            link_el = item.css_first("a")
-            img_el = item.css_first("img")
-
-            title  = h2_el.text(strip=True) if h2_el else None
-            href   = link_el.attrs.get("href") if link_el else None
-            poster = img_el.attrs.get("data-srcset") if img_el else None
+        for item in sel.select("div.poster-with-subject, div.dark-segment div.poster-md.poster"):
+            title  = sel.select_text("h2", item)
+            href   = sel.select_attr("a", "href", item)
+            poster = sel.select_attr("img", "data-srcset", item)
 
             if poster:
                 poster = poster.split(",")[0].split(" ")[0]
@@ -76,13 +71,10 @@ class Sinefy(PluginBase):
 
         try:
             resp = await self.httpx.get(self.main_url)
-            sel  = HTMLParser(resp.text)
-
-            cke_el = sel.css_first("input[name='cKey']")
-            cval_el = sel.css_first("input[name='cValue']")
+            sel  = HTMLHelper(resp.text)
 
-            cke = cke_el.attrs.get("value") if cke_el else None
-            cval = cval_el.attrs.get("value") if cval_el else None
+            cke = sel.select_attr("input[name='cKey']", "value")
+            cval = sel.select_attr("input[name='cValue']", "value")
 
             if cke and cval:
                 c_key   = cke
@@ -145,79 +137,88 @@ class Sinefy(PluginBase):
 
     async def load_item(self, url: str) -> SeriesInfo:
         resp = await self.httpx.get(url)
-        sel  = HTMLParser(resp.text)
+        sel  = HTMLHelper(resp.text)
         
-        title_el = sel.css_first("h1")
-        title    = title_el.text(strip=True) if title_el else None
+        title    = sel.select_text("h1")
 
-        img_el      = sel.css_first("div.ui.items img")
-        poster_info = img_el.attrs.get("data-srcset") if img_el else None
-        poster      = None
+        poster_info = sel.select_attr("div.ui.items img", "data-srcset")
+        poster = None
         if poster_info:
-            # take 1x
             parts = str(poster_info).split(",")
             for p in parts:
                 if "1x" in p:
                     poster = p.strip().split(" ")[0]
                     break
-        
-        desc_el     = sel.css_first("p#tv-series-desc")
-        description = desc_el.text(strip=True) if desc_el else None
 
-        tags    = [a.text(strip=True) for a in sel.css("div.item.categories a") if a.text(strip=True)]
+        description = sel.select_text("p#tv-series-desc")
 
-        rating_el = sel.css_first("span.color-imdb")
-        rating    = rating_el.text(strip=True) if rating_el else None
+        tags    = [a.text(strip=True) for a in sel.select("div.item.categories a") if a.text(strip=True)]
 
-        actors = [h5.text(strip=True) for h5 in sel.css("div.content h5") if h5.text(strip=True)]
+        rating    = sel.select_text("span.color-imdb")
 
-        year_el = sel.css_first("span.item.year")
-        year    = year_el.text(strip=True) if year_el else None
+        actors = [h5.text(strip=True) for h5 in sel.select("div.content h5") if h5.text(strip=True)]
+
+        year    = sel.select_text("span.item.year")
+        if not year and title:
+            # Try to extract year from title like "Movie Name(2024)"
+            year_match = sel.regex_first(r"\((\d{4})\)", title)
+            if year_match:
+                year = year_match
         
         episodes = []
-        season_elements = sel.css("section.episodes-box")
+        episodes_box_list = sel.select("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_list:
+            episodes_box = episodes_box_list[0]
+            # Sezon menüsünden sezon linklerini al
+            season_menu = sel.select("div.ui.vertical.fluid.tabular.menu a.item", episodes_box)
             
-            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 = sel.select("div.ui.tab", episodes_box)
+            
+            # 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 = sel.regex_first(r"sezon-(\d+)", menu_href)
+                        if match:
+                            current_season_no = int(match)
                     
-                    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 = sel.select("a[href*='bolum']", season_tab)
                     
+                    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)
+                        
+                        # Bölüm numarasını URL'den çıkar
+                        ep_no = 0
+                        match_ep = sel.regex_first(r"bolum-(\d+)", href)
+                        if match_ep:
+                            ep_no = int(match_ep)
                         
-                        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 başlığını çıkar (önce title attribute, sonra text)
+                        name = ep_link.attrs.get("title", "")
+                        if not name:
+                            name = sel.select_text("div.content div.header", ep_link)
+                            if not name:
+                                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(
@@ -245,10 +246,9 @@ class Sinefy(PluginBase):
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         resp = await self.httpx.get(url)
-        sel  = HTMLParser(resp.text)
+        sel  = HTMLHelper(resp.text)
         
-        iframe_el = sel.css_first("iframe")
-        iframe    = iframe_el.attrs.get("src") if iframe_el else None
+        iframe = sel.select_attr("iframe", "src")
 
         if not iframe:
             return []

KekikStream/Plugins/SinemaCX.py

@@ -1,8 +1,7 @@
 # Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
 
 from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, MovieInfo, Subtitle, ExtractResult
-from selectolax.parser import HTMLParser
-import re
+from KekikStream.Core.HTMLHelper import HTMLHelper
 
 class SinemaCX(PluginBase):
     name        = "SinemaCX"
@@ -39,23 +38,16 @@ class SinemaCX(PluginBase):
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = await self.httpx.get(url.replace("SAYFA", str(page)))
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
         results = []
-        for veri in secici.css("div.son div.frag-k, div.icerik div.frag-k"):
-            span_el = veri.css_first("div.yanac span")
-            if not span_el:
-                continue
-
-            title = span_el.text(strip=True)
+        for veri in secici.select("div.son div.frag-k, div.icerik div.frag-k"):
+            title = secici.select_text("div.yanac span", veri)
             if not title:
                 continue
 
-            link_el = veri.css_first("div.yanac a")
-            img_el  = veri.css_first("a.resim img")
-
-            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
+            href = secici.select_attr("div.yanac a", "href", veri)
+            poster = secici.select_attr("a.resim img", "data-src", veri) or secici.select_attr("a.resim img", "src", veri)
 
             results.append(MainPageResult(
                 category = category,
@@ -68,23 +60,16 @@ class SinemaCX(PluginBase):
 
     async def search(self, query: str) -> list[SearchResult]:
         istek  = await self.httpx.get(f"{self.main_url}/?s={query}")
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
         results = []
-        for veri in secici.css("div.icerik div.frag-k"):
-            span_el = veri.css_first("div.yanac span")
-            if not span_el:
-                continue
-
-            title = span_el.text(strip=True)
+        for veri in secici.select("div.icerik div.frag-k"):
+            title = secici.select_text("div.yanac span", veri)
             if not title:
                 continue
 
-            link_el = veri.css_first("div.yanac a")
-            img_el  = veri.css_first("a.resim img")
-
-            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
+            href = secici.select_attr("div.yanac a", "href", veri)
+            poster = secici.select_attr("a.resim img", "data-src", veri) or secici.select_attr("a.resim img", "src", veri)
 
             results.append(SearchResult(
                 title  = title,
@@ -96,29 +81,21 @@ class SinemaCX(PluginBase):
 
     async def load_item(self, url: str) -> MovieInfo:
         istek  = await self.httpx.get(url)
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
-        duration_match = re.search(r"Süre:.*?(\d+)\s*Dakika", istek.text)
+        duration_match = secici.regex_first(r"Süre:.*?(\d+)\s*Dakika")
 
-        desc_el     = secici.css_first("div.ackl div.scroll-liste")
-        description = desc_el.text(strip=True) if desc_el else None
+        description = secici.select_text("div.ackl div.scroll-liste")
 
-        link_el   = secici.css_first("link[rel='image_src']")
-        poster    = link_el.attrs.get("href") if link_el else None
+        poster = secici.select_attr("link[rel='image_src']", "href")
 
-        title_el  = secici.css_first("div.f-bilgi h1")
-        title     = title_el.text(strip=True) if title_el else None
+        title = secici.select_text("div.f-bilgi h1")
 
-        tags      = [a.text(strip=True) for a in secici.css("div.f-bilgi div.tur a") if a.text(strip=True)]
+        tags = secici.select_all_text("div.f-bilgi div.tur a")
 
-        year_el   = secici.css_first("div.f-bilgi ul.detay a[href*='yapim']")
-        year      = year_el.text(strip=True) if year_el else None
+        year = secici.select_text("div.f-bilgi ul.detay a[href*='yapim']")
 
-        actors    = []
-        for li in secici.css("li.oync li.oyuncu-k"):
-            isim_el = li.css_first("span.isim")
-            if isim_el and isim_el.text(strip=True):
-                actors.append(isim_el.text(strip=True))
+        actors = secici.select_all_text("li.oync li.oyuncu-k span.isim")
 
         return MovieInfo(
             url         = url,
@@ -128,14 +105,14 @@ class SinemaCX(PluginBase):
             tags        = tags,
             year        = year,
             actors      = actors,
-            duration    = int(duration_match[1]) if duration_match else None,
+            duration    = int(duration_match) if duration_match else None,
         )
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
-        secici = HTMLParser(istek.text)
+        secici = HTMLHelper(istek.text)
 
-        iframe_list = [iframe.attrs.get("data-vsrc") for iframe in secici.css("iframe") if iframe.attrs.get("data-vsrc")]
+        iframe_list = secici.select_all_attr("iframe", "data-vsrc")
 
         # Sadece fragman varsa /2/ sayfasından dene
         has_only_trailer = all(
@@ -146,8 +123,9 @@ class SinemaCX(PluginBase):
         if has_only_trailer:
             alt_url   = url.rstrip("/") + "/2/"
             alt_istek = await self.httpx.get(alt_url)
-            alt_sec   = HTMLParser(alt_istek.text)
-            iframe_list = [iframe.attrs.get("data-vsrc") for iframe in alt_sec.css("iframe") if iframe.attrs.get("data-vsrc")]
+            alt_istek = await self.httpx.get(alt_url)
+            alt_sec   = HTMLHelper(alt_istek.text)
+            iframe_list = alt_sec.select_all_attr("iframe", "data-vsrc")
 
         if not iframe_list:
             return []
@@ -164,17 +142,15 @@ class SinemaCX(PluginBase):
         iframe_text  = iframe_istek.text
 
         subtitles = []
-        sub_match = re.search(r'playerjsSubtitle\s*=\s*"(.+?)"', iframe_text)
-        if sub_match:
-            sub_section = sub_match[1]
-            for sub in re.finditer(r'\[(.*?)](https?://[^\s",]+)', sub_section):
-                subtitles.append(Subtitle(name=sub[1], url=self.fix_url(sub[2])))
+        sub_section = HTMLHelper(iframe_text).regex_first(r'playerjsSubtitle\s*=\s*"(.+?)"')
+        if sub_section:
+            for lang, link in HTMLHelper(sub_section).regex_all(r'\[(.*?)](https?://[^\s\",]+)'):
+                subtitles.append(Subtitle(name=lang, url=self.fix_url(link)))
 
         # player.filmizle.in kontrolü
         if "player.filmizle.in" in iframe.lower():
-            base_match = re.search(r"https?://([^/]+)", iframe)
-            if base_match:
-                base_url = base_match[1]
+            base_url = HTMLHelper(iframe).regex_first(r"https?://([^/]+)")
+            if base_url:
                 vid_id   = iframe.split("/")[-1]
 
                 self.httpx.headers.update({"X-Requested-With": "XMLHttpRequest"})