sftp-push-sync 1.0.13 → 1.0.15

package/bin/sftp-push-sync.mjs

@@ -53,7 +53,11 @@ const EXC = pc.redBright("-"); // Excluded
 
 const hr1 = () => "─".repeat(65); // horizontal line -
 const hr2 = () => "=".repeat(65); // horizontal line =
-const tab_a = () => " ".repeat(3); // indentation for formatting the output.
+const tab_a = () => " ".repeat(3); // indentation for formatting the terminal output.
+const tab_b = () => " ".repeat(6);
+const cr_a = () => "\n".repeat(1);
+const cr_b = () => "\n".repeat(2);
+
 
 // ---------------------------------------------------------------------------
 // CLI arguments
@@ -72,7 +76,7 @@ if (args.includes("--laconic")) cliLogLevel = "laconic";
 
 if (!TARGET) {
   console.error(pc.red("❌ Please specify a connection profile:"));
-  console.error(pc.yellow("   sftp-push-sync staging --dry-run"));
+  console.error(pc.yellow(`${tab_a()}sftp-push-sync staging --dry-run`));
   process.exit(1);
 }
 
@@ -242,8 +246,11 @@ let progressActive = false;
 function clearProgressLine() {
   if (!process.stdout.isTTY || !progressActive) return;
   const width = process.stdout.columns || 80;
-  const blank = " ".repeat(width - 1);
-  process.stdout.write("\r" + blank + "\r");
+  const blank = " ".repeat(width);
+
+  // Beide Progress-Zeilen leeren
+  process.stdout.write("\r" + blank + cr_a() + blank + "\r");
+
   progressActive = false;
 }
 
@@ -346,7 +353,7 @@ function updateProgress2(prefix, current, total, rel = "") {
   if (line2.length > width) line2 = line2.slice(0, width - 1);
 
   // zwei Zeilen überschreiben
-  process.stdout.write("\r" + line1.padEnd(width) + "\n");
+  process.stdout.write("\r" + line1.padEnd(width) + cr_a());
   process.stdout.write(line2.padEnd(width));
 
   // Cursor wieder nach oben (auf die Fortschrittszeile)
@@ -421,8 +428,8 @@ async function walkLocal(root) {
         scanned += 1;
         const chunk = IS_VERBOSE ? 1 : SCAN_CHUNK;
         if (scanned === 1 || scanned % chunk === 0) {
-          // totally unknown → totally = 0 → no automatic \n
-          updateProgress2("   Scan local: ", scanned, 0, rel);
+          // totally unknown → total = 0 → no automatic \n
+          updateProgress2(`${tab_a()}Scan local: `, scanned, 0, rel);
         }
       }
     }
@@ -432,8 +439,8 @@ async function walkLocal(root) {
 
   if (scanned > 0) {
     // last line + neat finish
-    updateProgress2("   Scan local: ", scanned, 0, "fertig");
-    process.stdout.write("\n");
+    updateProgress2(`${tab_a()}Scan local: `, scanned, 0, "fertig");
+    process.stdout.write(cr_a());
     progressActive = false;
   }
 
@@ -473,7 +480,7 @@ async function walkRemote(sftp, remoteRoot) {
         scanned += 1;
         const chunk = IS_VERBOSE ? 1 : SCAN_CHUNK;
         if (scanned === 1 || scanned % chunk === 0) {
-          updateProgress2("   Scan remote: ", scanned, 0, rel);
+          updateProgress2(`${tab_a()}Scan remote: `, scanned, 0, rel);
         }
       }
     }
@@ -482,8 +489,8 @@ async function walkRemote(sftp, remoteRoot) {
   await recurse(remoteRoot);
 
   if (scanned > 0) {
-    updateProgress2("   Scan remote: ", scanned, 0, "fertig");
-    process.stdout.write("\n");
+    updateProgress2(`${tab_a()}Scan remote: `, scanned, 0, "fertig");
+    process.stdout.write(cr_a());
     progressActive = false;
   }
 
@@ -609,18 +616,18 @@ function describeSftpError(err) {
 async function main() {
   const start = Date.now();
 
-  log(`\n\n${hr2()}`);
+  log(`${cr_b()}${hr2()}`);
   log(
     pc.bold(
       `🔐 SFTP Push-Synchronisation: sftp-push-sync  v${pkg.version}  [logLevel=${LOG_LEVEL}]`
     )
   );
   log(`${tab_a()}Connection: ${pc.cyan(TARGET)}`);
-  log(`Worker: ${CONNECTION.workers}`);
-  log(`${tab_a()}Host:   ${pc.green(CONNECTION.host)}:${pc.green(CONNECTION.port)}`);
-  log(`${tab_a()}Local:  ${pc.green(CONNECTION.localRoot)}`);
+  log(`${tab_a()}Worker: ${CONNECTION.workers}`);
+  log(`${tab_a()}Host: ${pc.green(CONNECTION.host)}:${pc.green(CONNECTION.port)}`);
+  log(`${tab_a()}Local: ${pc.green(CONNECTION.localRoot)}`);
   log(`${tab_a()}Remote: ${pc.green(CONNECTION.remoteRoot)}`);
-  if (DRY_RUN) log(pc.yellow("   Mode: DRY-RUN (no changes)"));
+  if (DRY_RUN) log(pc.yellow(`${tab_a()}Mode: DRY-RUN (no changes)`));
   if (RUN_UPLOAD_LIST || RUN_DOWNLOAD_LIST) {
     log(
       pc.blue(
@@ -630,7 +637,7 @@ async function main() {
       )
     );
   }
-  log(`${hr1()}\n`);
+  log(`${hr1()}${cr_a()}`);
 
   const sftp = new SftpClient();
   let connected = false;
@@ -658,7 +665,7 @@ async function main() {
       process.exit(1);
     }
 
-    log(pc.bold(pc.cyan("📥 Phase 1: Scan local files …")));
+    log(cr_a() + pc.bold(pc.cyan("📥 Phase 1: Scan local files …")));
     const local = await walkLocal(CONNECTION.localRoot);
     log(`${tab_a()}→ ${local.size} local files`);
 
@@ -671,14 +678,14 @@ async function main() {
       log("");
     }
 
-    log(pc.bold(pc.cyan("📤 Phase 2: Scan remote files …")));
+    log(cr_a() + pc.bold(pc.cyan("📤 Phase 2: Scan remote files …")));
     const remote = await walkRemote(sftp, CONNECTION.remoteRoot);
-    log(`${tab_a()}→ ${remote.size} remote files\n`);
+    log(`${tab_a()}→ ${remote.size} remote files${cr_a()}`);
 
     const localKeys = new Set(local.keys());
     const remoteKeys = new Set(remote.keys());
 
-    log(pc.bold(pc.cyan("🔎 Phase 3: Compare & decide …")));
+    log(cr_a() + pc.bold(pc.cyan("🔎 Phase 3: Compare & decide …")));
     const totalToCheck = localKeys.size;
     let checkedCount = 0;
 
@@ -761,8 +768,8 @@ async function main() {
 
         if (IS_VERBOSE) {
           vlog(`${tab_a()}${CHA} Hash different (binary): ${rel}`);
-          vlog(`${tab_a()}   local:  ${localHash}`);
-          vlog(`${tab_a()}   remote: ${remoteHash}`);
+          vlog(`${tab_b()}local:  ${localHash}`);
+          vlog(`${tab_b()}remote: ${remoteHash}`);
         }
 
         toUpdate.push({ rel, local: l, remote: r, remotePath });
@@ -772,8 +779,13 @@ async function main() {
       }
     }
 
+    // Wenn Phase 3 nichts gefunden hat, explizit sagen
+    if (toAdd.length === 0 && toUpdate.length === 0) {
+      log(`${tab_a()}No differences found. Everything is up to date.`);
+    }
+
     log(
-      "\n" + pc.bold(pc.cyan("🧹 Phase 4: Removing orphaned remote files …"))
+      cr_a() + pc.bold(pc.cyan("🧹 Phase 4: Removing orphaned remote files …"))
     );
     for (const rel of remoteKeys) {
       if (!localKeys.has(rel)) {
@@ -785,12 +797,17 @@ async function main() {
       }
     }
 
+    // Auch für Phase 4 eine „nix zu tun“-Meldung
+    if (toDelete.length === 0) {
+      log(`${tab_a()}No orphaned remote files found.`);
+    }
+
     // -------------------------------------------------------------------
     // Phase 5: Execute changes (parallel, worker-based)
     // -------------------------------------------------------------------
 
     if (!DRY_RUN) {
-      log("\n" + pc.bold(pc.cyan("🚚 Phase 5: Apply changes …")));
+      log(cr_a() + pc.bold(pc.cyan("🚚 Phase 5: Apply changes …")));
 
       // Upload new files
       await runTasks(
@@ -844,7 +861,7 @@ async function main() {
     } else {
       log(
         pc.yellow(
-          "\n💡 DRY-RUN: Connection tested, no files transferred or deleted."
+          `${cr_a()}💡 DRY-RUN: Connection tested, no files transferred or deleted.`
         )
       );
     }
@@ -855,7 +872,7 @@ async function main() {
 
     if (RUN_UPLOAD_LIST && UPLOAD_LIST.length > 0) {
       log(
-        "\n" +
+        cr_a() +
           pc.bold(pc.cyan("⬆️ Extra Phase: Upload-List (explicit files) …"))
       );
 
@@ -890,7 +907,7 @@ async function main() {
 
     if (RUN_DOWNLOAD_LIST && DOWNLOAD_LIST.length > 0) {
       log(
-        "\n" +
+        cr_a() +
           pc.bold(pc.cyan("⬇️ Extra Phase: Download-List (explicit files) …"))
       );
 
@@ -924,7 +941,8 @@ async function main() {
     await saveCache(true);
 
     // Summary
-    log("\n" + pc.bold(pc.cyan("📊 Summary:")));
+    log(hr1());
+    log(cr_a() + pc.bold(pc.cyan("📊 Summary:")));
     log(`${tab_a()}Duration: ${pc.green(duration + " s")}`);
     log(`${tab_a()}${ADD} Added  : ${toAdd.length}`);
     log(`${tab_a()}${CHA} Changed: ${toUpdate.length}`);
@@ -935,7 +953,7 @@ async function main() {
       );
     }
     if (toAdd.length || toUpdate.length || toDelete.length) {
-      log("\n📄 Changes:");
+      log(`${cr_a()}📄 Changes:`);
       [...toAdd.map((t) => t.rel)]
         .sort()
         .forEach((f) => console.log(`${tab_a()}${ADD} ${f}`));
@@ -946,10 +964,10 @@ async function main() {
         .sort()
         .forEach((f) => console.log(`${tab_a()}${DEL} ${f}`));
     } else {
-      log("\nNo changes.");
+      log(`${cr_a()}No changes.`);
     }
 
-    log("\n" + pc.bold(pc.green("✅ Sync complete.")));
+    log(cr_a() + pc.bold(pc.green("✅ Sync complete.")));
   } catch (err) {
     const hint = describeSftpError(err);
     elog(pc.red("❌ Synchronisation error:"), err.message || err);
@@ -979,7 +997,7 @@ async function main() {
       );
     }
   }
-  log(`${hr2()}\n\n`);
+  log(`${hr2()}${cr_b()}`);
 }
 
-main();
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sftp-push-sync",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "SFTP sync tool for Hugo projects (local to remote, with hash cache)",
   "type": "module",
   "bin": {