feat: update version to 2.0 in manifest.json; refactor getMeta and getPosts functions for improved data extraction

manifest.json

@@ -290,7 +290,7 @@
   {
     "display_name": "RogMovies",
     "value": "luxMovies",
-    "version": "1.9",
+    "version": "2.0",
     "icon": "",
     "type": "india",
     "disabled": false

providers/luxMovies/meta.ts

@@ -40,42 +40,103 @@ export const getMeta = async ({
       },
     });
     const $ = cheerio.load(response.data);
-    const infoContainer = $(".entry-content,.post-inner");
-    const heading = infoContainer?.find("h3");
-    const imdbId =
-      //@ts-ignore
-      heading?.next("p")?.find("a")?.[0]?.attribs?.href?.match(/tt\d+/g)?.[0] ||
-      infoContainer.text().match(/tt\d+/g)?.[0] ||
-      "";
-    // console.log(imdbId)
+    const infoContainer = $(
+      ".entry-content, .post-inner, .post-content, .page-body",
+    );
 
-    const type = heading?.next("p")?.text()?.includes("Series Name")
-      ? "series"
-      : "movie";
-    //   console.log(type);
     // title
-    const titleRegex = /Name: (.+)/;
-    const title = heading?.next("p")?.text()?.match(titleRegex)?.[1] || "";
+    let title = $("h1.post-title").text().trim();
+    if (!title) {
+      const heading = infoContainer?.find("h3");
+      const titleRegex = /Name: (.+)/;
+      title = heading?.next("p")?.text()?.match(titleRegex)?.[1] || "";
+    }
     //   console.log(title);
 
+    // imdbId
+    let imdbId =
+      $('a[href*="imdb.com"]').attr("href")?.match(/tt\d+/)?.[0] || "";
+    if (!imdbId) {
+      const heading = infoContainer?.find("h3");
+      imdbId =
+        //@ts-ignore
+        heading
+          ?.next("p")
+          ?.find("a")?.[0]
+          ?.attribs?.href?.match(/tt\d+/g)?.[0] ||
+        infoContainer.text().match(/tt\d+/g)?.[0] ||
+        "";
+    }
+    // console.log(imdbId)
+
+    // type
+    let type = "movie";
+
+    const heading = infoContainer?.find("h3");
+    if (heading?.next("p")?.text()?.includes("Series Name")) {
+      type = "series";
+    }
+
+    //   console.log(type);
+
     // synopsis
-    const synopsisNode = //@ts-ignore
-      infoContainer?.find("p")?.next("h3,h4")?.next("p")?.[0]?.children?.[0];
-    const synopsis =
-      synopsisNode && "data" in synopsisNode ? synopsisNode.data : "";
+    let synopsis = "";
+    const synopsisHeader = $("h3").filter(
+      (i, el) =>
+        $(el).text().includes("SYNOPSIS/PLOT") || $(el).text().includes("Plot"),
+    );
+    if (synopsisHeader.length > 0) {
+      synopsis = synopsisHeader.next("p").text().trim();
+    }
+    if (!synopsis) {
+      const synopsisNode = //@ts-ignore
+        infoContainer?.find("p")?.next("h3,h4")?.next("p")?.[0]?.children?.[0];
+      synopsis =
+        synopsisNode && "data" in synopsisNode ? synopsisNode.data : "";
+    }
     //   console.log(synopsis);
 
     // image
     let image =
-      infoContainer?.find("img[data-lazy-src]")?.attr("data-lazy-src") || "";
+      infoContainer?.find("img[data-lazy-src]")?.attr("data-lazy-src") ||
+      infoContainer
+        ?.find("img")
+        ?.filter((i, el) => {
+          const src = $(el).attr("src");
+          return (
+            !!src &&
+            !src.includes("logo") &&
+            !src.includes("svg") &&
+            !src.includes("placeholder") &&
+            !src.includes("icon")
+          );
+        })
+        ?.first()
+        ?.attr("src") ||
+      "";
+
     if (image.startsWith("//")) {
       image = "https:" + image;
     }
     // console.log(image);
 
