KekikStream 2.1.9__py3-none-any.whl → 2.2.7__py3-none-any.whl

KekikStream/Plugins/SezonlukDizi.py

@@ -1,7 +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 parsel           import Selector
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, ExtractResult
+from selectolax.parser import HTMLParser
 import re
 
 class SezonlukDizi(PluginBase):
@@ -41,73 +41,125 @@ class SezonlukDizi(PluginBase):
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         istek  = await self.httpx.get(f"{url}{page}")
-        secici = Selector(istek.text)
-
-        return [
-            MainPageResult(
-                category = category,
-                title    = veri.css("div.description::text").get(),
-                url      = self.fix_url(veri.css("::attr(href)").get()),
-                poster   = self.fix_url(veri.css("img::attr(data-src)").get()),
-            )
-                for veri in secici.css("div.afis a") if veri.css("div.description::text").get()
-        ]
+        secici = HTMLParser(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
+
+            if title and href:
+                results.append(MainPageResult(
+                    category = category,
+                    title    = title,
+                    url      = self.fix_url(href),
+                    poster   = self.fix_url(poster) if poster else None,
+                ))
+
+        return results
 
     async def search(self, query: str) -> list[SearchResult]:
         istek  = await self.httpx.get(f"{self.main_url}/diziler.asp?adi={query}")
-        secici = Selector(istek.text)
+        secici = HTMLParser(istek.text)
 
-        return [
-            SearchResult(
-                title  = afis.css("div.description::text").get().strip(),
-                url    = self.fix_url(afis.attrib.get("href")),
-                poster = self.fix_url(afis.css("img::attr(data-src)").get()),
-            )
-                for afis in secici.css("div.afis a.column")
-        ]
+        results = []
+        for afis in secici.css("div.afis a.column"):
+            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
+
+            if title and href:
+                results.append(SearchResult(
+                    title  = title,
+                    url    = self.fix_url(href),
+                    poster = self.fix_url(poster) if poster else None,
+                ))
+
+        return results
 
     async def load_item(self, url: str) -> SeriesInfo:
         istek  = await self.httpx.get(url)
-        secici = Selector(istek.text)
+        secici = HTMLParser(istek.text)
+
+        title_el = secici.css_first("div.header")
+        title    = title_el.text(strip=True) if title_el else ""
+
+        poster_el = secici.css_first("div.image img")
+        poster    = poster_el.attrs.get("data-src", "").strip() if poster_el else ""
+
+        # 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
 
-        title       = secici.css("div.header::text").get().strip()
-        poster      = self.fix_url(secici.css("div.image img::attr(data-src)").get().strip())
-        year        = secici.css("div.extra span::text").re_first(r"(\d{4})")
-        description = secici.xpath("normalize-space(//span[@id='tartismayorum-konu'])").get()
-        tags        = secici.css("div.labels a[href*='tur']::text").getall()
-        rating      = secici.css("div.dizipuani a div::text").re_first(r"[\d.,]+")
-        actors      = []
+        # 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 ""
+
+        tags = [a.text(strip=True) for a in secici.css("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
+
+        actors = []
 
         actors_istek  = await self.httpx.get(f"{self.main_url}/oyuncular/{url.split('/')[-1]}")
-        actors_secici = Selector(actors_istek.text)
-        actors = [
-            actor.css("div.header::text").get().strip()
-                for actor in actors_secici.css("div.doubling div.ui")
-        ]
+        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))
 
         episodes_istek  = await self.httpx.get(f"{self.main_url}/bolumler/{url.split('/')[-1]}")
-        episodes_secici = Selector(episodes_istek.text)
+        episodes_secici = HTMLParser(episodes_istek.text)
         episodes        = []
 
         for sezon in episodes_secici.css("table.unstackable"):
             for bolum in sezon.css("tbody tr"):
-                ep_name    = bolum.css("td:nth-of-type(4) a::text").get().strip()
-                ep_href    = self.fix_url(bolum.css("td:nth-of-type(4) a::attr(href)").get())
-                ep_episode = bolum.css("td:nth-of-type(3) a::text").re_first(r"(\d+)")
-                ep_season  = bolum.css("td:nth-of-type(2)::text").re_first(r"(\d+)")
+                # td:nth-of-type selectolax'ta desteklenmiyor, alternatif yol: tüm td'leri alıp indexle
+                tds = bolum.css("td")
+                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
+
+                # 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
+
+                # 2. td'den season (re_first yerine re.search)
+                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
 
                 if ep_name and ep_href:
                     episode = Episode(
                         season  = ep_season,
                         episode = ep_episode,
                         title   = ep_name,
-                        url     = ep_href,
+                        url     = self.fix_url(ep_href),
                     )
                     episodes.append(episode)
 
         return SeriesInfo(
             url         = url,
-            poster      = poster,
+            poster      = self.fix_url(poster) if poster else None,
             title       = title,
             description = description,
             tags        = tags,
@@ -133,9 +185,10 @@ class SezonlukDizi(PluginBase):
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         istek  = await self.httpx.get(url)
-        secici = Selector(istek.text)
+        secici = HTMLParser(istek.text)
 
-        bid = secici.css("div#dilsec::attr(data-id)").get()
+        dilsec_el = secici.css_first("div#dilsec")
+        bid = dilsec_el.attrs.get("data-id") if dilsec_el else None
         if not bid:
             return []
 
@@ -162,9 +215,12 @@ class SezonlukDizi(PluginBase):
                         headers = {"X-Requested-With": "XMLHttpRequest"},
                         data    = {"id": veri.get("id")},
                     )
-                    secici = Selector(veri_response.text)
+                    veri_secici = HTMLParser(veri_response.text)
+
+                    iframe_el = veri_secici.css_first("iframe")
+                    iframe = iframe_el.attrs.get("src") if iframe_el else None
 
-                    if iframe := secici.css("iframe::attr(src)").get():
+                    if iframe:
                         if "link.asp" in iframe:
                             continue
                             

KekikStream/Plugins/Sinefy.py

@@ -1,7 +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 parsel           import Selector
+from KekikStream.Core  import PluginBase, MainPageResult, SearchResult, SeriesInfo, Episode, MovieInfo, ExtractResult
+from selectolax.parser import HTMLParser
 import re, json, urllib.parse
 
 class Sinefy(PluginBase):
@@ -37,31 +37,35 @@ class Sinefy(PluginBase):
 
     async def get_main_page(self, page: int, url: str, category: str) -> list[MainPageResult]:
         if "page/" in url:
-             full_url = f"{url}{page}"
+            full_url = f"{url}{page}"
         elif "en-yenifilmler" in url or "netflix" in url:
-             full_url = f"{url}/{page}"
+            full_url = f"{url}/{page}"
         else:
-             full_url = f"{url}&page={page}"
+            full_url = f"{url}&page={page}"
 
         resp = await self.httpx.get(full_url)
-        sel  = Selector(resp.text)
+        sel  = HTMLParser(resp.text)
 
         results = []
-        # Kotlin: div.poster-with-subject, div.dark-segment div.poster-md.poster
         for item in sel.css("div.poster-with-subject, div.dark-segment div.poster-md.poster"):
-             title  = item.css("h2::text").get()
-             href   = item.css("a::attr(href)").get()
-             poster = item.css("img::attr(data-srcset)").get()
-             if poster:
-                  poster = poster.split(",")[0].split(" ")[0]
-
-             if title and href:
-                 results.append(MainPageResult(
-                     category = category,
-                     title    = title,
-                     url      = self.fix_url(href),
-                     poster   = self.fix_url(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
+
+            if poster:
+                poster = poster.split(",")[0].split(" ")[0]
+
+            if title and href:
+                results.append(MainPageResult(
+                    category = category,
+                    title    = title,
+                    url      = self.fix_url(href),
+                    poster   = self.fix_url(poster) if poster else None
+                ))
 
         return results
 
@@ -71,13 +75,18 @@ class Sinefy(PluginBase):
         c_value = "MTc0NzI2OTAwMDU3ZTEwYmZjMDViNWFmOWIwZDViODg0MjU4MjA1ZmYxOThmZTYwMDdjMWQzMzliNzY5NzFlZmViMzRhMGVmNjgwODU3MGIyZA=="
 
         try:
-             resp = await self.httpx.get(self.main_url)
-             sel  = Selector(resp.text)
-             cke  = sel.css("input[name='cKey']::attr(value)").get()
-             cval = sel.css("input[name='cValue']::attr(value)").get()
-             if cke and cval:
-                 c_key   = cke
-                 c_value = cval
+            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']")
+
+            cke = cke_el.attrs.get("value") if cke_el else None
+            cval = cval_el.attrs.get("value") if cval_el else None
+
+            if cke and cval:
+                c_key   = cke
+                c_value = cval
 
         except Exception:
             pass
@@ -111,23 +120,23 @@ class Sinefy(PluginBase):
                 res_array = data.get("data", {}).get("result", [])
                 
                 if not res_array:
-                     # Fallback manual parsing ?
-                     pass
+                    # Fallback manual parsing ?
+                    pass
 
                 for item in res_array:
-                     name = item.get("object_name")
-                     slug = item.get("used_slug")
-                     poster = item.get("object_poster_url")
-                     
-                     if name and slug:
-                         if "cdn.ampproject.org" in poster:
-                              poster = "https://images.macellan.online/images/movie/poster/180/275/80/" + poster.split("/")[-1]
-                         
-                         results.append(SearchResult(
-                             title=name,
-                             url=self.fix_url(slug),
-                             poster=self.fix_url(poster)
-                         ))
+                    name = item.get("object_name")
+                    slug = item.get("used_slug")
+                    poster = item.get("object_poster_url")
+                    
+                    if name and slug:
+                        if "cdn.ampproject.org" in poster:
+                            poster = "https://images.macellan.online/images/movie/poster/180/275/80/" + poster.split("/")[-1]
+                        
+                        results.append(SearchResult(
+                            title=name,
+                            url=self.fix_url(slug),
+                            poster=self.fix_url(poster) if poster else None
+                        ))
                 return results
 
         except Exception:
@@ -136,74 +145,85 @@ class Sinefy(PluginBase):
 
     async def load_item(self, url: str) -> SeriesInfo:
         resp = await self.httpx.get(url)
-        sel  = Selector(resp.text)
+        sel  = HTMLParser(resp.text)
         
-        title       = sel.css("h1::text").get()
-        poster_info = sel.css("div.ui.items img::attr(data-srcset)").get()
+        title_el = sel.css_first("h1")
+        title    = title_el.text(strip=True) if title_el else None
+
+        img_el      = sel.css_first("div.ui.items img")
+        poster_info = img_el.attrs.get("data-srcset") if img_el else None
         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
+            # take 1x
+            parts = str(poster_info).split(",")
+            for p in parts:
+                if "1x" in p:
+                    poster = p.strip().split(" ")[0]
+                    break
         
-        description = sel.css("p#tv-series-desc::text").get()
-        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
+        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)]
+
+        rating_el = sel.css_first("span.color-imdb")
+        rating    = rating_el.text(strip=True) if rating_el else None
+
+        actors = [h5.text(strip=True) for h5 in sel.css("div.content h5") if h5.text(strip=True)]
+
+        year_el = sel.css_first("span.item.year")
+        year    = year_el.text(strip=True) if year_el else None
         
         episodes = []
         season_elements = sel.css("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.css("::attr(href)").get()
-                 if href:
-                     season_links.append(self.fix_url(href))
-             
-             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  = Selector(s_resp.text)
-                     ep_links = s_sel.css("div.ui.list.celled a.item")
-                     
-                     current_season_no = 1
-                     match = re.search(r"sezon-(\d+)", target_url)
-                     if match:
-                         current_season_no = int(match.group(1))
-                     
-                     for ep_link in ep_links:
-                         href = ep_link.css("::attr(href)").get()
-                         name = ep_link.css("div.content div.header::text").get()
-                         
-                         if href:
-                             ep_no = 0
-                             match_ep = re.search(r"bolum-(\d+)", href)
-                             if match_ep:
-                                 ep_no = int(match_ep.group(1))
-                                 
-                             episodes.append(Episode(
-                                 season = current_season_no,
-                                 episode = ep_no,
-                                 title = name.strip() if name else "",
-                                 url = self.fix_url(href)
-                             ))
-                 except Exception:
-                     pass
+            # 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))
+            
+            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")
+                    
+                    current_season_no = 1
+                    match = re.search(r"sezon-(\d+)", target_url)
+                    if match:
+                        current_season_no = int(match.group(1))
+                    
+                    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 href:
+                            ep_no = 0
+                            match_ep = re.search(r"bolum-(\d+)", href)
+                            if match_ep:
+                                ep_no = int(match_ep.group(1))
+                                
+                            episodes.append(Episode(
+                                season = current_season_no,
+                                episode = ep_no,
+                                title = name,
+                                url = self.fix_url(href)
+                            ))
+                except Exception:
+                    pass
         
         if episodes:
             return SeriesInfo(
                 title    = title,
                 url      = url,
-                poster   = self.fix_url(poster),
+                poster   = self.fix_url(poster) if poster else None,
                 description = description,
                 rating   = rating,
                 tags     = tags,
@@ -215,7 +235,7 @@ class Sinefy(PluginBase):
             return MovieInfo(
                 title       = title,
                 url         = url,
-                poster      = self.fix_url(poster),
+                poster      = self.fix_url(poster) if poster else None,
                 description = description,
                 rating      = rating,
                 tags        = tags,
@@ -225,16 +245,25 @@ class Sinefy(PluginBase):
 
     async def load_links(self, url: str) -> list[ExtractResult]:
         resp = await self.httpx.get(url)
-        sel  = Selector(resp.text)
+        sel  = HTMLParser(resp.text)
         
-        iframe = sel.css("iframe::attr(src)").get()
+        iframe_el = sel.css_first("iframe")
+        iframe    = iframe_el.attrs.get("src") if iframe_el else None
+
         if not iframe:
             return []
             
         iframe_url = self.fix_url(iframe)
         
-        # Always return iframe (matching Kotlin - no extractor check)
-        # loadExtractor in Kotlin handles extraction internally
+        # Try to extract actual video URL, fallback to raw iframe if fails
+        try:
+            result = await self.extract(iframe_url)
+            if result:
+                return [result] if not isinstance(result, list) else result
+        except Exception:
+            pass
+        
+        # Fallback: return raw iframe URL
         return [ExtractResult(
             url  = iframe_url,
             name = "Sinefy Player"