Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-06-03 05:34:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix prev/next generation

Browse Source
This commit is contained in:
Zoe Roux 2025-01-07 17:28:43 +01:00
parent 641ce4237e
commit 1389abb946
No known key found for this signature in database
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/controllers/movies.ts
View File

@ -44,7 +44,8 @@ const getTranslationQuery = (languages: string[]) => {
return [query, col] as const; return [query, col] as const;
}; };
const { pk: _, kind, startAir, endAir, ...moviesCol } = getColumns(shows); // we keep the pk for after handling. it will be removed by elysia's validators after.
const { kind, startAir, endAir, ...moviesCol } = getColumns(shows);
const movieFilters: FilterDef = { const movieFilters: FilterDef = {
genres: { genres: {
@ -181,7 +182,7 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
) )
.limit(limit); .limit(limit);
return createPage(items, { url, sort }); return createPage(items, { url, sort, limit });
}, },
{ {
detail: { description: "Get all movies" }, detail: { description: "Get all movies" },
@ -201,7 +202,6 @@ export const movies = new Elysia({ prefix: "/movies", tags: ["movies"] })
}), }),
after: t.Optional( after: t.Optional(
t.String({ t.String({
format: "byte",
description: comment` description: comment`
Id of the cursor in the pagination. Id of the cursor in the pagination.
You can ignore this and only use the prev/next field in the response. You can ignore this and only use the prev/next field in the response.

5
api/src/models/utils/keyset-paginate.ts
View File

@ -58,5 +58,8 @@ export const generateAfter = (
...sort.map((by) => cursor[by.key]), ...sort.map((by) => cursor[by.key]),
cursor.pk, cursor.pk,
]; ];
return Buffer.from(JSON.stringify(ret), "utf-8").toString("base64"); return Buffer.from(JSON.stringify(ret), "utf-8").toString("base64url");
}; };
const reverseStart = Buffer.from("[true,", "utf-8").toString("base64url");
export const isReverse = (x: string) => x.startsWith(reverseStart);

20
api/src/models/utils/page.ts
View File

@ -1,7 +1,7 @@
import type { ObjectOptions } from "@sinclair/typebox"; import type { ObjectOptions } from "@sinclair/typebox";
import { t, type TSchema } from "elysia"; import { t, type TSchema } from "elysia";
import type { Sort } from "./sort"; import type { Sort } from "./sort";
import { generateAfter } from "./keyset-paginate"; import { generateAfter, isReverse } from "./keyset-paginate";
export const Page = <T extends TSchema>(schema: T, options?: ObjectOptions) => export const Page = <T extends TSchema>(schema: T, options?: ObjectOptions) =>
t.Object( t.Object(
@ -16,17 +16,27 @@ export const Page = <T extends TSchema>(schema: T, options?: ObjectOptions) =>
export const createPage = <T>( export const createPage = <T>(
items: T[], items: T[],
{ url, sort }: { url: string; sort: Sort<any, any> }, { url, sort, limit }: { url: string; sort: Sort<any, any>; limit: number },
) => { ) => {
let prev: string | null = null; let prev: string | null = null;
let next: string | null = null; let next: string | null = null;
const uri = new URL(url);
if (uri.searchParams.has("after")) { const uri = new URL(url);
const after = uri.searchParams.get("after");
const reverse = after && isReverse(after) ? 1 : 0;
const has = [
// prev
items.length > 0 && after,
// next
items.length === limit && limit > 0,
];
if (has[0 + reverse]) {
uri.searchParams.set("after", generateAfter(items[0], sort, true)); uri.searchParams.set("after", generateAfter(items[0], sort, true));
prev = uri.toString(); prev = uri.toString();
} }
if (items.length) { if (has[1 - reverse]) {
uri.searchParams.set("after", generateAfter(items[items.length - 1], sort)); uri.searchParams.set("after", generateAfter(items[items.length - 1], sort));
next = uri.toString(); next = uri.toString();
} }