From: Sahithi Yarlagadda <sahi@swecha.net>
To: Ricardo Wurmus <rekado@elephly.net>, help-guix@gnu.org
Cc: guix-devel <guix-devel@gnu.org>
Subject: Re: Next steps
Date: Sun, 24 Jun 2018 23:55:07 +0530 [thread overview]
Message-ID: <91852f04-565c-69af-f079-7342a2d2a595@swecha.net> (raw)
In-Reply-To: <87r2l767sg.fsf@elephly.net>
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
Hi all,
The following are the changes that I made earlier.... and changes worked
fine...
This patch is pushed to my branch wip-sahithi
But when I try executing it now I don't find its results.... not even
soft-port is getting called...
May I know the reason behind this....
---
Thanks!!
Sahithi
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-Add-coloring-soft-port.patch --]
[-- Type: text/x-patch; name="0001-guix-Add-coloring-soft-port.patch", Size: 3905 bytes --]
From 99526f5624633e5fdc72fe8fb280b1279bea0636 Mon Sep 17 00:00:00 2001
From: Sahithi Yarlagadda <sahi@swecha.net>
Date: Sat, 16 Jun 2018 13:21:42 +0530
Subject: [PATCH] guix: Add coloring soft port.
* guix/ui.scm (handle-string): New procedures.
(colorful-build-output-port): New variable.
guix: Added colorful-build-output-port to build.scm instead of default
---
guix/scripts/build.scm | 4 +---
guix/ui.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 4dd4fbccd..81ad255d8 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -733,9 +733,7 @@ needed."
;; Set the build options before we do anything else.
(set-build-options-from-command-line store opts)
- (parameterize ((current-build-output-port (if quiet?
- (%make-void-port "w")
- (current-error-port))))
+ (parameterize ((current-build-output-port colorful-build-output-port))
(let* ((mode (assoc-ref opts 'build-mode))
(drv (options->derivations store opts))
(urls (map (cut string-append <> "/log")
diff --git a/guix/ui.scm b/guix/ui.scm
index 80f1a4d77..88e5fa6b7 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -109,7 +109,7 @@
warning
info
guix-main
- colorize-string))
+ colorful-build-output-port))
;;; Commentary:
;;;
@@ -1631,4 +1631,51 @@ be reset such that subsequent output will not have any colors in effect."
str
(color 'RESET)))
+(define (handle-string str)
+ "Accepts input string(str) as argument and checks whether it matches with one
+of the regular expressions specified. Upon matching, each substring is colorized
+with corresponding colors and the modified colored string is returned. If the
+input string fails match with the following conditionals it returns back the
+unmodified input string."
+ (let ((message (or (and=> (string-match "^(starting phase)(.*)" str)
+ (lambda (m)
+ (string-append
+ (colorize-string (match:substring m 1) 'BLUE)
+ (colorize-string (match:substring m 2) 'GREEN))))
+
+ (and=> (string-match "^(phase)(.*)(succeeded after)(.*)(seconds)" str)
+ (lambda (m)
+ (string-append
+ (colorize-string (match:substring m 1) 'BLUE)
+ (colorize-string (match:substring m 2) 'GREEN)
+ (colorize-string (match:substring m 3) 'BLUE)
+ (colorize-string (match:substring m 4) 'GREEN)
+ (colorize-string (match:substring m 5) 'BLUE))))
+
+ (and=> (string-match "^(phase)(.*)(failed after)(.*)(seconds)" str)
+ (lambda (m)
+ (string-append
+ (colorize-string (match:substring m 1) 'RED)
+ (colorize-string (match:substring m 2) 'GREEN)
+ (colorize-string (match:substring m 3) 'RED)
+ (colorize-string (match:substring m 4) 'GREEN)
+ (colorize-string (match:substring m 5) 'RED))))
+
+ ;; Didn’t match with any expression, returns back unmodified string.
+ str)))
+ (display message (current-error-port))))
+
+(define colorful-build-output-port
+ (make-soft-port
+ (vector
+ ;; procedure accepting one character for output
+ (lambda (c) (write c (current-error-port)))
+ ;; procedure accepting a string for handle-string procedure
+ handle-string
+ (lambda () (force-output (current-error-port)))
+ (const #t)
+ (lambda () (display "@" (current-error-port))))
+ "rw"))
+
+
;;; ui.scm ends here
--
2.11.0
next parent reply other threads:[~2018-06-24 18:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <8ea5d026-fab9-7b12-198e-610ad7743cb2@swecha.net>
[not found] ` <87fu1zznl3.fsf@elephly.net>
[not found] ` <f76f5ced-df02-fdcd-0a7a-37565d5d8605@swecha.net>
[not found] ` <87bmcnzjsp.fsf@elephly.net>
[not found] ` <18408eca-ad0b-111a-0ef6-ab452c9ca89c@swecha.net>
[not found] ` <878t7ryxvf.fsf@elephly.net>
[not found] ` <02e1a59a-ebc1-dfce-e1d6-22e97e742214@swecha.net>
[not found] ` <874lifypeb.fsf@elephly.net>
[not found] ` <648f81fc-0607-2c3b-f9a3-ca3b29cd637b@swecha.net>
[not found] ` <87bmck22uz.fsf@elephly.net>
[not found] ` <c2401637-c975-d416-e3a2-7b1535924c61@swecha.net>
[not found] ` <8736xv1xvq.fsf@elephly.net>
[not found] ` <64dfaf0c-3bcf-7b76-5831-b1c41d3f5563@swecha.net>
[not found] ` <CAE4v=pjiR2fVN3SoA+NqSt4T9VEvM9Gfsz9OUPW=7X9RnNE7mg@mail.gmail.com>
[not found] ` <c1a084e9-b888-1d01-b1fe-3e423169e750@swecha.net>
[not found] ` <877en4ccut.fsf@elephly.net>
[not found] ` <2b03fcec-c2d8-0604-156c-70fe7643a6cb@swecha.net>
[not found] ` <87zhzzbqn6.fsf@elephly.net>
[not found] ` <8f509759-c798-a150-bf5a-9b13cd07ac5b@swecha.net>
[not found] ` <87lgbibir5.fsf@elephly.net>
[not found] ` <564233bd-9511-7f84-3350-6a3a905534a8@swecha.net>
[not found] ` <87r2l767sg.fsf@elephly.net>
2018-06-24 18:25 ` Sahithi Yarlagadda [this message]
2018-06-24 20:22 ` Next steps Ricardo Wurmus
2018-06-24 20:33 ` Sahithi Yarlagadda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=91852f04-565c-69af-f079-7342a2d2a595@swecha.net \
--to=sahi@swecha.net \
--cc=guix-devel@gnu.org \
--cc=help-guix@gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).