fix(trash): delete on-disk thumbnails when purging files (#13)
CD — Deployment / deploy (push) Successful in 18s
CD — Deployment / deploy (push) Successful in 18s
PR automatique de fix/trash-purge-thumbnails vers main. --------- Co-authored-by: xEsiah <[email protected]> Reviewed-on: #13 Reviewed-by: Esiah <[email protected]> Co-authored-by: Gitea Actions <-[email protected]>
This commit was merged in pull request #13.
This commit is contained in:
@@ -129,14 +129,11 @@ export const registerFolderRoutes = (app: App, db: Db, config: Config): void =>
|
|||||||
[parentId],
|
[parentId],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Un enfant est visible s'il est lisible directement ou s'il mene a un partage.
|
// Un enfant est visible s'il est lisible directement ou s'il mene a un
|
||||||
|
// partage. Le role admin ne donne aucun droit special ici (voir access.ts).
|
||||||
const visible: FolderRow[] = [];
|
const visible: FolderRow[] = [];
|
||||||
for (const row of rows) {
|
for (const row of rows) {
|
||||||
if (
|
if (row.owner_id === user.id || (await canTraverse(db, user, row.id))) {
|
||||||
user.role_slug === "admin" ||
|
|
||||||
row.owner_id === user.id ||
|
|
||||||
(await canTraverse(db, user, row.id))
|
|
||||||
) {
|
|
||||||
visible.push(row);
|
visible.push(row);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,10 +70,18 @@ const purgeFiles = async (db: Db, config: Config, fileIds: string[]): Promise<vo
|
|||||||
fileIds,
|
fileIds,
|
||||||
);
|
);
|
||||||
|
|
||||||
await Promise.all(
|
// Les vignettes vivent dans VARIANT_DIR : sans cette etape, chaque purge
|
||||||
rows.map((row) => discard(absolutePath(config.MEDIA_DIR, row.relative_path))),
|
// laisse un .webp orphelin sur le disque (les lignes partent en cascade).
|
||||||
|
const variants = await db.query<{ path: string }>(
|
||||||
|
`SELECT path FROM file_variants WHERE file_id IN (${placeholders})`,
|
||||||
|
fileIds,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
...rows.map((row) => discard(absolutePath(config.MEDIA_DIR, row.relative_path))),
|
||||||
|
...variants.map((variant) => discard(absolutePath(config.VARIANT_DIR, variant.path))),
|
||||||
|
]);
|
||||||
|
|
||||||
await db.transaction(async (connection) => {
|
await db.transaction(async (connection) => {
|
||||||
for (const row of rows) {
|
for (const row of rows) {
|
||||||
if (row.owner_id) {
|
if (row.owner_id) {
|
||||||
|
|||||||
Reference in New Issue
Block a user