Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(albums): keep albums accessible when slugs are missing
Ahmet Ömer7db58293df8c
diff --git a/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts b/apps/self-hosted/server/api/photos/[photoId]/albums.get.tsindex 35201a8d..1019c8db 100644--- a/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts+++ b/apps/self-hosted/server/api/photos/[photoId]/albums.get.ts@@ -33,7 +33,7 @@ export default eventHandler(async (event) => {tables.albumPhotos,eq(tables.albums.id, tables.albumPhotos.albumId),)- .innerJoin(+ .leftJoin(tables.albumSlugs,siteAnd(eq(tables.albumSlugs.albumId, tables.albums.id),diff --git a/packages/console/app/pages/dashboard/albums.vue b/packages/console/app/pages/dashboard/albums.vueindex 995876fe..deb2055e 100644--- a/packages/console/app/pages/dashboard/albums.vue+++ b/packages/console/app/pages/dashboard/albums.vue@@ -19,7 +19,7 @@ useHead({})interface AlbumItem extends Album {- slug: string+ slug: string | nullphotoCount?: numberphotoIds?: string[]coverPhoto?: Photo | null@@ -201,7 +201,7 @@ const openEditSlideover = async (album: AlbumItem) => {try {const albumDetail = (await consoleApi(`/api/albums/${album.id}`)) as anyformData.title = album.title- formData.slug = album.slug+ formData.slug = album.slug ?? ''formData.description = album.description || ''formData.isHidden = album.isHidden || falseformData.password = ''@@ -635,7 +635,7 @@ const columns = computed<any[]>(() => [<template #title-cell="{ row }"><NuxtLink- :to="`/albums/${(row.original as unknown as AlbumItem).slug}`"+ :to="`/albums/${(row.original as unknown as AlbumItem).slug || row.original.id}`"target="_blank"class="font-medium text-primary-600 dark:text-primary-400 hover:underline cursor-pointer inline-flex items-center gap-2">@@ -845,7 +845,7 @@ const columns = computed<any[]>(() => [v-model:description="formData.description"v-model:slug="formData.slug"show-slug- :current-slug="currentAlbum?.slug"+ :current-slug="currentAlbum?.slug ?? undefined"/><UFormField name="isHidden">diff --git a/packages/database/src/album-slugs.ts b/packages/database/src/album-slugs.tsindex ad4c1254..b0d721f3 100644--- a/packages/database/src/album-slugs.ts+++ b/packages/database/src/album-slugs.ts@@ -33,10 +33,8 @@ export function getCurrentAlbumSlug(db: AlbumSlugDb,site: SiteContext,albumId: number,-): string {- const slug = currentSlug(db, site.id, albumId)- if (!slug) throw new Error(`Album ${albumId} has no current slug`)- return slug+): string | null {+ return currentSlug(db, site.id, albumId) ?? null}/** Must run inside the caller's transaction. The registry is the sole slug namespace. */@@ -157,10 +155,12 @@ export function resolveAlbumPath().get()if (!album) return null+ const slug = getCurrentAlbumSlug(db, site, albumId)return {albumId,- slug: getCurrentAlbumSlug(db, site, albumId),- isCanonical: isCurrent,+ slug: slug ?? String(albumId),+ isCanonical:+ isCurrent || (slug === null && isNumericAlbumPathSegment(segment)),isHidden: album.isHidden,}}diff --git a/packages/database/src/connection.ts b/packages/database/src/connection.tsindex 0e98f943..1f8e636d 100644--- a/packages/database/src/connection.ts+++ b/packages/database/src/connection.ts@@ -49,7 +49,22 @@ export function openDatabase(options: DatabaseOptions) {const slugTable = db.get<{ present: number }>(sql`SELECT 1 AS present FROM sqlite_master WHERE type='table' AND name='album_slugs'`,)- if (slugTable) backfillAlbumSlugs(db)+ if (slugTable) {+ const count = backfillAlbumSlugs(db)+ if (count) console.info(`Backfilled album slugs for ${count} album(s)`)+ } else {+ const albumTable = db.get<{ present: number }>(+ sql`SELECT 1 AS present FROM sqlite_master WHERE type='table' AND name='albums'`,+ )+ if (+ albumTable &&+ db.get<{ count: number }>(sql`SELECT COUNT(*) AS count FROM albums`)!+ .count+ )+ throw new Error(+ 'album_slugs table is missing for existing albums; check DATABASE_MIGRATIONS',+ )+ }}return {db,diff --git a/packages/database/src/dto.ts b/packages/database/src/dto.tsindex 0ec83050..e0a3d529 100644--- a/packages/database/src/dto.ts+++ b/packages/database/src/dto.ts@@ -50,7 +50,7 @@ export function toPhotoDto(photo: PhotoRow): Photo {}/** Serialize album dates and expose password presence without its hash. */-export function toAlbumDto(album: AlbumRow, slug: string): Album {+export function toAlbumDto(album: AlbumRow, slug: string | null): Album {return {id: album.id,slug,diff --git a/packages/database/src/sqlite-resources.ts b/packages/database/src/sqlite-resources.tsindex 38f9b742..a87e0524 100644--- a/packages/database/src/sqlite-resources.ts+++ b/packages/database/src/sqlite-resources.ts@@ -13,7 +13,7 @@ export function createSqliteResourceRepository(): ResourceReadRepository {requireSite(db, site)const albumRecord = (- row: typeof tables.albums.$inferSelect & { slug: string },+ row: typeof tables.albums.$inferSelect & { slug: string | null },) => ({resource: toAlbumDto(row, row.slug),passwordHash: row.passwordHash,@@ -52,7 +52,7 @@ export function createSqliteResourceRepository(slug: tables.albumSlugs.slug,}).from(tables.albums)- .innerJoin(+ .leftJoin(tables.albumSlugs,and(eq(tables.albumSlugs.siteId, tables.albums.siteId),@@ -72,7 +72,7 @@ export function createSqliteResourceRepository(slug: tables.albumSlugs.slug,}).from(tables.albums)- .innerJoin(+ .leftJoin(tables.albumSlugs,and(eq(tables.albumSlugs.siteId, tables.albums.siteId),diff --git a/packages/gallery/app/components/photo/InfoPanel.vue b/packages/gallery/app/components/photo/InfoPanel.vueindex 63c675f6..4f6c7ca1 100644--- a/packages/gallery/app/components/photo/InfoPanel.vue+++ b/packages/gallery/app/components/photo/InfoPanel.vue@@ -15,7 +15,7 @@ interface Props {interface Album {id: number- slug?: string+ slug?: string | nulltitle: stringdescription: string | nullcoverPhotoId: string | nulldiff --git a/packages/gallery/shared/utils/albumPath.ts b/packages/gallery/shared/utils/albumPath.tsindex e780704b..b8a5ef58 100644--- a/packages/gallery/shared/utils/albumPath.ts+++ b/packages/gallery/shared/utils/albumPath.ts@@ -10,13 +10,10 @@ export function numericAlbumId(segment: string): number | null {}export function albumPagePath(- album: { id: number; slug?: string },+ album: { id: number; slug?: string | null },useSlugs: boolean,): string {- if (useSlugs) {- if (!album.slug) throw new Error('Album slug is missing')- return `/albums/${album.slug}`- }+ if (useSlugs && album.slug) return `/albums/${album.slug}`return `/albums/${album.id}`}diff --git a/tests/album-path.test.ts b/tests/album-path.test.tsindex b0fd8141..ccc9c64a 100644--- a/tests/album-path.test.ts+++ b/tests/album-path.test.ts@@ -10,7 +10,8 @@ test('album links use slugs only for the self-hosted gallery', () => {const album = { id: 12, slug: 'my-album' }assert.equal(albumPagePath(album, true), '/albums/my-album')assert.equal(albumPagePath(album, false), '/albums/12')- assert.throws(() => albumPagePath({ id: 12 }, true))+ assert.equal(albumPagePath({ id: 12 }, true), '/albums/12')+ assert.equal(albumPagePath({ id: 12, slug: null }, true), '/albums/12')})test('numeric Cloud paths and album share links remain valid', () => {diff --git a/tests/album-slug-persistence.test.ts b/tests/album-slug-persistence.test.tsindex bea78179..af79465b 100644--- a/tests/album-slug-persistence.test.ts+++ b/tests/album-slug-persistence.test.ts@@ -7,6 +7,7 @@ import { DEFAULT_SITE, CoreError, createAlbumWriter } from '@chronoframe/core'import * as schema from '../packages/database/src/schema.ts'import {backfillAlbumSlugs,+ getCurrentAlbumSlug,resolveAlbumPath,resolveAlbumSlug,} from '../packages/database/src/album-slugs.ts'@@ -133,6 +134,13 @@ test('backfill assigns deterministic slugs once for existing rows', () => {db.insert(schema.albums).values([{ title: '你好' }, { title: '你好' }]).run()+ assert.equal(getCurrentAlbumSlug(db, DEFAULT_SITE, 1), null)+ assert.deepEqual(resolveAlbumPath(db, DEFAULT_SITE, '1'), {+ albumId: 1,+ slug: '1',+ isCanonical: true,+ isHidden: false,+ })assert.equal(backfillAlbumSlugs(db), 2)assert.equal(backfillAlbumSlugs(db), 0)assert.deepEqual(diff --git a/tests/site-migration.test.ts b/tests/site-migration.test.tsindex 2b9605ef..468b07d8 100644--- a/tests/site-migration.test.ts+++ b/tests/site-migration.test.ts@@ -43,6 +43,10 @@ test('legacy ownership upgrade preserves rows, assigns memberships, backs up and).run()raw.close()+ assert.throws(+ () => openDatabase({ filename, migrationsFolder: migrations }),+ /album_slugs.*missing/i,+ )// Migration and its journal record must roll back together; the backup remains usable.const failure = {...journal,diff --git a/tests/sqlite-resource-read.test.ts b/tests/sqlite-resource-read.test.tsindex 7fcb4544..b66c86b8 100644--- a/tests/sqlite-resource-read.test.ts+++ b/tests/sqlite-resource-read.test.ts@@ -90,6 +90,18 @@ test('SQLite reader preserves migrated data, ordering and legacy album visibilit}assert.equal((await reader.getAlbum(1, anonymous)).photos[1]!.title, null)assert.equal(db.select().from(schema.photos).all().length, 4)+ db.insert(schema.albums)+ .values({ id: 4, title: 'Missing slug', position: 3 })+ .run()+ assert.equal(+ (await reader.listAlbums({ admin: true })).find((album) => album.id === 4)+ ?.slug,+ null,+ )+ assert.equal(+ (await reader.getAlbum(4, { admin: true, canAccess: () => true })).slug,+ null,+ )} finally {sqlite.close()}