fix: report path for broken files as /-void/

HeyPuter · Nov 13, 2024 · 5725bd8 · 5725bd8
1 parent c53107d
commit 5725bd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/backend/src/filesystem/FSNodeContext.js b/src/backend/src/filesystem/FSNodeContext.js
@@ -827,6 +827,10 @@ module.exports = class FSNodeContext {
             .with('fs.fsentry:uuid')
             .obtain('fs.fsentry:path')
             .exec(this.uid ?? this.entry.uuid);
+
+        if ( fsentry.path && fsentry.path.startsWith('/-void/') ) {
+            fsentry.broken = true;
+        }
 
         fsentry.dirname = _path.dirname(fsentry.path);
         fsentry.dirpath = fsentry.dirname;
@@ -856,8 +860,13 @@ module.exports = class FSNodeContext {
         // Use client-friendly IDs for shortcut_to
         fsentry.shortcut_to = (res.shortcut_to
             ? await id2uuid(res.shortcut_to) : undefined);
-        fsentry.shortcut_to_path = (res.shortcut_to
-            ? await id2path(res.shortcut_to) : undefined);
+        try {
+            fsentry.shortcut_to_path = (res.shortcut_to
+                ? await id2path(res.shortcut_to) : undefined);
+        } catch (e) {
+            fsentry.shortcut_invalid = true;
+            fsentry.shortcut_uid = res.shortcut_to;
+        }
 
         // Add file_request_url
         if(res.file_request_token && res.file_request_token !== ''){

diff --git a/src/backend/src/filesystem/storage/DatabaseFSEntryService.js b/src/backend/src/filesystem/storage/DatabaseFSEntryService.js
@@ -250,7 +250,11 @@ class DatabaseFSEntryService extends AdvancedBase {
         info.given('fs.fsentry:uuid').provide('fs.fsentry:path')
             .addStrategy('mysql', async uuid => {
                 // TODO: move id2path here
-                return await id2path(uuid);
+                try {
+                    return await id2path(uuid);
+                } catch (e) {
+                    return '/-void/' + uuid;
+                }
             });
 
         (async () => {