From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKPLr-0007jp-2j for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eKPLm-00025z-6V for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57234) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eKPLm-00025n-2t for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eKPLl-0000i8-RP for guix-patches@gnu.org; Thu, 30 Nov 2017 08:58:01 -0500 Subject: [bug#29509] [PATCH 1/6] progress: Factorize erase-in-line. References: <20171130134620.3877-1-ludo@gnu.org> In-Reply-To: <20171130134620.3877-1-ludo@gnu.org> Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 30 Nov 2017 14:56:57 +0100 Message-Id: <20171130135702.4321-1-ludo@gnu.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29509@debbugs.gnu.org * guix/progress.scm (erase-in-line): New procedure. (progress-reporter/file): Use it. --- guix/progress.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/progress.scm b/guix/progress.scm index beca2c22a..1993c7403 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -153,6 +153,11 @@ width of the bar is BAR-WIDTH." (make-string filled #\#) (make-string empty #\space)))) +(define (erase-in-line port) + "Write an ANSI erase-in-line sequence to PORT to erase the whole line and +move the cursor to the beginning of the line." + (display "\r\x1b[K" port)) + (define* (progress-reporter/file file size #:optional (log-port (current-output-port)) #:key (abbreviation basename)) @@ -176,7 +181,7 @@ ABBREVIATION used to shorten FILE for display." (byte-count->string throughput) (seconds->string elapsed) (progress-bar %) %))) - (display "\r\x1b[K" log-port) + (erase-in-line log-port) (display (string-pad-middle left right (current-terminal-columns)) log-port) @@ -188,7 +193,7 @@ ABBREVIATION used to shorten FILE for display." (byte-count->string throughput) (seconds->string elapsed) (byte-count->string transferred)))) - (display "\r\x1b[K" log-port) + (erase-in-line log-port) (display (string-pad-middle left right (current-terminal-columns)) log-port) -- 2.15.0