HoshinoKoji/r2-webdav
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor handle_move function to improve directory handling

Browse Source
This commit is contained in:
abersheeran 2023-12-18 14:56:38 +08:00
parent 1562f907d0
commit cfc8b0085b
1 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/index.ts
View File

@ -581,52 +581,84 @@ async function handle_move(request: Request, bucket: R2Bucket): Promise<Response
return new Response('Bad Request', { status: 400 }); return new Response('Bad Request', { status: 400 });
} }
let destination = new URL(destination_header).pathname.slice(1); let destination = new URL(destination_header).pathname.slice(1);
destination = destination.endsWith('/') ? destination.slice(0, -1) : destination;
// Check if the parent directory exists
let destination_parent = destination.split('/').slice(0, destination.endsWith('/') ? -2 : -1).join('/');
if (destination_parent !== '' && !await bucket.head(destination_parent)) {
return new Response('Conflict', { status: 409 });
}
// Check if the destination already exists
let destination_exists = await bucket.head(destination); let destination_exists = await bucket.head(destination);
if (destination_exists && !overwrite) { if (!overwrite && destination_exists) {
return new Response('Precondition Failed', { status: 412 }); return new Response('Precondition Failed', { status: 412 });
} }
// TODO delete recursively (if destination is a directory) let resource = await bucket.head(resource_path.endsWith("/") ? resource_path.slice(0, -1) : resource_path);
// await bucket.delete( if (resource === null) {
// (await bucket.list({ prefix: destination, delimiter: '/' })).objects.map(object => object.key) return new Response('Not Found', { status: 404 });
// ); }
if (resource.key === destination) {
return new Response('Bad Request', { status: 400 });
}
if (resource_path.endsWith('/')) { if (destination_exists) { // Delete the destination first
await handle_delete(new Request(new URL(destination_header), request), bucket);
}
let is_dir = resource?.customMetadata?.resourcetype === '<collection />';
if (is_dir) {
let depth = request.headers.get('Depth') ?? 'infinity'; let depth = request.headers.get('Depth') ?? 'infinity';
switch (depth) { switch (depth) {
case 'infinity': { case 'infinity': {
let r2_objects, cursor: string | undefined = undefined; let prefix = resource_path.endsWith("/") ? resource_path : resource_path + "/";
do { const copy = async (object: R2Object) => {
r2_objects = await bucket.list({ let target = destination + "/" + object.key.slice(prefix.length);
prefix: resource_path, target = target.endsWith("/") ? target.slice(0, -1) : target;
cursor: cursor, let src = await bucket.get(object.key);
include: ['httpMetadata', 'customMetadata'], if (src !== null) {
}); await bucket.put(target, src.body, {
await Promise.all(r2_objects.objects.map( httpMetadata: object.httpMetadata,
object => (async () => { customMetadata: object.customMetadata,
let target = destination + object.key.slice(resource_path.length); });
let src = await bucket.get(object.key); await bucket.delete(object.key);
if (src !== null) {
await bucket.put(target, src.body, {
httpMetadata: object.httpMetadata,
customMetadata: object.customMetadata,
});
await bucket.delete(object.key);
}
})()
));
if (r2_objects.truncated) {
cursor = r2_objects.cursor;
} }
} while (r2_objects.truncated) };
return new Response('', { status: 201 }); let promise_array = [copy(resource)];
for await (let object of listAll(bucket, prefix, true)) {
promise_array.push(copy(object));
}
await Promise.all(promise_array);
if (destination_exists) {
return new Response(null, { status: 204 });
} else {
return new Response('', { status: 201 });
}
}
case '0': {
let object = await bucket.get(resource.key);
if (object === null) {
return new Response('Not Found', { status: 404 });
}
await bucket.put(destination, object.body, {
httpMetadata: object.httpMetadata,
customMetadata: object.customMetadata,
});
await bucket.delete(resource.key);
if (destination_exists) {
return new Response(null, { status: 204 });
} else {
return new Response('', { status: 201 });
}
} }
default: { default: {
return new Response('Bad Request', { status: 400 }); return new Response('Bad Request', { status: 400 });
} }
} }
} else { } else {
let src = await bucket.get(resource_path); let src = await bucket.get(resource.key);
if (src === null) { if (src === null) {
return new Response('Not Found', { status: 404 }); return new Response('Not Found', { status: 404 });
} }
@ -634,6 +666,7 @@ async function handle_move(request: Request, bucket: R2Bucket): Promise<Response
httpMetadata: src.httpMetadata, httpMetadata: src.httpMetadata,
customMetadata: src.customMetadata, customMetadata: src.customMetadata,
}); });
await bucket.delete(resource.key);
if (destination_exists) { if (destination_exists) {
return new Response(null, { status: 204 }); return new Response(null, { status: 204 });
} else { } else {