Skip to content

Commit

Permalink
Bug Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@asaddon
asaddon committed Dec 19, 2024
1 parent fee3619 commit 60147d7
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 73 deletions.
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "community.einthusantv",
"version": "2.7.0",
"version": "3.0.0",
"name": "EinthusanTV",
"description": "Addon for Streaming from EinthusanTV by Asaddon",
"logo": "https://i.imgur.com/hmTKdwR.png",
Expand Down
138 changes: 68 additions & 70 deletions sources.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,48 @@ class RequestQueue {
}
}

async function verifyImdbTitle(title, year) {
try {
const imdbId = await getImdbId(title, year);
if (!imdbId) return false;

const fetchedTitle = await ttnumberToTitle(imdbId);
if (!fetchedTitle) return false;

// Extract the first word from both titles
const inputFirstWord = title.split(/\s+/)[0].toLowerCase();
const fetchedFirstWord = fetchedTitle.split(/\s+/)[0].toLowerCase();

// Check if the first words match exactly
if (inputFirstWord === fetchedFirstWord) {
//console.info(`Match Found: The title "${title}" matches the fetched title "${fetchedTitle}" for IMDb ID "${imdbId}".`);
return imdbId; // Return IMDb ID if the first words match
}

// If the first words are different but we want to avoid false positives, we can further refine the logic
// Example: Don't match numbers with words or completely different titles.
if (inputFirstWord === fetchedFirstWord ||
(isNaN(inputFirstWord) && isNaN(fetchedFirstWord) && inputFirstWord.toLowerCase().startsWith(fetchedFirstWord)) ||
(inputFirstWord.toLowerCase() === fetchedFirstWord.toLowerCase())) {
console.warn(`Relaxed Match: The title "${title}" does not perfectly match the fetched title "${fetchedTitle}" but the first words align based on starting letter. Accepting as a match.`);
return imdbId;// Adjusted to reject false positives more effectively
}

// If no match found
return null;
} catch (err) {
console.error(`Error in verifyImdbTitle: ${err.message}`);
return null; // Return null if there is an error
}
}








const requestQueue = new RequestQueue();

// Optimized IMDb ID fetching
Expand Down Expand Up @@ -194,96 +236,59 @@ async function ttnumberToTitle(ttNumber) {
}

const cacheKey = `title_${ttNumber}`;
const countryCacheKey = `country_${ttNumber}`;

// Check if a request for this `ttNumber` is already in progress
if (promiseCache.has(ttNumber)) {
//console.info(`${useColors ? '\x1b[33m' : ''}Promise cache hit for IMDb ID: ${ttNumber}. Waiting for ongoing request.${useColors ? '\x1b[0m' : ''}`);
return promiseCache.get(ttNumber); // Return the existing promise
}

// Check the cache for title or country information
// Check the cache for title information
const cachedTitle = cache.get(cacheKey);
if (cachedTitle) {
const title = decompressData(cachedTitle);
//console.info(`${useColors ? '\x1b[32m' : ''}Cache hit for title: "${title}" of IMDb ID: ${ttNumber}${useColors ? '\x1b[0m' : ''}`);
return title;
}

const cachedCountry = cache.get(countryCacheKey);
if (cachedCountry) {
const { isIndian, title } = decompressData(cachedCountry);
//console.info(`${useColors ? '\x1b[33m' : ''}Cache hit for country check of IMDb ID: ${ttNumber}. Title: "${title}", IsIndian: ${isIndian}${useColors ? '\x1b[0m' : ''}`);
if (isIndian) {
console.info(`${useColors ? '\x1b[36m' : ''}Returning cached title for Indian movie: "${title}"${useColors ? '\x1b[0m' : ''}`);
return title;
} else {
//console.info(`${useColors ? '\x1b[31m' : ''}Cached result: IMDb ID: ${ttNumber}, Movie: "${title}" is not from India.${useColors ? '\x1b[0m' : ''}`);
return null;
}
}

