From patchwork Sun Jan 27 22:26:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 862 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A6C4D16AD9; Sun, 27 Jan 2019 22:27:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5777D16AD7 for ; Sun, 27 Jan 2019 22:27:07 +0000 (GMT) Received: from localhost ([127.0.0.1]:51109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnstO-0007Nb-S8 for patchwork@mira.cbaines.net; Sun, 27 Jan 2019 17:27:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnstL-0007M0-MW for guix-patches@gnu.org; Sun, 27 Jan 2019 17:27:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gnstK-0004qe-Mj for guix-patches@gnu.org; Sun, 27 Jan 2019 17:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gnstK-0004qY-Jq for guix-patches@gnu.org; Sun, 27 Jan 2019 17:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gnstK-0003Os-Fm for guix-patches@gnu.org; Sun, 27 Jan 2019 17:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34228] [PATCH 3/5] status: Print a progress bar for on-going builds when possible. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Jan 2019 22:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34228@debbugs.gnu.org Received: via spool by 34228-submit@debbugs.gnu.org id=B34228.154862799413004 (code B ref 34228); Sun, 27 Jan 2019 22:27:02 +0000 Received: (at 34228) by debbugs.gnu.org; 27 Jan 2019 22:26:34 +0000 Received: from localhost ([127.0.0.1]:48042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gnsss-0003Na-9W for submit@debbugs.gnu.org; Sun, 27 Jan 2019 17:26:34 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:53930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gnsso-0003N1-36 for 34228@debbugs.gnu.org; Sun, 27 Jan 2019 17:26:30 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 791768087; Sun, 27 Jan 2019 23:26:29 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kuI4xYCvQZOj; Sun, 27 Jan 2019 23:26:28 +0100 (CET) Received: from gnu.org (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id BF0618089; Sun, 27 Jan 2019 23:26:27 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 27 Jan 2019 23:26:18 +0100 Message-Id: <20190127222620.26034-3-ludo@gnu.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190127222620.26034-1-ludo@gnu.org> References: <20190127222620.26034-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/status.scm (print-build-event)[report-build-progress]: New procedure. [print-log-line]: Add ID parameter. Call 'report-build-progress' when appropriate. Adjust callers. --- guix/status.scm | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/guix/status.scm b/guix/status.scm index 0435d14d6a..e3375816c5 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -441,14 +441,29 @@ addition to build events." (cut colorize-string <> 'RED 'BOLD) identity)) + (define (report-build-progress %) + (let ((% (min (max % 0) 100))) ;sanitize + (erase-current-line port) + (format port "~3d% " (inexact->exact (round %))) + (display (progress-bar % (- (current-terminal-columns) 5)) + port) + (force-output port))) + (define print-log-line (if print-log? (if colorize? - (lambda (line) + (lambda (id line) (display (colorize-log-line line) port)) - (cut display <> port)) - (lambda (line) - (spin! port)))) + (lambda (id line) + (display line port))) + (lambda (id line) + (match (build-status-building status) + ((build) ;single job + (match (build-completion build) + ((? number? %) (report-build-progress %)) + (_ (spin! port)))) + (_ + (spin! port)))))) (unless print-log? (display "\r" port)) ;erase the spinner @@ -552,7 +567,7 @@ addition to build events." ;; through. (display line port) (force-output port)) - (print-log-line line)) + (print-log-line pid line)) (cond ((string-prefix? "substitute: " line) ;; The daemon prefixes early messages coming with 'guix ;; substitute' with "substitute:". These are useful ("updating @@ -565,7 +580,7 @@ addition to build events." (display (info (string-trim-right line)) port) (newline)) (else - (print-log-line line))))) + (print-log-line pid line))))) (_ event)))