Upload backup-sqlite.mjs

scripts/backup-sqlite.mjs

@@ -30,15 +30,16 @@ try {
 async function restoreBackup() {
   mkdirSync(dataDir, { recursive: true });
   const remote = remotePath(backupFile);
-  const exists = await remoteFileExists();
-  if (!exists) {
-    console.log(JSON.stringify({ ok: true, mode: "restore", restored: false, reason: "remote_backup_missing" }));
+  const workDir = mkdtempSync(join(tmpdir(), "notes-restore-"));
+  const restorePath = join(workDir, "notes.db");
+
+  const copied = await rclone(["copyto", remote, restorePath], { allowFailure: true });
+  if (!copied.ok) {
+    rmSync(workDir, { recursive: true, force: true });
+    console.log(JSON.stringify({ ok: true, mode: "restore", restored: false, reason: "remote_backup_unavailable" }));
     return;
   }
 
-  const workDir = mkdtempSync(join(tmpdir(), "notes-restore-"));
-  const restorePath = join(workDir, "notes.db");
-  await rclone(["copyto", remote, restorePath]);
   assertUsableSqlite(restorePath);
   renameSync(restorePath, dbPath);
   rmSync(workDir, { recursive: true, force: true });
@@ -69,11 +70,6 @@ async function uploadBackup() {
   }));
 }
 
-async function remoteFileExists() {
-  const output = await rclone(["lsf", remoteFolder, "--files-only", "--include", backupFile], { allowFailure: true });
-  return output.split(/\r?\n/).some((line) => line.trim() === backupFile);
-}
-
 function createSnapshot(snapshotPath) {
   const db = new DatabaseSync(dbPath);
   try {
@@ -108,7 +104,7 @@ function rclone(args, { allowFailure = false } = {}) {
     child.on("error", reject);
     child.on("close", (code) => {
       if (code === 0 || allowFailure) {
-        resolve(stdout);
+        resolve({ ok: code === 0, stdout });
         return;
       }
       reject(new Error(`rclone_failed_${code}`));