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

Refactor content headers and handle move operation

Browse Source
This commit is contained in:
abersheeran 2024-01-06 11:28:32 +08:00
parent f81cee4647
commit c104601ab1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/index.ts
View File

@ -138,28 +138,28 @@ async function handle_get(request: Request, bucket: R2Bucket): Promise<Response>
...(object.httpMetadata?.contentDisposition ...(object.httpMetadata?.contentDisposition
? { ? {
'Content-Disposition': object.httpMetadata.contentDisposition, 'Content-Disposition': object.httpMetadata.contentDisposition,
} }
: {}), : {}),
...(object.httpMetadata?.contentEncoding ...(object.httpMetadata?.contentEncoding
? { ? {
'Content-Encoding': object.httpMetadata.contentEncoding, 'Content-Encoding': object.httpMetadata.contentEncoding,
} }
: {}), : {}),
...(object.httpMetadata?.contentLanguage ...(object.httpMetadata?.contentLanguage
? { ? {
'Content-Language': object.httpMetadata.contentLanguage, 'Content-Language': object.httpMetadata.contentLanguage,
} }
: {}), : {}),
...(object.httpMetadata?.cacheControl ...(object.httpMetadata?.cacheControl
? { ? {
'Cache-Control': object.httpMetadata.cacheControl, 'Cache-Control': object.httpMetadata.cacheControl,
} }
: {}), : {}),
...(object.httpMetadata?.cacheExpiry ...(object.httpMetadata?.cacheExpiry
? { ? {
'Cache-Expiry': object.httpMetadata.cacheExpiry.toISOString(), 'Cache-Expiry': object.httpMetadata.cacheExpiry.toISOString(),
} }
: {}), : {}),
}, },
}); });
@ -292,9 +292,9 @@ function generate_propfind_response(object: R2Object | null): string {
<propstat> <propstat>
<prop> <prop>
${Object.entries(fromR2Object(object)) ${Object.entries(fromR2Object(object))
.filter(([_, value]) => value !== undefined) .filter(([_, value]) => value !== undefined)
.map(([key, value]) => `<${key}>${value}</${key}>`) .map(([key, value]) => `<${key}>${value}</${key}>`)
.join('\n ')} .join('\n ')}
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
@ -496,7 +496,7 @@ async function handle_move(request: Request, bucket: R2Bucket): Promise<Response
switch (depth) { switch (depth) {
case 'infinity': { case 'infinity': {
let prefix = resource_path + '/'; let prefix = resource_path + '/';
const copy = async (object: R2Object) => { const move = async (object: R2Object) => {
let target = destination + '/' + object.key.slice(prefix.length); let target = destination + '/' + object.key.slice(prefix.length);
target = target.endsWith('/') ? target.slice(0, -1) : target; target = target.endsWith('/') ? target.slice(0, -1) : target;
let src = await bucket.get(object.key); let src = await bucket.get(object.key);
@ -508,9 +508,9 @@ async function handle_move(request: Request, bucket: R2Bucket): Promise<Response
await bucket.delete(object.key); await bucket.delete(object.key);
} }
}; };
let promise_array = [copy(resource)]; let promise_array = [move(resource)];
for await (let object of listAll(bucket, prefix, true)) { for await (let object of listAll(bucket, prefix, true)) {
promise_array.push(copy(object)); promise_array.push(move(object));
} }
await Promise.all(promise_array); await Promise.all(promise_array);
if (destination_exists) { if (destination_exists) {