backupman 0.2.2 → 0.2.3

package/index.js

@@ -103,7 +103,9 @@ class BackupMan {
     return `#${snapshot.id}  [${ts}]  ${msg}`;
   }
 
-  async chooseSnapshot(index) {
+  async listSnapshots() {
+    await this.ensureDirs();
+    const index = await this.loadIndex();
     if (!index.snapshots.length) {
       console.log("No snapshots yet. Use `backupman save \"message\"` first.");
       return null;
@@ -116,55 +118,57 @@ class BackupMan {
       console.log("  " + this.formatSnapshot(s));
     });
     console.log("");
-
-    while (true) {
-      const answer = (await this.prompt("Type snapshot id to restore (empty = cancel): ")).trim();
-      if (!answer) {
-        return null;
-      }
-      const n = Number.parseInt(answer, 10);
-      if (!Number.isNaN(n)) {
-        const found = list.find(s => s.id === n);
-        if (found) return found;
-      }
-      console.log("Invalid id. Please type an existing snapshot id or press Enter to cancel.");
-    }
+    return { index, list };
   }
 
   async restore() {
-    await this.ensureDirs();
-    const index = await this.loadIndex();
-    const snapshot = await this.chooseSnapshot(index);
-    if (!snapshot) {
+    const loaded = await this.listSnapshots();
+    if (!loaded) return;
+    const { index } = loaded;
+
+    const answer = (await this.prompt("Type snapshot id to restore (empty = cancel): ")).trim();
+    if (!answer) {
       console.log("Restore cancelled.");
       return;
     }
 
+    const id = Number.parseInt(answer, 10);
+    if (Number.isNaN(id)) {
+      console.log("Invalid id. Restore aborted.");
+      return;
+    }
+
+    const snapshot = index.snapshots.find(s => s.id === id);
+    if (!snapshot) {
+      console.log("Snapshot not found. Restore aborted.");
+      return;
+    }
+
     console.log("");
-    console.log("You chose: " + this.formatSnapshot(snapshot));
-    const confirm = (await this.prompt("Overwrite current files with this snapshot? [y/n]: ")).trim().toLowerCase();
+    console.log(`You chose snapshot: ${this.formatSnapshot(snapshot)}`);
+    const confirm = (await this.prompt("Restore this snapshot and overwrite current folder? (y/n): ")).trim().toLowerCase();
     if (confirm !== "y" && confirm !== "yes") {
       console.log("Restore aborted.");
       return;
     }
 
-    console.log("Clearing current directory...");
+    console.log("Clearing current directory (except .backupman)...");
     await this.deleteEverythingExceptBackupDir();
 
     console.log("Restoring snapshot files...");
     const srcSnapshotDir = path.join(this.snapshotsDir, String(snapshot.id));
     await this.copyDir(srcSnapshotDir, this.rootDir);
 
-    console.log("Done. Restored snapshot #" + snapshot.id + ".");
+    console.log(`Done. Restored snapshot #${snapshot.id}.`);
   }
 }
 
 function printUsage() {
   console.log("backupman - ultra-simple local snapshot tool");
   console.log("");
-  console.log("Commands:");
-  console.log("  backupman save \"message\"");
-  console.log("  backupman restore");
+  console.log("Usage:");
+  console.log('  backupman save "message"   Save current directory as a snapshot');
+  console.log("  backupman restore          Restore from a snapshot");
 }
 
 async function main() {
@@ -187,7 +191,7 @@ async function main() {
       }
     }
     const id = await manager.createSnapshot(message.trim());
-    console.log("Saved snapshot #" + id + ".");
+    console.log(`Saved snapshot #${id}.`);
     return;
   }
 
@@ -196,7 +200,7 @@ async function main() {
     return;
   }
 
-  console.error("Unknown command: " + command);
+  console.error(`Unknown command: ${command}`);
   printUsage();
   process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backupman",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Ultra-simple local snapshot versioning tool for chaotic devs and mischievous AIs.",
   "bin": {
     "backupman": "index.js"