feat: 更新资源迁移逻辑,优化用户 ID 处理,删除冗余代码
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
import { app } from '@/app.ts';
|
||||
import { getFileStat, getMinioList, deleteFile, updateFileStat, deleteFiles } from './module/get-minio-list.ts';
|
||||
import { getFileStat, getMinioList, deleteFile, updateFileStat, deleteFileByPrefix } from './module/get-minio-list.ts';
|
||||
import path from 'path';
|
||||
import { CustomError } from '@kevisual/router';
|
||||
import { callDetectAppVersion } from '../app-manager/export.ts';
|
||||
import { UserId } from '../user/modules/user-id.ts';
|
||||
|
||||
/**
|
||||
* 清理prefix中的'..'
|
||||
@@ -23,8 +24,9 @@ const handlePrefix = (prefix: string) => {
|
||||
* @param tokenUser
|
||||
* @returns
|
||||
*/
|
||||
const getPrefixByUser = (data: { prefix: string }, tokenUser: { username: string }) => {
|
||||
const prefixBase = '/' + tokenUser.username;
|
||||
const getPrefixByUser = async (data: { prefix: string }, tokenUser: { username: string }) => {
|
||||
const uid = await UserId.getUserIdByName(tokenUser.username);
|
||||
const prefixBase = '/data/' + uid;
|
||||
const _prefix = handlePrefix(data.prefix);
|
||||
return {
|
||||
len: prefixBase.length,
|
||||
@@ -40,7 +42,7 @@ app
|
||||
.define(async (ctx) => {
|
||||
const tokenUser = ctx.state.tokenUser;
|
||||
const data = ctx.query.data || {};
|
||||
const { len, prefix } = getPrefixByUser(data, tokenUser);
|
||||
const { len, prefix } = await getPrefixByUser(data, tokenUser);
|
||||
const recursive = data.recursive;
|
||||
const list = await getMinioList({ prefix: prefix.slice(1), recursive: recursive });
|
||||
|
||||
@@ -67,7 +69,7 @@ app
|
||||
.define(async (ctx) => {
|
||||
const tokenUser = ctx.state.tokenUser;
|
||||
const data = ctx.query.data || {};
|
||||
const { prefix } = getPrefixByUser(data, tokenUser);
|
||||
const { prefix } = await getPrefixByUser(data, tokenUser);
|
||||
console.log('prefix', prefix);
|
||||
const stat = await getFileStat(prefix.slice(1));
|
||||
ctx.body = stat;
|
||||
@@ -83,7 +85,8 @@ app
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
const tokenUser = ctx.state.tokenUser;
|
||||
const list = await getMinioList({ prefix: '' + tokenUser.username, recursive: true });
|
||||
const uid = await UserId.getUserIdByName(tokenUser.username);
|
||||
const list = await getMinioList({ prefix: `data/${uid}/`, recursive: true });
|
||||
const size = list.reduce((acc, item) => {
|
||||
if ('size' in item) {
|
||||
return acc + item.size;
|
||||
@@ -109,7 +112,7 @@ app
|
||||
.define(async (ctx) => {
|
||||
const tokenUser = ctx.state.tokenUser;
|
||||
const data = ctx.query.data || {};
|
||||
const { prefix } = getPrefixByUser(data, tokenUser);
|
||||
const { prefix } = await getPrefixByUser(data, tokenUser);
|
||||
const [username, appKey, version] = prefix.slice(1).split('/');
|
||||
const res = await deleteFile(prefix.slice(1));
|
||||
if (res.code === 200) {
|
||||
@@ -136,7 +139,7 @@ app
|
||||
if (!data.metadata || JSON.stringify(data.metadata) === '{}') {
|
||||
ctx.throw(400, 'metadata is required');
|
||||
}
|
||||
const { prefix } = getPrefixByUser(data, tokenUser);
|
||||
const { prefix } = await getPrefixByUser(data, tokenUser);
|
||||
const res = await updateFileStat(prefix.slice(1), data.metadata);
|
||||
if (res.code === 200) {
|
||||
ctx.body = 'update metadata success';
|
||||
@@ -155,6 +158,7 @@ app
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
const tokenUser = ctx.state.tokenUser;
|
||||
const uid = await UserId.getUserIdByName(tokenUser.username);
|
||||
let directory = ctx.query.data?.directory as string;
|
||||
if (!directory) {
|
||||
ctx.throw(400, 'directory is required');
|
||||
@@ -165,12 +169,15 @@ app
|
||||
if (directory.endsWith('/')) {
|
||||
ctx.throw(400, 'directory is invalid, cannot end with /');
|
||||
}
|
||||
const prefix = tokenUser.username + '/' + directory + '/';
|
||||
const prefix = `data/${uid}/${directory}/`;
|
||||
const list = await getMinioList<true>({ prefix, recursive: true });
|
||||
if (list.length === 0) {
|
||||
ctx.throw(400, 'directory is empty');
|
||||
}
|
||||
const res = await deleteFiles(list.map((item) => item.name));
|
||||
if(list.length > 5000) {
|
||||
ctx.throw(400, '删除文件数量过多,请分批删除');
|
||||
}
|
||||
const res = await deleteFileByPrefix(prefix);
|
||||
if (!res) {
|
||||
ctx.throw(500, 'delete all failed');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user