From 68fd5bd13307e893800028486798334490d8d521 Mon Sep 17 00:00:00 2001 From: Pitu Date: Wed, 20 Jan 2021 01:33:35 +0900 Subject: feat: add pagination to public album links --- src/api/routes/albums/albumGET.js | 26 ++++++++++-- src/site/pages/a/_identifier.vue | 85 +++++++++++++++++++++++++++++++-------- 2 files changed, 90 insertions(+), 21 deletions(-) diff --git a/src/api/routes/albums/albumGET.js b/src/api/routes/albums/albumGET.js index c9f6763..3949fc7 100644 --- a/src/api/routes/albums/albumGET.js +++ b/src/api/routes/albums/albumGET.js @@ -18,14 +18,31 @@ class albumGET extends Route { const album = await db.table('albums').where('id', link.albumId).first(); if (!album) return res.status(404).json({ message: 'Album not found' }); - const files = await db.table('albumsFiles') + let count = 0; + let files = db.table('albumsFiles') .where({ albumId: link.albumId }) .join('files', 'albumsFiles.fileId', 'files.id') .select('files.name', 'files.id') .orderBy('files.id', 'desc'); - // Create the links for each file - // eslint-disable-next-line no-restricted-syntax + const { page, limit = 100 } = req.query; + if (page && page >= 0) { + files = await files.offset((page - 1) * limit).limit(limit); + + const dbRes = await db.table('albumsFiles') + .where({ albumId: link.albumId }) + .join('files', 'albumsFiles.fileId', 'files.id') + .select('files.name', 'files.id') + .orderBy('files.id', 'desc') + .count('* as count') + .first(); + + count = dbRes.count; + } else { + files = await files; // execute the query + count = files.length; + } + for (let file of files) { file = Util.constructFilePublicLink(file); } @@ -38,7 +55,8 @@ class albumGET extends Route { name: album.name, downloadEnabled: link.enableDownload, isNsfw: album.nsfw, - files + files, + count }); } } diff --git a/src/site/pages/a/_identifier.vue b/src/site/pages/a/_identifier.vue index 7ffed35..43e138d 100644 --- a/src/site/pages/a/_identifier.vue +++ b/src/site/pages/a/_identifier.vue @@ -7,7 +7,7 @@ {{ name }}

- Serving {{ files ? files.length : 0 }} files + Serving {{ totalFiles }} files

+ :enable-toolbar="false"> + +