backupman 0.2.3 → 0.2.4

package/index.js

@@ -24,7 +24,7 @@ class BackupMan {
         throw new Error("Corrupted index");
       }
       return parsed;
-    } catch (err) {
+    } catch {
       return { lastId: 0, snapshots: [] };
     }
   }
@@ -64,7 +64,7 @@ class BackupMan {
     }
   }
 
-  async prompt(question) {
+  prompt(question) {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -103,11 +103,9 @@ class BackupMan {
     return `#${snapshot.id}  [${ts}]  ${msg}`;
   }
 
-  async listSnapshots() {
-    await this.ensureDirs();
-    const index = await this.loadIndex();
+  async chooseSnapshotById(index) {
     if (!index.snapshots.length) {
-      console.log("No snapshots yet. Use `backupman save \"message\"` first.");
+      console.log("No snapshots yet. Run `backupman save \"message\"` first.");
       return null;
     }
 
@@ -118,44 +116,42 @@ class BackupMan {
       console.log("  " + this.formatSnapshot(s));
     });
     console.log("");
-    return { index, list };
-  }
 
-  async restore() {
-    const loaded = await this.listSnapshots();
-    if (!loaded) return;
-    const { index } = loaded;
+    while (true) {
+      const answer = (await this.prompt("Snapshot id to restore (empty = cancel): ")).trim();
+      if (!answer) return null;
 
-    const answer = (await this.prompt("Type snapshot id to restore (empty = cancel): ")).trim();
-    if (!answer) {
-      console.log("Restore cancelled.");
-      return;
-    }
+      const n = Number.parseInt(answer, 10);
+      if (Number.isNaN(n)) {
+        console.log("Please enter a numeric id (e.g. 1, 2, 3) or press Enter to cancel.");
+        continue;
+      }
 
-    const id = Number.parseInt(answer, 10);
-    if (Number.isNaN(id)) {
-      console.log("Invalid id. Restore aborted.");
-      return;
+      const target = index.snapshots.find(s => s.id === n);
+      if (!target) {
+        console.log("No snapshot with that id. Check the list above and try again.");
+        continue;
+      }
+
+      return target;
     }
+  }
 
-    const snapshot = index.snapshots.find(s => s.id === id);
+  async restore() {
+    await this.ensureDirs();
+    const index = await this.loadIndex();
+    const snapshot = await this.chooseSnapshotById(index);
     if (!snapshot) {
-      console.log("Snapshot not found. Restore aborted.");
+      console.log("Restore cancelled.");
       return;
     }
 
     console.log("");
-    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("Restoring snapshot: " + this.formatSnapshot(snapshot));
     console.log("Clearing current directory (except .backupman)...");
     await this.deleteEverythingExceptBackupDir();
 
-    console.log("Restoring snapshot files...");
+    console.log("Restoring files from snapshot...");
     const srcSnapshotDir = path.join(this.snapshotsDir, String(snapshot.id));
     await this.copyDir(srcSnapshotDir, this.rootDir);
 
@@ -167,8 +163,8 @@ function printUsage() {
   console.log("backupman - ultra-simple local snapshot tool");
   console.log("");
   console.log("Usage:");
-  console.log('  backupman save "message"   Save current directory as a snapshot');
-  console.log("  backupman restore          Restore from a snapshot");
+  console.log('  backupman save "message"');
+  console.log("  backupman restore");
 }
 
 async function main() {

package/package.json

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