Improve WebDav support to include file size and modified time

This commit is contained in:
Bruno Bernardino
2024-04-08 16:01:59 +01:00
parent c1443191ce
commit 5229e196b4
5 changed files with 69 additions and 30 deletions

View File

@@ -143,7 +143,7 @@ export async function createFile(
name: string,
contents: string | ArrayBuffer,
): Promise<boolean> {
const rootPath = `${getFilesRootPath()}/${userId}${path}`;
const rootPath = join(getFilesRootPath(), userId, path);
try {
if (typeof contents === 'string') {
@@ -162,28 +162,34 @@ export async function createFile(
export async function getFile(
userId: string,
path: string,
name: string,
): Promise<{ success: boolean; contents?: Uint8Array; contentType?: string }> {
const rootPath = `${getFilesRootPath()}/${userId}${path}`;
name?: string,
): Promise<{ success: boolean; contents?: Uint8Array; contentType?: string; byteSize?: number }> {
const rootPath = join(getFilesRootPath(), userId, path);
try {
const contents = await Deno.readFile(join(rootPath, name));
const stat = await Deno.stat(join(rootPath, name || ''));
const extension = name.split('.').slice(-1).join('').toLowerCase();
if (stat) {
const contents = await Deno.readFile(join(rootPath, name || ''));
const contentType = lookup(extension) || 'application/octet-stream';
const extension = (name || path).split('.').slice(-1).join('').toLowerCase();
return {
success: true,
contents,
contentType,
};
const contentType = lookup(extension) || 'application/octet-stream';
return {
success: true,
contents,
contentType,
byteSize: stat.size,
};
}
} catch (error) {
console.error(error);
return {
success: false,
};
}
return {
success: false,
};
}
export async function searchFilesAndDirectories(
@@ -213,7 +219,7 @@ async function searchDirectoryNames(
userId: string,
searchTerm: string,
): Promise<{ success: boolean; directories: Directory[] }> {
const rootPath = `${getFilesRootPath()}/${userId}/`;
const rootPath = join(getFilesRootPath(), userId);
const directories: Directory[] = [];
@@ -284,7 +290,7 @@ async function searchFileNames(
userId: string,
searchTerm: string,
): Promise<{ success: boolean; files: DirectoryFile[] }> {
const rootPath = `${getFilesRootPath()}/${userId}/`;
const rootPath = join(getFilesRootPath(), userId);
const files: DirectoryFile[] = [];
@@ -355,7 +361,7 @@ async function searchFileContents(
userId: string,
searchTerm: string,
): Promise<{ success: boolean; files: DirectoryFile[] }> {
const rootPath = `${getFilesRootPath()}/${userId}/`;
const rootPath = join(getFilesRootPath(), userId);
const files: DirectoryFile[] = [];

View File

@@ -24,7 +24,7 @@ export function addDavPrefixToKeys(object: Record<string, any>, prefix = 'D:'):
export function getPropertyNames(xml: Record<string, any>): string[] {
const propFindElement = xml['D:propfind'] || xml.propfind;
if (!propFindElement) {
return [];
return ['allprop'];
}
const propElement = propFindElement['D:prop'] || propFindElement.prop;
@@ -126,11 +126,11 @@ export async function buildPropFindResponse(
for (const propKey of properties) {
switch (propKey) {
case 'displayname':
prop.displayname = isDirectory ? filePath : filePath.split('/').pop();
prop.displayname = isDirectory ? filePath.split('/').filter(Boolean).pop() : filePath.split('/').pop();
break;
case 'getcontentlength':
if (!isDirectory) {
prop.getcontentlength = (stat.size ?? 0)?.toString();
prop.getcontentlength = stat.size?.toString() || '0';
}
break;
case 'getcontenttype':
@@ -150,8 +150,24 @@ export async function buildPropFindResponse(
case 'getetag':
prop.etag = stat.mtime?.toUTCString();
break;
case 'getctag':
prop.ctag = stat.mtime?.toUTCString();
break;
case 'allprop':
prop.displayname = isDirectory ? filePath.split('/').filter(Boolean).pop() : filePath.split('/').pop();
if (!isDirectory) {
prop.getcontentlength = stat.size?.toString() || '0';
prop.getcontenttype = lookup(filePath);
}
prop.resourcetype = isDirectory ? { collection: { '@xmlns:D': 'DAV:' } } : {};
prop.getlastmodified = stat.mtime?.toUTCString() || '';
prop.creationdate = stat.birthtime?.toUTCString() || '';
prop.etag = stat.mtime?.toUTCString();
prop.ctag = stat.mtime?.toUTCString();
break;
}
if (typeof prop[propKey] === 'undefined') {
if (typeof prop[propKey] === 'undefined' && propKey !== 'allprop') {
if (propKey.startsWith('s:')) {
notFound[propKey.slice(2)] = { '@xmlns:s': 'SAR:' };
} else {