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

Fix resource path handling in fuck windows

Browse Source
This commit is contained in:
abersheeran 2023-12-06 15:41:36 +08:00
parent 57ecaf6c0e
commit 66054ba062
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/index.ts
View File

@ -281,34 +281,39 @@ export default {
break; break;
} }
let object = await bucket.get(resource_path); let object = await bucket.head(resource_path);
if (object === null && !resource_path.endsWith('/')) { if (object === null && resource_path.endsWith('/')) {
object = await bucket.head(resource_path.slice(0, -1));
}
if (object === null) {
response = new Response('Not Found', { status: 404 }); response = new Response('Not Found', { status: 404 });
} else { break;
let page = `<?xml version="1.0" encoding="utf-8"?> }
let page = `<?xml version="1.0" encoding="utf-8"?>
<multistatus xmlns="DAV:"> <multistatus xmlns="DAV:">
<response> <response>
<href>/${resource_path}</href> <href>/${resource_path}</href>
<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>
</response> </response>
</multistatus> </multistatus>
`; `;
response = new Response(page, { response = new Response(page, {
status: 207, status: 207,
headers: { headers: {
'Content-Type': 'text/xml', 'Content-Type': 'text/xml',
}, },
}); });
}
} }
break; break;
case '1': { case '1': {
@ -324,6 +329,18 @@ export default {
include: ['httpMetadata', 'customMetadata'], include: ['httpMetadata', 'customMetadata'],
}); });
if (r2_objects.objects.length === 1) {
let object = r2_objects.objects[0];
// When the resource is a collection
if (object.key === resource_path && object.customMetadata?.resourcetype === '<collection />') {
resource_path = resource_path.endsWith('/') ? resource_path : resource_path + '/';
if (r2_objects.truncated) {
delete r2_objects.cursor
}
r2_objects.truncated = true;
}
}
for (let object of r2_objects.objects.filter(object => object.key !== resource_path)) { for (let object of r2_objects.objects.filter(object => object.key !== resource_path)) {
page += ` page += `
<response> <response>