feat: emit one series with episodes[] and per-file metadata cache
This commit is contained in:
+52
-8
@@ -26,7 +26,9 @@ export function catalogGroupKey(item) {
|
|||||||
const imdb = item.imdbId || item.suggestedImdbId || null;
|
const imdb = item.imdbId || item.suggestedImdbId || null;
|
||||||
const episode = item.type === 'episode' || (item.season != null && item.episode != null);
|
const episode = item.type === 'episode' || (item.season != null && item.episode != null);
|
||||||
if (episode) {
|
if (episode) {
|
||||||
return imdb && item.season != null && item.episode != null ? `${imdb}:${item.season}:${item.episode}` : null;
|
if (imdb) return imdb;
|
||||||
|
const title = slug(item.title);
|
||||||
|
return title || null;
|
||||||
}
|
}
|
||||||
if (imdb) return imdb;
|
if (imdb) return imdb;
|
||||||
const title = slug(item.title);
|
const title = slug(item.title);
|
||||||
@@ -65,11 +67,49 @@ export function groupCatalog(items) {
|
|||||||
.sort((a, b) => b.size - a.size || a.file.localeCompare(b.file)));
|
.sort((a, b) => b.size - a.size || a.file.localeCompare(b.file)));
|
||||||
if (!files.length) return [];
|
if (!files.length) return [];
|
||||||
const representative = members.find(member => member.id === files[0].id) || members[0];
|
const representative = members.find(member => member.id === files[0].id) || members[0];
|
||||||
|
const episodeMembers = members
|
||||||
|
.filter(member => (member.size || 0) > 0 && member.season != null && member.episode != null)
|
||||||
|
.sort((a, b) => (a.season - b.season) || (a.episode - b.episode) || String(a.file).localeCompare(String(b.file)));
|
||||||
|
const seenEp = new Set();
|
||||||
|
const episodes = [];
|
||||||
|
for (const member of episodeMembers) {
|
||||||
|
const ek = `${member.season}:${member.episode}`;
|
||||||
|
if (seenEp.has(ek)) continue;
|
||||||
|
seenEp.add(ek);
|
||||||
|
episodes.push({
|
||||||
|
id: member.id,
|
||||||
|
season: member.season,
|
||||||
|
episode: member.episode,
|
||||||
|
title: member.title,
|
||||||
|
file: member.file,
|
||||||
|
size: member.size,
|
||||||
|
imdbId: member.imdbId || member.suggestedImdbId || null,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (episodes.length) {
|
||||||
|
return [{
|
||||||
|
...representative,
|
||||||
|
id,
|
||||||
|
type: 'series',
|
||||||
|
season: null,
|
||||||
|
episode: null,
|
||||||
|
file: files[0].file,
|
||||||
|
files,
|
||||||
|
size: files[0].size,
|
||||||
|
episodes,
|
||||||
|
}];
|
||||||
|
}
|
||||||
return [{ ...representative, id, file: files[0].file, files, size: files[0].size }];
|
return [{ ...representative, id, file: files[0].file, files, size: files[0].size }];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function catalogMembers(item, requestedId) {
|
export function catalogMembers(item, requestedId) {
|
||||||
|
if (requestedId && item?.episodes?.length) {
|
||||||
|
const episode = item.episodes.find(entry => entry.id === requestedId);
|
||||||
|
if (episode) {
|
||||||
|
return [{ id: episode.id, file: episode.file, size: episode.size || 0 }].filter(file => (file.size || 0) > 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
const files = (item?.files || (item ? [{ id: item.id, file: item.file, size: item.size || 0 }] : []))
|
const files = (item?.files || (item ? [{ id: item.id, file: item.file, size: item.size || 0 }] : []))
|
||||||
.filter(file => (file.size || 0) > 0)
|
.filter(file => (file.size || 0) > 0)
|
||||||
.slice()
|
.slice()
|
||||||
@@ -95,26 +135,30 @@ export function createLibrary(mediaRoot, indexPath, tmdbApiKey) {
|
|||||||
const type = item.type === 'episode' ? 'tv' : 'movie';
|
const type = item.type === 'episode' ? 'tv' : 'movie';
|
||||||
const query = new URLSearchParams({ api_key: tmdbApiKey, query: item.title });
|
const query = new URLSearchParams({ api_key: tmdbApiKey, query: item.title });
|
||||||
if (item.year) query.set(type === 'movie' ? 'year' : 'first_air_date_year', item.year);
|
if (item.year) query.set(type === 'movie' ? 'year' : 'first_air_date_year', item.year);
|
||||||
const results = await fetch(`https://api.themoviedb.org/3/search/${type}?${query}`).then(res => res.ok ? res.json() : { results: [] });
|
const results = await fetch(`https://api.themoviedb.org/3/search/${type}?${query}`).then(res => res.ok ? res.json() : { results: [] }).catch(() => ({ results: [] }));
|
||||||
const candidate = results.results?.[0];
|
const candidate = results.results?.[0];
|
||||||
if (!candidate) return item;
|
if (!candidate) return item;
|
||||||
const candidateTitle = candidate.title || candidate.name || '';
|
const candidateTitle = candidate.title || candidate.name || '';
|
||||||
const candidateYear = (candidate.release_date || candidate.first_air_date || '').slice(0, 4);
|
const candidateYear = (candidate.release_date || candidate.first_air_date || '').slice(0, 4);
|
||||||
const normalize = value => value.toLowerCase().replace(/[^a-z0-9]/g, '');
|
const normalize = value => value.toLowerCase().replace(/[^a-z0-9]/g, '');
|
||||||
const confident = Boolean(item.year) && normalize(candidateTitle) === normalize(item.title) && candidateYear === String(item.year);
|
const titleMatch = normalize(candidateTitle) === normalize(item.title);
|
||||||
|
const yearMatch = !item.year || candidateYear === String(item.year);
|
||||||
|
const confident = titleMatch && yearMatch;
|
||||||
if (!confident) return { ...item, candidate: { title: candidateTitle, year: candidateYear, tmdbId: candidate.id } };
|
if (!confident) return { ...item, candidate: { title: candidateTitle, year: candidateYear, tmdbId: candidate.id } };
|
||||||
const external = await fetch(`https://api.themoviedb.org/3/${type}/${candidate.id}/external_ids?api_key=${tmdbApiKey}`).then(res => res.ok ? res.json() : {});
|
const external = await fetch(`https://api.themoviedb.org/3/${type}/${candidate.id}/external_ids?api_key=${tmdbApiKey}`).then(res => res.ok ? res.json() : {}).catch(() => ({}));
|
||||||
return { ...item, suggestedImdbId: external.imdb_id || null, autoMapped: Boolean(external.imdb_id), candidate: { title: candidateTitle, year: candidateYear, tmdbId: candidate.id } };
|
return { ...item, year: item.year || Number(candidateYear) || null, suggestedImdbId: external.imdb_id || null, autoMapped: Boolean(external.imdb_id), candidate: { title: candidateTitle, year: candidateYear, tmdbId: candidate.id } };
|
||||||
};
|
};
|
||||||
const tmdb = async (endpoint, query = {}) => {
|
const tmdb = async (endpoint, query = {}) => {
|
||||||
if (!tmdbApiKey) return null;
|
if (!tmdbApiKey) return null;
|
||||||
const params = new URLSearchParams({ api_key: tmdbApiKey, ...query });
|
const params = new URLSearchParams({ api_key: tmdbApiKey, ...query });
|
||||||
const response = await fetch(`https://api.themoviedb.org/3${endpoint}?${params}`);
|
try {
|
||||||
return response.ok ? response.json() : null;
|
const response = await fetch(`https://api.themoviedb.org/3${endpoint}?${params}`);
|
||||||
|
return response.ok ? response.json() : null;
|
||||||
|
} catch { return null; }
|
||||||
};
|
};
|
||||||
const imageUrl = (image, size) => image ? `https://image.tmdb.org/t/p/${size}${image}` : null;
|
const imageUrl = (image, size) => image ? `https://image.tmdb.org/t/p/${size}${image}` : null;
|
||||||
const metadataFor = async item => {
|
const metadataFor = async item => {
|
||||||
const key = `${item.imdbId || ''}:${item.title}:${item.year || ''}:${item.type}`;
|
const key = `${item.imdbId || ''}:${item.title}:${item.year || ''}:${item.type}:${item.file || ''}:${item.season || ''}:${item.episode || ''}`;
|
||||||
if (metadataCache.has(key)) return metadataCache.get(key);
|
if (metadataCache.has(key)) return metadataCache.get(key);
|
||||||
const pending = (async () => {
|
const pending = (async () => {
|
||||||
if (!tmdbApiKey) return item;
|
if (!tmdbApiKey) return item;
|
||||||
|
|||||||
Reference in New Issue
Block a user