From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Sprang Subject: [PATCH] build: Improve information density and appearance of download progress output. Date: Sat, 5 Sep 2015 11:48:20 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a113e57d2cd8679051f047508 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYIVi-0005nL-OV for guix-devel@gnu.org; Sat, 05 Sep 2015 14:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYIVh-0007aj-5x for guix-devel@gnu.org; Sat, 05 Sep 2015 14:48:22 -0400 Received: from mail-oi0-x236.google.com ([2607:f8b0:4003:c06::236]:36737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYIVg-0007aG-VX for guix-devel@gnu.org; Sat, 05 Sep 2015 14:48:21 -0400 Received: by oibi136 with SMTP id i136so27432861oib.3 for ; Sat, 05 Sep 2015 11:48:20 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --001a113e57d2cd8679051f047508 Content-Type: multipart/alternative; boundary=001a113e57d2cd8672051f047506 --001a113e57d2cd8672051f047506 Content-Type: text/plain; charset=UTF-8 This patch adds Arch/pacman style output when invoking 'guix download'. Previous output: $ guix download ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz starting download of `/tmp/guix-file.IgqbP2' from ` ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz'... ftp://ftp.gnu.org/.../guile-2.0.11.tar.gz 29.6% of 7339.9 KiB (781. KiB/s) Patched output: $ guix download ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz starting download of `/tmp/guix-file.ULgbny' from ` ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz'... guile-2.0.11.tar.gz 7.2MiB 1.1MiB/s 00:00:02 [####### ] 36.6% -Steve --001a113e57d2cd8672051f047506 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
This patch adds Arch/pacman style output wh= en invoking 'guix download'.

Previous output:
$ gui= x download ftp:= //ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz
starting download of `/t= mp/guix-file.IgqbP2' from `ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz'.= ..
ftp://ftp.g= nu.org/.../guile-2.0.11.tar.gz=C2=A0=C2=A0=C2=A0 =C2=A029.6% of 7339.9 = KiB (781. KiB/s)

Patched output:
$ guix download ftp://ftp.gnu.org/gnu/gui= le/guile-2.0.11.tar.gz
starting download of `/tmp/guix-file.ULgbny&#= 39; from `ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz'...
=C2=A0guile= -2.0.11.tar.gz=C2=A0 7.2MiB=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 1.1MiB/s 00:00:02 [#######=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ]=C2=A0 36.6%<= br>
-Steve
--001a113e57d2cd8672051f047506-- --001a113e57d2cd8679051f047508 Content-Type: text/x-patch; charset=UTF-8; name="progress-bar.patch" Content-Disposition: attachment; filename="progress-bar.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ie7f7zb60 RnJvbSAyMWY5ODI5ZmFiNjhlNDY2MGIxOWI2NTExNTRmM2M4NzNiNGQ1OTVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGV2ZSBTcHJhbmcgPHNjc0BzdGV2ZXNwcmFuZy5jb20+CkRh dGU6IFNhdCwgNSBTZXAgMjAxNSAxMTozMjozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIGJ1aWxk OiBJbXByb3ZlIGluZm9ybWF0aW9uIGRlbnNpdHkgYW5kIGFwcGVhcmFuY2Ugb2YgZG93bmxvYWQK IHByb2dyZXNzIG91dHB1dC4KCiogZ3VpeC9idWlsZC9kb3dubG9hZC5zY20gKHNlY29uZHMtPnN0 cmluZyk6IE5ldyBmdW5jdGlvbi4KICAoYnl0ZS1jb3VudC0+c3RyaW5nKTogTmV3IGZ1bmN0aW9u LgogIChwcm9ncmVzcy1iYXIpOiBOZXcgZnVuY3Rpb24uCiAgKHRocm91Z2hwdXQtPnN0cmluZyk6 IFJlbW92ZSBmdW5jdGlvbi4KICAocHJvZ3Jlc3MtcHJvYyk6IERpc3BsYXkgYmFzZSBmaWxlIG5h bWUsIGVsYXBzZWQgdGltZSwgYW5kIHByb2dyZXNzIGJhci4KLS0tCiBndWl4L2J1aWxkL2Rvd25s b2FkLnNjbSB8IDc5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9ndWl4L2J1aWxkL2Rvd25sb2FkLnNjbSBiL2d1aXgvYnVpbGQvZG93bmxv YWQuc2NtCmluZGV4IGFlNTliMDEuLmU5NTQ5NjMgMTAwNjQ0Ci0tLSBhL2d1aXgvYnVpbGQvZG93 bmxvYWQuc2NtCisrKyBiL2d1aXgvYnVpbGQvZG93bmxvYWQuc2NtCkBAIC0xLDYgKzEsNyBAQAog Ozs7IEdOVSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCiA7 OzsgQ29weXJpZ2h0IMKpIDIwMTIsIDIwMTMsIDIwMTQsIDIwMTUgTHVkb3ZpYyBDb3VydMOocyA8 bHVkb0BnbnUub3JnPgogOzs7IENvcHlyaWdodCDCqSAyMDE1IE1hcmsgSCBXZWF2ZXIgPG1od0Bu ZXRyaXMub3JnPgorOzs7IENvcHlyaWdodCDCqSAyMDE1IFN0ZXZlIFNwcmFuZyA8c2NzQHN0ZXZl c3ByYW5nLmNvbT4KIDs7OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4LgogOzs7 CkBAIC01NCwxNyArNTUsNDYgQEAgb2JqZWN0LCBhcyBhbiBpbmV4YWN0IG51bWJlci4iCiAgICgr ICh0aW1lLXNlY29uZCBkdXJhdGlvbikKICAgICAgKC8gKHRpbWUtbmFub3NlY29uZCBkdXJhdGlv bikgMWU5KSkpCiAKLShkZWZpbmUgKHRocm91Z2hwdXQtPnN0cmluZyB0aHJvdWdocHV0KQotICAi R2l2ZW4gVEhST1VHSFBVVCwgbWVhc3VyZWQgaW4gYnl0ZXMgcGVyIHNlY29uZCwgcmV0dXJuIGEg c3RyaW5nCi1yZXByZXNlbnRpbmcgaXQgaW4gYSBodW1hbi1yZWFkYWJsZSB3YXkuIgotICAoaWYg KD4gdGhyb3VnaHB1dCAzZTYpCi0gICAgICAoZm9ybWF0ICNmICJ+LDJmIE1pQi9zIiAoLyB0aHJv dWdocHV0IChleHB0IDIuIDIwKSkpCi0gICAgICAoZm9ybWF0ICNmICJ+LDBmIEtpQi9zIiAoLyB0 aHJvdWdocHV0IDEwMjQuMCkpKSkKKyhkZWZpbmUgKHNlY29uZHMtPnN0cmluZyBkdXJhdGlvbikK KyAgIkdpdmVuIERVUkFUSU9OIGluIHNlY29uZHMsIHJldHVybiBhIHN0cmluZyByZXByZXNlbnRp bmcgaXQgaW4gJ2hoOm1tOnNzJworZm9ybWF0LiIKKyAgKGlmIChub3QgKG51bWJlcj8gZHVyYXRp b24pKQorICAgICAgIjAwOjAwOjAwIgorICAgICAgKGxldCogKCh0b3RhbC1zZWNvbmRzIChpbmV4 YWN0LT5leGFjdCAocm91bmQgZHVyYXRpb24pKSkKKyAgICAgICAgICAgICAoZXh0cmEtc2Vjb25k cyAobW9kdWxvIHRvdGFsLXNlY29uZHMgMzYwMCkpCisgICAgICAgICAgICAgKGhvdXJzICAgICAg ICAgKHF1b3RpZW50IHRvdGFsLXNlY29uZHMgMzYwMCkpCisgICAgICAgICAgICAgKG1pbnMgICAg ICAgICAgKHF1b3RpZW50IGV4dHJhLXNlY29uZHMgNjApKQorICAgICAgICAgICAgIChzZWNzICAg ICAgICAgIChtb2R1bG8gZXh0cmEtc2Vjb25kcyA2MCkpKQorICAgICAgICAoZm9ybWF0ICNmICJ+ MiwnMGQ6fjIsJzBkOn4yLCcwZCIgaG91cnMgbWlucyBzZWNzKSkpKQorCisoZGVmaW5lIChieXRl LWNvdW50LT5zdHJpbmcgc2l6ZSkKKyAgIkdpdmVuIFNJWkUgaW4gYnl0ZXMsIHJldHVybiBhIHN0 cmluZyByZXByZXNlbnRpbmcgaXQgaW4gYSBodW1hbi1yZWFkYWJsZQord2F5LiIKKyAgKGxldCAo KEtpQiAxMDI0LikKKyAgICAgICAgKE1pQiAoZXhwdCAxMDI0LiAyKSkKKyAgICAgICAgKEdpQiAo ZXhwdCAxMDI0LiAzKSkKKyAgICAgICAgKFRpQiAoZXhwdCAxMDI0LiA0KSkpCisgICAgKGNvbmQK KyAgICAgKCg8IHNpemUgS2lCKSAoZm9ybWF0ICNmICJ+ZEIiIChpbmV4YWN0LT5leGFjdCBzaXpl KSkpCisgICAgICgoPCBzaXplIE1pQikgKGZvcm1hdCAjZiAifmRLaUIiIChpbmV4YWN0LT5leGFj dCAocm91bmQgKC8gc2l6ZSBLaUIpKSkpKQorICAgICAoKDwgc2l6ZSBHaUIpIChmb3JtYXQgI2Yg In4sMWZNaUIiICgvIHNpemUgTWlCKSkpCisgICAgICgoPCBzaXplIFRpQikgKGZvcm1hdCAjZiAi fiwyZkdpQiIgKC8gc2l6ZSBHaUIpKSkKKyAgICAgKGVsc2UgICAgICAgICAoZm9ybWF0ICNmICJ+ LDNmVGlCIiAoLyBzaXplIFRpQikpKSkpKQorCisoZGVmaW5lKiAocHJvZ3Jlc3MtYmFyICUgIzpv cHRpb25hbCAoYmFyLXdpZHRoIDIwKSkKKyAgIlJldHVybiAlIGFzIGEgc3RyaW5nIHJlcHJlc2Vu dGluZyBhbiBBU0NJSS1hcnQgcHJvZ3Jlc3MgYmFyLiAgVGhlIHRvdGFsCit3aWR0aCBvZiB0aGUg YmFyIGlzIEJBUi1XSURUSC4iCisgIChsZXQqICgoZnJhY3Rpb24gKC8gJSAxMDApKQorICAgICAg ICAgKGZpbGxlZCAgIChpbmV4YWN0LT5leGFjdCAoZmxvb3IgKCogZnJhY3Rpb24gYmFyLXdpZHRo KSkpKQorICAgICAgICAgKGVtcHR5ICAgICgtIGJhci13aWR0aCBmaWxsZWQpKSkKKyAgICAoZm9y bWF0ICNmICJbfmF+YV0iCisgICAgICAgICAgICAobWFrZS1zdHJpbmcgZmlsbGVkICNcIykKKyAg ICAgICAgICAgIChtYWtlLXN0cmluZyBlbXB0eSAjXHNwYWNlKSkpKQogCiAoZGVmaW5lKiAocHJv Z3Jlc3MtcHJvYyBmaWxlIHNpemUgIzpvcHRpb25hbCAobG9nLXBvcnQgKGN1cnJlbnQtb3V0cHV0 LXBvcnQpKSkKLSAgIlJldHVybiBhIHByb2NlZHVyZSB0byBzaG93IHRoZSBwcm9ncmVzcyBvZiBG SUxFJ3MgZG93bmxvYWQsIHdoaWNoIGlzCi1TSVpFIGJ5dGUgbG9uZy4gIFRoZSByZXR1cm5lZCBw cm9jZWR1cmUgaXMgc3VpdGFibGUgZm9yIHVzZSBhcyBhbgotYXJndW1lbnQgdG8gYGR1bXAtcG9y dCcuICBUaGUgcHJvZ3Jlc3MgcmVwb3J0IGlzIHdyaXR0ZW4gdG8gTE9HLVBPUlQuIgorICAiUmV0 dXJuIGEgcHJvY2VkdXJlIHRvIHNob3cgdGhlIHByb2dyZXNzIG9mIEZJTEUncyBkb3dubG9hZCwg d2hpY2ggaXMgU0laRQorYnl0ZXMgbG9uZy4gIFRoZSByZXR1cm5lZCBwcm9jZWR1cmUgaXMgc3Vp dGFibGUgZm9yIHVzZSBhcyBhbiBhcmd1bWVudCB0bworYGR1bXAtcG9ydCcuICBUaGUgcHJvZ3Jl c3MgcmVwb3J0IGlzIHdyaXR0ZW4gdG8gTE9HLVBPUlQuIgogICA7OyBYWFg6IEJlY2F1c2Ugb2Yg PGh0dHA6Ly9idWdzLmdudS5vcmcvMTk5Mzk+IHRoaXMgcHJvY2VkdXJlIGlzIG9mdGVuIG5vdAog ICA7OyBjYWxsZWQgYXMgZnJlcXVlbnRseSBhcyB3ZSdkIGxpa2UgdG9vOyB0aGlzIGlzIGVzcGVj aWFsbHkgYmFkIHdpdGggTmdpbngKICAgOzsgb24gaHlkcmEuZ251Lm9yZywgd2hpY2ggcmV0dXJu cyB3aG9sZSBuYXJzIGFzIGEgc2luZ2xlIGNodW5rLgpAQCAtODMsMTQgKzExMywyNCBAQCBhcmd1 bWVudCB0byBgZHVtcC1wb3J0Jy4gIFRoZSBwcm9ncmVzcyByZXBvcnQgaXMgd3JpdHRlbiB0byBM T0ctUE9SVC4iCiAgICAgICAoaWYgKG51bWJlcj8gc2l6ZSkKICAgICAgICAgICAobGFtYmRhICh0 cmFuc2ZlcnJlZCBjb250KQogICAgICAgICAgICAgKHdpdGgtZWxhcHNlZC10aW1lIGVsYXBzZWQK LSAgICAgICAgICAgICAgKGxldCAoKCUgICAgICAgICAgKCogMTAwLjAgKC8gdHJhbnNmZXJyZWQg c2l6ZSkpKQotICAgICAgICAgICAgICAgICAgICAodGhyb3VnaHB1dCAoaWYgZWxhcHNlZAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKC8gdHJhbnNmZXJyZWQgZWxhcHNlZCkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDApKSkKKyAgICAgICAgICAgICAg KGxldCogKCglICAgICAgICAgICgqIDEwMC4wICgvIHRyYW5zZmVycmVkIHNpemUpKSkKKyAgICAg ICAgICAgICAgICAgICAgICh0aHJvdWdocHV0IChpZiBlbGFwc2VkCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKC8gdHJhbnNmZXJyZWQgZWxhcHNlZCkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAwKSkKKyAgICAgICAgICAgICAgICAgICAgIChsZWZ0 ICAgICAgIChmb3JtYXQgI2YgIiB+YSAgfmEiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChiYXNlbmFtZSBmaWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoYnl0ZS1jb3VudC0+c3RyaW5nIHNpemUpKSkKKyAgICAgICAgICAgICAg ICAgICAgIChyaWdodCAgICAgIChmb3JtYXQgI2YgIn5hL3MgfmEgfmF+NiwxZiUiCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChieXRlLWNvdW50LT5zdHJpbmcgdGhy b3VnaHB1dCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNlY29u ZHMtPnN0cmluZyBlbGFwc2VkKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAocHJvZ3Jlc3MtYmFyICUpICUpKQorICAgICAgICAgICAgICAgICAgICAgOzsgVE9ETzog TWFrZSB0aGlzIGFkYXB0IHRvIHRoZSBhY3R1YWwgdGVybWluYWwgd2lkdGguCisgICAgICAgICAg ICAgICAgICAgICAoY29scyAgICAgICA5MCkKKyAgICAgICAgICAgICAgICAgICAgIChudW0tc3Bh Y2VzIChtYXggMSAoLSBjb2xzICgrIChzdHJpbmctbGVuZ3RoIGxlZnQpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWxlbmd0aCByaWdo dCkpKSkpCisgICAgICAgICAgICAgICAgICAgICAoZ2FwICAgICAgICAobWFrZS1zdHJpbmcgbnVt LXNwYWNlcyAjXHNwYWNlKSkpCiAgICAgICAgICAgICAgICAgKGRpc3BsYXkgI1xjciBsb2ctcG9y dCkKLSAgICAgICAgICAgICAgICAoZm9ybWF0IGxvZy1wb3J0ICJ+YVx0fjUsMWYlIG9mIH4sMWYg S2lCICh+YSkiCi0gICAgICAgICAgICAgICAgICAgICAgICBmaWxlICUgKC8gc2l6ZSAxMDI0LjAp Ci0gICAgICAgICAgICAgICAgICAgICAgICAodGhyb3VnaHB1dC0+c3RyaW5nIHRocm91Z2hwdXQp KQorICAgICAgICAgICAgICAgIChmb3JtYXQgbG9nLXBvcnQgIn5hfmF+YSIgbGVmdCBnYXAgcmln aHQpCiAgICAgICAgICAgICAgICAgKGZsdXNoLW91dHB1dC1wb3J0IGxvZy1wb3J0KQogICAgICAg ICAgICAgICAgIChjb250KSkpKQogICAgICAgICAgIChsYW1iZGEgKHRyYW5zZmVycmVkIGNvbnQp CkBAIC05OSw5ICsxMzksMTAgQEAgYXJndW1lbnQgdG8gYGR1bXAtcG9ydCcuICBUaGUgcHJvZ3Jl c3MgcmVwb3J0IGlzIHdyaXR0ZW4gdG8gTE9HLVBPUlQuIgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKC8gdHJhbnNmZXJyZWQgZWxhcHNlZCkKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDApKSkKICAgICAgICAgICAgICAgICAoZGlzcGxheSAjXGNyIGxv Zy1wb3J0KQotICAgICAgICAgICAgICAgIChmb3JtYXQgbG9nLXBvcnQgIn5hXHR+NiwxZiBLaUIg dHJhbnNmZXJyZWQgKH5hKSIKLSAgICAgICAgICAgICAgICAgICAgICAgIGZpbGUgKC8gdHJhbnNm ZXJyZWQgMTAyNC4wKQotICAgICAgICAgICAgICAgICAgICAgICAgKHRocm91Z2hwdXQtPnN0cmlu ZyB0aHJvdWdocHV0KSkKKyAgICAgICAgICAgICAgICAoZm9ybWF0IGxvZy1wb3J0ICJ+YVx0fmEg dHJhbnNmZXJyZWQgKH5hL3MpIgorICAgICAgICAgICAgICAgICAgICAgICAgZmlsZQorICAgICAg ICAgICAgICAgICAgICAgICAgKGJ5dGUtY291bnQtPnN0cmluZyB0cmFuc2ZlcnJlZCkKKyAgICAg ICAgICAgICAgICAgICAgICAgIChieXRlLWNvdW50LT5zdHJpbmcgdGhyb3VnaHB1dCkpCiAgICAg ICAgICAgICAgICAgKGZsdXNoLW91dHB1dC1wb3J0IGxvZy1wb3J0KQogICAgICAgICAgICAgICAg IChjb250KSkpKSkpKSkKIAotLSAKMi41LjAKCg== --001a113e57d2cd8679051f047508--