Authors
@@ -246,83 +328,7 @@ export default function EntryDetailClient({ data }: { data: EntryDetailData }) {
-
-
Downloads
- {(!data.releases || data.releases.length === 0) &&
No downloads
}
- {data.releases && data.releases.length > 0 && (
-
- {data.releases.map((r) => (
-
-
- Release #{r.releaseSeq}
- {r.type.name && {r.type.name}}
- {r.language.name && {r.language.name}}
- {r.machinetype.name && {r.machinetype.name}}
- {r.year && {r.year}}
- {r.comments && {r.comments}}
-
-
- {r.downloads.length === 0 ? (
-
No downloads in this release
- ) : (
-
-
-
-
- | Type |
- Link |
- Size |
- MD5 |
- Flags |
- Details |
-
-
-
- {r.downloads.map((d) => {
- const isHttp = d.link.startsWith("http://") || d.link.startsWith("https://");
- return (
-
- | {d.type.name} |
-
- {isHttp ? (
- {d.link}
- ) : (
- {d.link}
- )}
- |
- {d.size != null ? new Intl.NumberFormat().format(d.size) : "-"} |
- {d.md5 ?? "-"} |
-
-
- {d.isDemo && Demo}
- {d.language.name && {d.language.name}}
- {d.machinetype.name && {d.machinetype.name}}
-
- |
-
-
- {d.scheme.name && {d.scheme.name}}
- {d.source.name && {d.source.name}}
- {d.case.name && {d.case.name}}
- {d.year && {d.year}}
-
- {d.comments && {d.comments} }
- |
-
- );
- })}
-
-
-
- )}
-
-
- ))}
-
- )}
-
-
-
+ {/* Removed grouped releases/downloads section to avoid duplicate downloads UI. */}
Permalink
diff --git a/src/server/repo/zxdb.ts b/src/server/repo/zxdb.ts
index b2f69ed..8594ff5 100644
--- a/src/server/repo/zxdb.ts
+++ b/src/server/repo/zxdb.ts
@@ -168,6 +168,23 @@ export interface EntryDetail {
comments: string | null;
type: { id: number; name: string };
}[];
+ // Flat downloads by entry_id (no dependency on releases)
+ downloadsFlat?: {
+ id: number;
+ link: string;
+ size: number | null;
+ md5: string | null;
+ comments: string | null;
+ isDemo: boolean;
+ type: { id: number; name: string };
+ language: { id: string | null; name: string | null };
+ machinetype: { id: number | null; name: string | null };
+ scheme: { id: string | null; name: string | null };
+ source: { id: string | null; name: string | null };
+ case: { id: string | null; name: string | null };
+ year: number | null;
+ releaseSeq: number;
+ }[];
releases?: {
releaseSeq: number;
type: { id: string | null; name: string | null };
@@ -194,18 +211,6 @@ export interface EntryDetail {
}
export async function getEntryById(id: number): Promise {
- // Helper: check if releases/downloads lookup tables exist; cache result per process
- // This prevents runtime crashes on environments where ZXDB schema is older/minimal.
- async function hasReleaseSchema() {
- try {
- const rows = await db.execute<{ cnt: number }>(sql`select count(*) as cnt from information_schema.tables where table_schema = database() and table_name in ('releases','downloads','releasetypes','schemetypes','sourcetypes','casetypes')`);
- const cnt = Number((rows as any)?.[0]?.cnt ?? 0);
- // require at least releases + downloads; lookups are optional
- return cnt >= 2;
- } catch {
- return false;
- }
- }
// Run base row + contributors in parallel to reduce latency
const [rows, authorRows, publisherRows] = await Promise.all([
@@ -277,9 +282,10 @@ export async function getEntryById(id: number): Promise {
let releaseRows: any[] = [];
let downloadRows: any[] = [];
- const schemaOk = await hasReleaseSchema();
- if (schemaOk) {
- // Fetch releases for this entry (lightweight)
+ let downloadFlatRows: any[] = [];
+
+ // Fetch releases for this entry (optional; ignore if table missing)
+ try {
releaseRows = (await db
.select({
releaseSeq: releases.releaseSeq,
@@ -297,8 +303,12 @@ export async function getEntryById(id: number): Promise {
.leftJoin(languages, eq(languages.id as any, releases.languageId as any))
.leftJoin(machinetypes, eq(machinetypes.id as any, releases.machinetypeId as any))
.where(eq(releases.entryId as any, id as any))) as any;
+ } catch {
+ releaseRows = [];
+ }
- // Fetch downloads for this entry, join lookups
+ // Fetch downloads for this entry, join lookups (do not gate behind schema checks)
+ try {
downloadRows = (await db
.select({
id: downloads.id,
@@ -330,8 +340,13 @@ export async function getEntryById(id: number): Promise {
.leftJoin(sourcetypes, eq(sourcetypes.id as any, downloads.sourcetypeId as any))
.leftJoin(casetypes, eq(casetypes.id as any, downloads.casetypeId as any))
.where(eq(downloads.entryId as any, id as any))) as any;
+ } catch {
+ downloadRows = [];
}
+ // Flat list: same rows mapped, independent of releases
+ downloadFlatRows = downloadRows;
+
const downloadsBySeq = new Map();
for (const row of downloadRows) {
const arr = downloadsBySeq.get(row.releaseSeq) ?? [];
@@ -339,6 +354,9 @@ export async function getEntryById(id: number): Promise {
downloadsBySeq.set(row.releaseSeq, arr);
}
+ // Build a map of downloads grouped by release_seq
+ // Then ensure we create "synthetic" release groups for any release_seq
+ // that appears in downloads but has no corresponding releases row.
const releasesData = releaseRows.map((r: any) => ({
releaseSeq: Number(r.releaseSeq),
type: { id: (r.releasetypeId as any) ?? null, name: (r.releasetypeName as any) ?? null },
@@ -363,6 +381,11 @@ export async function getEntryById(id: number): Promise {
})),
}));
+ // No synthetic release groups: only real releases are returned
+
+ // Sort releases by sequence for stable UI order
+ releasesData.sort((a, b) => a.releaseSeq - b.releaseSeq);
+
return {
id: base.id,
title: base.title,
@@ -389,6 +412,22 @@ export async function getEntryById(id: number): Promise {
}))
: [],
releases: releasesData,
+ downloadsFlat: downloadFlatRows.map((d: any) => ({
+ id: d.id,
+ link: d.link,
+ size: d.size ?? null,
+ md5: d.md5 ?? null,
+ comments: d.comments ?? null,
+ isDemo: !!d.isDemo,
+ type: { id: d.filetypeId, name: d.filetypeName },
+ language: { id: (d.dlLangId as any) ?? null, name: (d.dlLangName as any) ?? null },
+ machinetype: { id: (d.dlMachineId as any) ?? null, name: (d.dlMachineName as any) ?? null },
+ scheme: { id: (d.schemeId as any) ?? null, name: (d.schemeName as any) ?? null },
+ source: { id: (d.sourceId as any) ?? null, name: (d.sourceName as any) ?? null },
+ case: { id: (d.caseId as any) ?? null, name: (d.caseName as any) ?? null },
+ year: (d.year as any) ?? null,
+ releaseSeq: Number(d.releaseSeq),
+ })),
};
}