Hardening series meta: survive missing still_url and empty available flags.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
52e2be7296
commit
f6482be692
3 changed files with 136 additions and 30 deletions
|
|
@ -0,0 +1,2 @@
|
||||||
|
-- Ensure still_url exists even if earlier migrate state drifted
|
||||||
|
ALTER TABLE "episodes" ADD COLUMN IF NOT EXISTS "still_url" TEXT;
|
||||||
|
|
@ -78,6 +78,15 @@ async function main() {
|
||||||
nodeConnectionManager.init(config);
|
nodeConnectionManager.init(config);
|
||||||
await ensureAdminUser(config);
|
await ensureAdminUser(config);
|
||||||
|
|
||||||
|
// Safety net if migrate history drifted — series meta must not 500.
|
||||||
|
try {
|
||||||
|
await prisma.$executeRawUnsafe(
|
||||||
|
`ALTER TABLE "episodes" ADD COLUMN IF NOT EXISTS "still_url" TEXT`
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
console.warn("Could not ensure episodes.still_url:", err);
|
||||||
|
}
|
||||||
|
|
||||||
const shutdown = async () => {
|
const shutdown = async () => {
|
||||||
console.log("Shutting down...");
|
console.log("Shutting down...");
|
||||||
nodeConnectionManager.shutdown();
|
nodeConnectionManager.shutdown();
|
||||||
|
|
|
||||||
|
|
@ -318,41 +318,27 @@ async function getMovieMeta(id: string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getSeriesMeta(id: string, metadata: MetadataService) {
|
async function getSeriesMeta(id: string, metadata: MetadataService) {
|
||||||
const series = await prisma.series.findFirst({
|
const series = await loadSeriesForMeta(id);
|
||||||
where: {
|
|
||||||
OR: [{ imdbId: id }, { id: unwrapLocalId(id, "series") }],
|
|
||||||
},
|
|
||||||
include: {
|
|
||||||
seasons: {
|
|
||||||
include: {
|
|
||||||
episodes: {
|
|
||||||
orderBy: [{ seasonNumber: "asc" }, { episodeNumber: "asc" }],
|
|
||||||
include: { mediaFiles: { where: { available: true }, take: 1 } },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
orderBy: { seasonNumber: "asc" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!series) return null;
|
if (!series) return null;
|
||||||
|
|
||||||
// Enrich in background — never block or break episode listing on TMDB/DB issues.
|
// Enrich in background — never block or break episode listing.
|
||||||
void metadata.enrichSeriesEpisodes(series.id).catch(() => undefined);
|
void metadata.enrichSeriesEpisodes(series.id).catch(() => undefined);
|
||||||
|
|
||||||
const sid = seriesId(series.imdbId, series.id);
|
const sid = seriesId(series.imdbId, series.id);
|
||||||
const videos = series.seasons.flatMap((season) =>
|
const videos = series.episodes
|
||||||
season.episodes
|
|
||||||
.filter((ep) => ep.mediaFiles.length > 0)
|
.filter((ep) => ep.mediaFiles.length > 0)
|
||||||
.map((ep) => ({
|
.map((ep) => ({
|
||||||
id: `${sid}:${ep.seasonNumber}:${ep.episodeNumber}`,
|
id: `${sid}:${ep.seasonNumber}:${ep.episodeNumber}`,
|
||||||
title: ep.title && !/^episode\s+\d+$/i.test(ep.title) ? ep.title : `Episode ${ep.episodeNumber}`,
|
title:
|
||||||
|
ep.title && !/^episode\s+\d+$/i.test(ep.title)
|
||||||
|
? ep.title
|
||||||
|
: `Episode ${ep.episodeNumber}`,
|
||||||
season: ep.seasonNumber,
|
season: ep.seasonNumber,
|
||||||
episode: ep.episodeNumber,
|
episode: ep.episodeNumber,
|
||||||
overview: ep.overview ?? undefined,
|
overview: ep.overview ?? undefined,
|
||||||
thumbnail: ep.stillUrl || undefined,
|
thumbnail: ep.stillUrl || undefined,
|
||||||
released: formatMetaDate(ep.airDate),
|
released: formatMetaDate(ep.airDate),
|
||||||
}))
|
}));
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: sid,
|
id: sid,
|
||||||
|
|
@ -367,6 +353,115 @@ async function getSeriesMeta(id: string, metadata: MetadataService) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Load series + episodes without depending on optional still_url column. */
|
||||||
|
async function loadSeriesForMeta(id: string): Promise<{
|
||||||
|
id: string;
|
||||||
|
title: string;
|
||||||
|
year: number | null;
|
||||||
|
overview: string | null;
|
||||||
|
posterUrl: string | null;
|
||||||
|
backdropUrl: string | null;
|
||||||
|
genres: string[];
|
||||||
|
imdbId: string | null;
|
||||||
|
episodes: Array<{
|
||||||
|
seasonNumber: number;
|
||||||
|
episodeNumber: number;
|
||||||
|
title: string | null;
|
||||||
|
overview: string | null;
|
||||||
|
airDate: Date | null;
|
||||||
|
stillUrl: string | null;
|
||||||
|
mediaFiles: Array<{ id: string }>;
|
||||||
|
}>;
|
||||||
|
} | null> {
|
||||||
|
const where = {
|
||||||
|
OR: [{ imdbId: id }, { id: unwrapLocalId(id, "series") }],
|
||||||
|
};
|
||||||
|
|
||||||
|
const available = await querySeriesEpisodes(where, true);
|
||||||
|
if (available && available.episodes.some((ep) => ep.mediaFiles.length > 0)) {
|
||||||
|
return available;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: list episodes that still have files even if marked unavailable
|
||||||
|
// (e.g. brief node disconnect), so Stremio is not empty.
|
||||||
|
const anyFiles = await querySeriesEpisodes(where, false);
|
||||||
|
return anyFiles ?? available;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function querySeriesEpisodes(
|
||||||
|
where: { OR: Array<Record<string, string>> },
|
||||||
|
onlyAvailable: boolean
|
||||||
|
) {
|
||||||
|
const mediaFilesArgs = onlyAvailable
|
||||||
|
? { where: { available: true as const }, take: 1 as const, select: { id: true as const } }
|
||||||
|
: { take: 1 as const, select: { id: true as const } };
|
||||||
|
|
||||||
|
try {
|
||||||
|
const row = await prisma.series.findFirst({
|
||||||
|
where,
|
||||||
|
select: {
|
||||||
|
id: true,
|
||||||
|
title: true,
|
||||||
|
year: true,
|
||||||
|
overview: true,
|
||||||
|
posterUrl: true,
|
||||||
|
backdropUrl: true,
|
||||||
|
genres: true,
|
||||||
|
imdbId: true,
|
||||||
|
episodes: {
|
||||||
|
orderBy: [{ seasonNumber: "asc" as const }, { episodeNumber: "asc" as const }],
|
||||||
|
select: {
|
||||||
|
seasonNumber: true,
|
||||||
|
episodeNumber: true,
|
||||||
|
title: true,
|
||||||
|
overview: true,
|
||||||
|
airDate: true,
|
||||||
|
stillUrl: true,
|
||||||
|
mediaFiles: mediaFilesArgs,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (row) return row;
|
||||||
|
} catch {
|
||||||
|
// still_url missing — retry without that field
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const row = await prisma.series.findFirst({
|
||||||
|
where,
|
||||||
|
select: {
|
||||||
|
id: true,
|
||||||
|
title: true,
|
||||||
|
year: true,
|
||||||
|
overview: true,
|
||||||
|
posterUrl: true,
|
||||||
|
backdropUrl: true,
|
||||||
|
genres: true,
|
||||||
|
imdbId: true,
|
||||||
|
episodes: {
|
||||||
|
orderBy: [{ seasonNumber: "asc" as const }, { episodeNumber: "asc" as const }],
|
||||||
|
select: {
|
||||||
|
seasonNumber: true,
|
||||||
|
episodeNumber: true,
|
||||||
|
title: true,
|
||||||
|
overview: true,
|
||||||
|
airDate: true,
|
||||||
|
mediaFiles: mediaFilesArgs,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!row) return null;
|
||||||
|
return {
|
||||||
|
...row,
|
||||||
|
episodes: row.episodes.map((ep) => ({ ...ep, stillUrl: null as string | null })),
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function formatMetaDate(value: Date | null | undefined): string | undefined {
|
function formatMetaDate(value: Date | null | undefined): string | undefined {
|
||||||
if (!value) return undefined;
|
if (!value) return undefined;
|
||||||
const t = value.getTime();
|
const t = value.getTime();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue