hide cursor in progress bar

src/filter.ts

@@ -328,11 +328,23 @@ export class TrzszFilter {
       this.uploadFilesResolve = null;
       this.uploadFilesReject = null;
       this.trzszTransfer.cleanup();
+      if (this.textProgressBar) {
+        this.textProgressBar.showCursor();
+      }
       this.textProgressBar = null;
       this.trzszTransfer = null;
     }
   }
 
+  private createProgressBar(quiet?: boolean, tmuxPaneColumns?: number) {
+    if (quiet === true) {
+      this.textProgressBar = null;
+      return;
+    }
+    this.textProgressBar = new TextProgressBar(this.writeToTerminal, this.terminalColumns, tmuxPaneColumns);
+    this.textProgressBar.hideCursor();
+  }
+
   private async handleTrzszDownloadFiles(_version: string, remoteIsWindows: boolean) {
     let savePath: string;
     let saveParam: any;
@@ -360,9 +372,7 @@ export class TrzszFilter {
     await this.trzszTransfer.sendAction(true, remoteIsWindows);
     const config = await this.trzszTransfer.recvConfig();
 
-    if (config.quiet !== true) {
-      this.textProgressBar = new TextProgressBar(this.writeToTerminal, this.terminalColumns, config.tmux_pane_width);
-    }
+    this.createProgressBar(config.quiet, config.tmux_pane_width);
 
     const localNames = await this.trzszTransfer.recvFiles(saveParam, openSaveFile, this.textProgressBar);
 
@@ -393,9 +403,7 @@ export class TrzszFilter {
       checkDuplicateNames(sendFiles);
     }
 
-    if (config.quiet !== true) {
-      this.textProgressBar = new TextProgressBar(this.writeToTerminal, this.terminalColumns, config.tmux_pane_width);
-    }
+    this.createProgressBar(config.quiet, config.tmux_pane_width);
 
     const remoteNames = await this.trzszTransfer.sendFiles(sendFiles, this.textProgressBar);
 

src/progress.ts

@@ -109,7 +109,7 @@ export class TextProgressBar implements ProgressCallback {
   public constructor(
     writer: (output: string) => void,
     columns: number,
-    tmuxPaneColumns: number | undefined = undefined
+    tmuxPaneColumns: number | undefined = undefined,
   ) {
     this.writer = writer;
     this.tmuxPaneColumns = tmuxPaneColumns || 0;
@@ -153,6 +153,14 @@ export class TextProgressBar implements ProgressCallback {
     this.showProgress();
   }
 
+  public hideCursor() {
+    this.writer("\x1b[?25l");
+  }
+
+  public showCursor() {
+    this.writer("\x1b[?25h");
+  }
+
   private showProgress() {
     const now = Date.now();
     if (now - this.lastUpdateTime < 200) {

src/transfer.ts

@@ -309,6 +309,7 @@ export class TrzszTransfer {
     }
     process.stdout.write(msg);
     process.stdout.write("\r\n");
+    process.stdout.write("\x1b[?25h");
     if (this.transferConfig.tmux_output_junk) {
       await tmuxRefreshClient();
     }

test/addon.test.ts

@@ -123,10 +123,10 @@ test("trz upload files using addon", async () => {
 
   onMessage({ data: "Received test.txt.0 to /tmp\n" });
 
-  expect(term.write.mock.calls.length).toBe(4);
-  expect(term.write.mock.calls[1][0]).toContain("test.txt [");
+  expect(term.write.mock.calls.length).toBe(6);
   expect(term.write.mock.calls[2][0]).toContain("test.txt [");
-  expect(term.write.mock.calls[3][0]).toBe("Received test.txt.0 to /tmp\n");
+  expect(term.write.mock.calls[3][0]).toContain("test.txt [");
+  expect(term.write.mock.calls[5][0]).toBe("Received test.txt.0 to /tmp\n");
 
   ws.listener["close"]();
   expect(term.mockDispose.dispose.mock.calls.length).toBe(3);
@@ -199,10 +199,10 @@ test("tsz download files using addon", async () => {
 
   onMessage({ data: "Saved test.txt.0 to /tmp\n" });
 
-  expect(term.write.mock.calls.length).toBe(4);
-  expect(term.write.mock.calls[1][0]).toContain("test.txt [");
+  expect(term.write.mock.calls.length).toBe(6);
   expect(term.write.mock.calls[2][0]).toContain("test.txt [");
-  expect(term.write.mock.calls[3][0]).toBe("Saved test.txt.0 to /tmp\n");
+  expect(term.write.mock.calls[3][0]).toContain("test.txt [");
+  expect(term.write.mock.calls[5][0]).toBe("Saved test.txt.0 to /tmp\n");
 
   expect(file.closeFile.mock.calls.length).toBeGreaterThanOrEqual(1);
   expect(file.getLocalName.mock.calls.length).toBeGreaterThanOrEqual(1);

test/filter.test.ts

@@ -179,10 +179,10 @@ test("trz upload files", async () => {
 
   trzsz.processServerOutput("Received test.txt.0 to /tmp\n");
 
-  expect(writeToTerminal.mock.calls.length).toBe(4);
-  expect(writeToTerminal.mock.calls[1][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls.length).toBe(6);
   expect(writeToTerminal.mock.calls[2][0]).toContain("test.txt [");
-  expect(writeToTerminal.mock.calls[3][0]).toBe("Received test.txt.0 to /tmp\n");
+  expect(writeToTerminal.mock.calls[3][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls[5][0]).toBe("Received test.txt.0 to /tmp\n");
 });
 
 test("tsz download files", async () => {
@@ -231,10 +231,10 @@ test("tsz download files", async () => {
 
   trzsz.processServerOutput("Saved test.txt.0 to /tmp\n");
 
-  expect(writeToTerminal.mock.calls.length).toBe(4);
-  expect(writeToTerminal.mock.calls[1][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls.length).toBe(6);
   expect(writeToTerminal.mock.calls[2][0]).toContain("test.txt [");
-  expect(writeToTerminal.mock.calls[3][0]).toBe("Saved test.txt.0 to /tmp\n");
+  expect(writeToTerminal.mock.calls[3][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls[5][0]).toBe("Saved test.txt.0 to /tmp\n");
 
   expect(fs.readFileSync(path.join(tmpDir, "test.txt.0")).toString()).toBe("test content\n");
 });
@@ -392,10 +392,10 @@ test("trz upload files in browser", async () => {
 
   trzsz.processServerOutput("Received test.txt.0 to /tmp\n");
 
-  expect(writeToTerminal.mock.calls.length).toBe(4);
-  expect(writeToTerminal.mock.calls[1][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls.length).toBe(6);
   expect(writeToTerminal.mock.calls[2][0]).toContain("test.txt [");
-  expect(writeToTerminal.mock.calls[3][0]).toBe("Received test.txt.0 to /tmp\n");
+  expect(writeToTerminal.mock.calls[3][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls[5][0]).toBe("Received test.txt.0 to /tmp\n");
 
   selectSendFiles.mockRestore();
 });
@@ -462,10 +462,10 @@ test("tsz download files in browser", async () => {
 
   trzsz.processServerOutput("Saved test.txt.0 to /tmp\n");
 
-  expect(writeToTerminal.mock.calls.length).toBe(4);
-  expect(writeToTerminal.mock.calls[1][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls.length).toBe(6);
   expect(writeToTerminal.mock.calls[2][0]).toContain("test.txt [");
-  expect(writeToTerminal.mock.calls[3][0]).toBe("Saved test.txt.0 to /tmp\n");
+  expect(writeToTerminal.mock.calls[3][0]).toContain("test.txt [");
+  expect(writeToTerminal.mock.calls[5][0]).toBe("Saved test.txt.0 to /tmp\n");
 
   expect(file.closeFile.mock.calls.length).toBeGreaterThanOrEqual(1);
   expect(file.getLocalName.mock.calls.length).toBeGreaterThanOrEqual(1);