1 files changed, 21 insertions, 62 deletions

diff --git a/frontend/lib/drive_server.ts b/frontend/lib/drive_server.ts
index e7c88e8..1462f6e 100644
--- a/frontend/lib/drive_server.ts
+++ b/frontend/lib/drive_server.ts
@@ -1,11 +1,21 @@
 import { spawnSync } from 'child_process'
 import { DriveLsEntry, DriveLogEntry } from './drive_types'
-import { Drive_split_path, Drive_basename } from './drive_shared'
 
 /**
  * Server-only drive functions that use Node.js APIs
  */
 
+function executeFctDriveCommand(args: string[]): string {
+  const result = spawnSync('fctdrive', args, { encoding: 'utf-8', maxBuffer: 50 * 1024 * 1024 })
+  if (result.error) {
+    throw new Error(`Failed to execute fctdrive: ${result.error.message}`)
+  }
+  if (result.status !== 0) {
+    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`)
+  }
+  return result.stdout
+}
+
 /// lists the given path on the drive
 export async function Drive_ls(path: string, recursive: boolean): Promise<DriveLsEntry[]> {
   const args = ['ls']
@@ -16,14 +26,7 @@ export async function Drive_ls(path: string, recursive: boolean): Promise<DriveL
     args.push(path)
   }
 
-  const result = spawnSync('fctdrive', args, { encoding: 'utf-8', maxBuffer: 50 * 1024 * 1024 })
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`)
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`)
-  }
-  const stdout = result.stdout
+  const stdout = executeFctDriveCommand(args)
   const entries = []
   for (const line of stdout.split('\n')) {
     if (line.trim() == "")
@@ -54,70 +57,34 @@ export async function Drive_ls(path: string, recursive: boolean): Promise<DriveL
 
 /// import the file at local_path by moving it to drive_path
 export async function Drive_import(local_path: string, drive_path: string, email: string) {
-  const result = spawnSync('fctdrive', ['import', local_path, "--mode", "move", "--destination", drive_path, "--email", email], { encoding: 'utf-8' });
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`);
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`);
-  }
+  executeFctDriveCommand(['import', local_path, "--mode", "move", "--destination", drive_path, "--email", email]);
 }
 
 /// returns the full filesystem path of the blob given its id
 export async function Drive_blob_path(blob: string): Promise<string> {
-  const result = spawnSync('fctdrive', ['blob', blob], { encoding: 'utf-8' })
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`)
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`)
-  }
-  return result.stdout.trim();
+  const stdout = executeFctDriveCommand(['blob', blob])
+  return stdout.trim();
 }
 
 /// removes the file or directory at the given path
 export async function Drive_remove(path: string, email: string) {
-  const result = spawnSync('fctdrive', ['remove', '--email', email, path], { encoding: 'utf-8' });
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`);
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`);
-  }
+  executeFctDriveCommand(['remove', '--email', email, path]);
 }
 
 /// creates a directory at the given path
 export async function Drive_mkdir(path: string, email: string) {
-  const result = spawnSync('fctdrive', ['mkdir', '--email', email, '--path', path], { encoding: 'utf-8' });
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`);
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`);
-  }
+  executeFctDriveCommand(['mkdir', '--email', email, '--path', path]);
 }
 
 /// renames a file or directory from old path to new path
 export async function Drive_rename(oldPath: string, newPath: string, email: string) {
-  const result = spawnSync('fctdrive', ['rename', '--email', email, '--old', oldPath, '--new', newPath], { encoding: 'utf-8' });
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`);
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`);
-  }
+  executeFctDriveCommand(['rename', '--email', email, '--old', oldPath, '--new', newPath]);
 }
 
 /// gets the blob ID for a given path
 export async function Drive_stat(path: string): Promise<string> {
-  const result = spawnSync('fctdrive', ['stat', path], { encoding: 'utf-8' });
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`);
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`);
-  }
-  return result.stdout.trim();
+  const stdout = executeFctDriveCommand(['stat', path]);
+  return stdout.trim();
 }
 
 
@@ -130,15 +97,7 @@ export async function Drive_ls_directories(path: string = '/'): Promise<DriveLsE
 
 /// returns the log entries from the drive
 export async function Drive_log(): Promise<DriveLogEntry[]> {
-  const result = spawnSync('fctdrive', ['log'], { encoding: 'utf-8', maxBuffer: 50 * 1024 * 1024 })
-  if (result.error) {
-    throw new Error(`Failed to execute fctdrive: ${result.error.message}`)
-  }
-  if (result.status !== 0) {
-    throw new Error(`fctdrive exited with code ${result.status}: ${result.stderr}`)
-  }
-  
-  const stdout = result.stdout
+  const stdout = executeFctDriveCommand(['log'])
   const entries: DriveLogEntry[] = []
   for (const line of stdout.split('\n')) {
     if (line.trim() === "")