-    // console.log({title, synopsis, image, imdbId, type});
+    console.log({ title, synopsis, image, imdbId, type });
     /// Links
-    const hr = infoContainer?.first()?.find("hr");
+    let hr = infoContainer?.first()?.find("hr");
+
+    // Try to find the HR before the download buttons if possible
+    const firstButton = $(".dwd-button").first();
+    if (firstButton.length > 0) {
+      const containerP = firstButton.closest("p");
+      let prev = containerP.prev();
+      while (prev.length && !prev.is("hr")) {
+        prev = prev.prev();
+      }
+      if (prev.is("hr")) {
+        hr = prev;
+      }
+    }
+
     const list = hr?.nextUntil("hr");
     const links: Link[] = [];
     list.each((index, element: any) => {
@@ -86,39 +147,41 @@ export const getMeta = async ({
       const quality = element?.text().match(/\d+p\b/)?.[0] || "";
       // console.log(title);
       // movieLinks
-      const movieLinks = element
-        ?.next()
-        .find(".dwd-button")
-        .text()
-        .toLowerCase()
-        .includes("download")
-        ? element?.next().find(".dwd-button")?.parent()?.attr("href")
-        : "";
+      const movieLinks =
+        element
+          ?.next()
+          .find(".dwd-button")
+          .text()
+          .toLowerCase()
+          .includes("download") ||
+        element.next().find("a").text().toLowerCase().includes("download")
+          ? element?.next().find(".dwd-button")?.parent()?.attr("href") ||
+            element?.next().find("a[href]")?.attr("href")
+          : "";
 
       // episode links
       const vcloudLinks = element
         ?.next()
         .find(
-          ".btn-outline[style='background:linear-gradient(135deg,#ed0b0b,#f2d152); color: white;'],.btn-outline[style='background:linear-gradient(135deg,#ed0b0b,#f2d152); color: #fdf8f2;']"
+          ".btn-outline[style='background:linear-gradient(135deg,#ed0b0b,#f2d152); color: white;'],.btn-outline[style='background:linear-gradient(135deg,#ed0b0b,#f2d152); color: #fdf8f2;'],.btn-outline[style='background:linear-gradient(135deg,#ed0b0b,#f2d152);color: white']",
         )
         ?.parent()
         ?.attr("href");
-      console.log(title);
       const episodesLink =
         (vcloudLinks
           ? vcloudLinks
           : element
-              ?.next()
-              .find(".dwd-button")
-              .text()
-              .toLowerCase()
-              .includes("episode")
-          ? element?.next().find(".dwd-button")?.parent()?.attr("href")
-          : "") ||
+                ?.next()
+                .find(".dwd-button")
+                .text()
+                .toLowerCase()
+                .includes("episode")
+            ? element?.next().find(".dwd-button")?.parent()?.attr("href")
+            : "") ||
         element
           ?.next()
           .find(
-            ".btn-outline[style='background:linear-gradient(135deg,#0ebac3,#09d261); color: white;']"
+            ".btn-outline[style='background:linear-gradient(135deg,#0ebac3,#09d261); color: white;']",
           )
           ?.parent()
           ?.attr("href");

providers/luxMovies/posts.ts

@@ -34,13 +34,13 @@ export const getPosts = async ({
   signal: AbortSignal;
   providerContext: ProviderContext;
 }): Promise<Post[]> => {
-  const { getBaseUrl } = providerContext;
-  const baseUrl = await getBaseUrl("lux");
+  const { getBaseUrl, axios, cheerio } = providerContext;
+  const baseUrl = await getBaseUrl("Vega");
 
   console.log("vegaGetPosts baseUrl:", providerValue, baseUrl);
   const url = `${baseUrl}/${filter}/page/${page}/`;
-  console.log("lux url:", url);
-  return posts(url, signal, providerContext);
+  console.log("vegaGetPosts url:", url);
+  return posts(baseUrl, url, signal, headers, axios, cheerio);
 };
 
 export const getSearchPosts = async ({
@@ -56,58 +56,96 @@ export const getSearchPosts = async ({
   signal: AbortSignal;
   providerContext: ProviderContext;
 }): Promise<Post[]> => {
-  const { getBaseUrl } = providerContext;
-  const baseUrl = await getBaseUrl("lux");
+  const { getBaseUrl, axios, cheerio } = providerContext;
+  const baseUrl = await getBaseUrl("Vega");
 
   console.log("vegaGetPosts baseUrl:", providerValue, baseUrl);
-  const url =
-    page === 1
-      ? `https://c.8man.workers.dev/?url=${baseUrl}/?s=${searchQuery}`
-      : `https://c.8man.workers.dev/?url=${baseUrl}/page/${page}/?s=${searchQuery}`;
-  console.log("lux url:", url);
+  const url = `${baseUrl}/search.php?q=${searchQuery}&page=${page}`;
+  console.log("vegaGetPosts url:", url);
 
-  return posts(url, signal, providerContext);
+  try {
+    const response = await axios.get(url, {
+      headers: {
+        ...headers,
+        Referer: baseUrl,
+      },
+      signal,
+    });
+
+    const data = response.data;
+    const posts: Post[] = [];
+
+    if (data?.hits) {
+      data.hits.forEach((hit: any) => {
+        const doc = hit.document;
+        const post = {
+          title: doc.post_title.replace("Download", "").trim(),
+          link: doc.permalink.startsWith("http")
+            ? doc.permalink
+            : `${baseUrl}${doc.permalink}`,
+          image: doc.post_thumbnail,
+        };
+        posts.push(post);
+      });
+    }
+    return posts;
+  } catch (error) {
+    console.error("vegaGetSearchPosts error:", error);
+    return [];
+  }
 };
 
 async function posts(
+  baseUrl: string,
   url: string,
   signal: AbortSignal,
-  providerContext: ProviderContext
+  headers: Record<string, string> = {},
+  axios: ProviderContext["axios"],
+  cheerio: ProviderContext["cheerio"],
 ): Promise<Post[]> {
   try {
-    const { axios, cheerio } = providerContext;
     const urlRes = await fetch(url, {
       headers: {
         ...headers,
-        Referer: url,
+        Referer: baseUrl,
       },
       signal,
     });
     const $ = cheerio.load(await urlRes.text());
     const posts: Post[] = [];
-    $(".blog-items")
-      ?.children("article")
+    $(".blog-items,.post-list,#archive-container,.movies-grid")
+      ?.children("article,.entry-list-item,a")
       ?.each((index, element) => {
         const post = {
-          title:
+          title: (
             $(element)
-              ?.find("a")
-              ?.attr("title")
+              ?.find(".entry-title,.poster-title")
+              ?.text()
               ?.replace("Download", "")
               ?.match(/^(.*?)\s*\((\d{4})\)|^(.*?)\s*\((Season \d+)\)/)?.[0] ||
             $(element)?.find("a")?.attr("title")?.replace("Download", "") ||
-            "",
+            $(element)
+              ?.find(".post-title,.poster-title")
+              .text()
+              ?.replace("Download", "") ||
+            ""
+          ).trim(),
 
-          link: $(element)?.find("a")?.attr("href") || "",
+          link:
+            $(element)?.find("a")?.attr("href") ||
+            $(element)?.attr("href") ||
+            "",
           image:
             $(element).find("a").find("img").attr("data-lazy-src") ||
             $(element).find("a").find("img").attr("data-src") ||
             $(element).find("a").find("img").attr("src") ||
+            $(element).find("img").attr("src") ||
             "",
         };
         if (post.image.startsWith("//")) {
           post.image = "https:" + post.image;
         }
+        console.log("vegaGetPosts post:", post);
         posts.push(post);
       });