// Create a new promise for this `ttNumber` and store it in the promise cache
const fetchPromise = (async () => {
try {
const omdbApiKey = process.env.OMDB_API_KEY;
if (!omdbApiKey) {
console.error(`${useColors ? '\x1b[31m' : ''}OMDB API Key is missing in environment variables.${useColors ? '\x1b[0m' : ''}`);
console.error('OMDB API Key is missing in environment variables.');
return null;
}

const omdbUrl = `https://www.omdbapi.com/?i=${ttNumber}&apikey=${omdbApiKey}`;
//console.info(`${useColors ? '\x1b[34m' : ''}Fetching data from OMDB API for IMDb ID: ${ttNumber}. URL: ${omdbUrl}${useColors ? '\x1b[0m' : ''}`);

const response = await axios.get(omdbUrl, { timeout: 10000 });
const movieData = response.data;
const countryOfOrigin = movieData.Country;
const movieTitle = movieData.Title;
const isIndian = countryOfOrigin && countryOfOrigin.includes('India');
const countryCheckResult = { isIndian, title: movieTitle };

//console.info(`${useColors ? '\x1b[32m' : ''}OMDB API response for IMDb ID: ${ttNumber} - Title: "${movieTitle}", Country: "${countryOfOrigin}"${useColors ? '\x1b[0m' : ''}`);
const movieTitle = response.data.Title;

// Cache the country check result
cache.set(countryCacheKey, compressData(countryCheckResult));
//console.info(`${useColors ? '\x1b[36m' : ''}Cached country check for IMDb ID: ${ttNumber}. IsIndian: ${isIndian}${useColors ? '\x1b[0m' : ''}`);

if (!isIndian) {
console.info(`${useColors ? '\x1b[31m' : ''}Movie: "${movieTitle}" (IMDb ID: ${ttNumber}) is not from India. Skipping.${useColors ? '\x1b[0m' : ''}`);
if (!movieTitle) {
console.error(`No title found for IMDb ID: ${ttNumber}.`);
return null;
}

// Step 4: Country is India, return the title from OMDB
console.info(`Movie "${useColors ? '\x1b[36m' : ''}${movieTitle}${useColors ? '\x1b[0m' : ''}" (IMDb ID: ${useColors ? '\x1b[32m' : ''}${ttNumber}${useColors ? '\x1b[0m' : ''}) Is From India. Continuing.`);

// Cache the title
cache.set(cacheKey, compressData(movieTitle));
//console.info(`${useColors ? '\x1b[36m' : ''}Cached title for IMDb ID: ${ttNumber}. Title: "${movieTitle}"${useColors ? '\x1b[0m' : ''}`);
return movieTitle;
} catch (err) {
console.error(`${useColors ? '\x1b[31m' : ''}Error fetching movie data from OMDB API for IMDb ID: ${ttNumber}. Error message: ${err.message}${useColors ? '\x1b[0m' : ''}`);
console.error(`Error fetching movie data from OMDB API for IMDb ID: ${ttNumber}. Error message: ${err.message}`);

// Attempt fallback to IMDb suggestions API
console.info(`${useColors ? '\x1b[33m' : ''}Attempting to fetch title from IMDb Suggestions API for IMDb ID: ${ttNumber}${useColors ? '\x1b[0m' : ''}`);
try {
const imdbApiUrl = `https://v2.sg.media-imdb.com/suggestion/t/${ttNumber}.json`;
console.info(`${useColors ? '\x1b[34m' : ''}Fetching data from IMDb Suggestions API for IMDb ID: ${ttNumber}. URL: ${imdbApiUrl}${useColors ? '\x1b[0m' : ''}`);

const imdbResponse = await axios.get(imdbApiUrl, { timeout: 10000 });
const movie = imdbResponse.data.d.find(item => item.id === ttNumber);
const title = movie ? movie.l : null;

if (title) {
console.info(`${useColors ? '\x1b[33m' : ''}Fetched title from IMDb Suggestions API: "${title}" for IMDb ID: ${ttNumber}${useColors ? '\x1b[0m' : ''}`);
cache.set(cacheKey, compressData(title));
console.info(`${useColors ? '\x1b[36m' : ''}Cached title from IMDb Suggestions API for IMDb ID: ${ttNumber}. Title: "${title}"${useColors ? '\x1b[0m' : ''}`);
return title;
} else {
console.info(`${useColors ? '\x1b[31m' : ''}No title found for IMDb ID: ${ttNumber} in IMDb Suggestions API.${useColors ? '\x1b[0m' : ''}`);
console.error(`No title found for IMDb ID: ${ttNumber} in IMDb Suggestions API.`);
return null;
}

return title;
} catch (imdbErr) {
console.error(`${useColors ? '\x1b[31m' : ''}Error fetching title from IMDb Suggestions API for IMDb ID: ${ttNumber}. Error message: ${imdbErr.message}${useColors ? '\x1b[0m' : ''}`);
console.error(`Error fetching title from IMDb Suggestions API for IMDb ID: ${ttNumber}. Error message: ${imdbErr.message}`);
return null;
}
}
Expand All @@ -294,7 +299,6 @@ async function ttnumberToTitle(ttNumber) {

// Remove the promise from the cache once it resolves or rejects
fetchPromise.finally(() => {
//console.info(`${useColors ? '\x1b[33m' : ''}Removing completed promise for IMDb ID: ${ttNumber} from cache.${useColors ? '\x1b[0m' : ''}`);
promiseCache.delete(ttNumber);
});

Expand All @@ -303,6 +307,7 @@ async function ttnumberToTitle(ttNumber) {




// Optimized IP replacement
const replaceIpInLink = (link) => {
//console.log(`Original link: ${link}`);
Expand Down Expand Up @@ -446,10 +451,7 @@ async function search(lang, slug) {
const url = `/movie/results/?lang=${lang}&query=${encodeURIComponent(slug)}`;
const results = await getcatalogresults(url);

return results.map(item => ({
...item,
id: `einthusan_${item.EinthusanID}` // Dynamically update 'id'
}));
return results;
} catch (err) {
console.error("Error in search function:", err.message, { lang, slug });
return null;
Expand All @@ -468,7 +470,7 @@ async function getcatalogresults(url) {
// Process results in batches for better performance
const batchSize = 10;
const resultsArray = [];

for (let i = 0; i < searchResults.length; i += batchSize) {
const batch = searchResults.slice(i, i + batchSize);
const batchPromises = batch.map(async (item) => {
Expand All @@ -486,9 +488,11 @@ async function getcatalogresults(url) {

if (!img || !year || !title || !einthusanId) return null;

const imdbId = await getImdbId(title, year);
// Fetch IMDb ID and verify the match
const imdbId = await verifyImdbTitle(title, year);

return {
id: imdbId || `einthusan_${einthusanId}`,
id: imdbId || `einthusan_${einthusanId}`, // Use IMDb ID if verified, else fallback to Einthusan ID
EinthusanID: einthusanId,
type: "movie",
name: title,
Expand All @@ -510,6 +514,7 @@ async function getcatalogresults(url) {
}
}


// Optimized function to get Einthusan ID by title
async function getEinthusanIdByTitle(title, lang, ttnumber) {
// Check if lang is undefined
Expand Down Expand Up @@ -572,24 +577,20 @@ async function getAllRecentMovies(maxPages, lang, logSummary = true) {

try {
console.info(`${useColors ? '\x1b[33m' : ''}Fetching All Recent Movies For Language: ${useColors ? '\x1b[0m' : ''}${useColors ? '\x1b[36m' : ''}${capitalizeFirstLetter(lang)}${useColors ? '\x1b[0m' : ''}${useColors ? '\x1b[33m' : ''}, Max Pages: ${useColors ? '\x1b[0m' : ''}${useColors ? '\x1b[32m' : ''}${maxPages}${useColors ? '\x1b[0m' : ''}`);
const fetchPage = async (page, retries = 10) => {

const fetchPage = async (page, retries = 10) => {
const pageUrl = `/movie/results/?find=Recent&lang=${lang}&page=${page}`;

try {
//console.info(`Fetching Page: ${pageUrl}`);
const response = await requestQueue.add(() => client.get(pageUrl));

if (response.status === 200) {
const body = response.data; // Adjust based on your response format
const body = response.data;
if (body.includes('<title>Rate Limited - Einthusan</title>')) {
//console.error(`Rate limited on page ${page}. Waiting for 5 seconds before retrying...`);
await sleep(5000); // Wait for 5 seconds
return fetchPage(page, lang, retries); // Retry the same page
return fetchPage(page, lang, retries);
}
}

// Check if response data is empty
if (!response.data || response.data.trim().length === 0) {
console.warn(`Empty response data for page ${page}.`);
return [];
Expand Down Expand Up @@ -618,9 +619,10 @@ async function getAllRecentMovies(maxPages, lang, logSummary = true) {

if (!img || !year || !title || !einthusanId) return null;

const imdbId = await getImdbId(title, year);
return {
id: imdbId || `einthusan_${einthusanId}`,
const imdbId = await verifyImdbTitle(title, year);

return {
id: imdbId || `einthusan_${einthusanId}`,
EinthusanID: einthusanId,
type: "movie",
name: title,
Expand All @@ -646,7 +648,6 @@ async function getAllRecentMovies(maxPages, lang, logSummary = true) {
}
};

// Fetch all pages
const pagePromises = [];
for (let i = 1; i <= maxPages; i++) {
pagePromises.push(fetchPage(i));
Expand All @@ -655,7 +656,6 @@ async function getAllRecentMovies(maxPages, lang, logSummary = true) {
const allPages = await Promise.all(pagePromises);
const uniqueMovies = new Map();

// Merge results and remove duplicates
allPages.flat().forEach(movie => {
if (movie && !uniqueMovies.has(movie.EinthusanID)) {
uniqueMovies.set(movie.EinthusanID, movie);
Expand All @@ -667,8 +667,6 @@ async function getAllRecentMovies(maxPages, lang, logSummary = true) {
console.info(`${useColors ? '\x1b[33m' : ''}Fetched A Total Of ${useColors ? '\x1b[0m' : ''}${useColors ? '\x1b[32m' : ''}${results.length}${useColors ? '\x1b[0m' : ''}${useColors ? '\x1b[33m' : ''} Unique Recent Movies In Language: ${useColors ? '\x1b[0m' : ''}${useColors ? '\x1b[36m' : ''}${capitalizeFirstLetter(lang)}${useColors ? '\x1b[0m' : ''}`);
}


// Cache final results for 12 hours with compression
cache.set(cacheKey, compressData(results), 43200);
return results;
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion vue/dist/assets/index-97be43fd.js → vue/dist/assets/index-756b8258.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vue/dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- <title>Trakt Lists</title> -->
<script type="module" crossorigin src="/assets/index-97be43fd.js"></script>
<script type="module" crossorigin src="/assets/index-756b8258.js"></script>
<link rel="stylesheet" href="/assets/index-6ac68831.css">
</head>
<body>
Expand Down

0 comments on commit 60147d7

Please sign in to comment.