tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-21 21:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: --bar supports utf8.

Browse source
This commit is contained in:
Ole Tange 2022-11-13 00:18:20 +01:00
parent 466e184d5f
commit 5d6f3a4f98
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/parallel
View file

@ -2486,7 +2486,22 @@ sub parse_options(@) {
parse_semaphore(); parse_semaphore();
if(defined $opt::eta) { $opt::progress = $opt::eta; } if(defined $opt::eta) { $opt::progress = $opt::eta; }
if(defined $opt::bar) { $opt::progress = $opt::bar; } if(defined $opt::bar) {
my $fh = $Global::status_fd || *STDERR;
eval q{
# Enable utf8 if possible
use utf8;
binmode $fh, "encoding(utf8)";
*decode = \&Encode::decode_utf8;
};
if(eval { decode("x") }) {
# Great: decode works
} else {
# UTF8-decode not supported: Dummy decode
eval q{sub decode { $_[0]; }};
}
$opt::progress = $opt::bar;
}
# Funding a free software project is hard. GNU Parallel is no # Funding a free software project is hard. GNU Parallel is no
# exception. On top of that it seems the less visible a project # exception. On top of that it seems the less visible a project
@ -4398,9 +4413,7 @@ sub progress() {
my $arg = $Global::newest_job ? my $arg = $Global::newest_job ?
$Global::newest_job->{'commandline'}-> $Global::newest_job->{'commandline'}->
replace_placeholders(["\257<\257>"],0,0) : ""; replace_placeholders(["\257<\257>"],0,0) : "";
# These chars mess up display in the terminal in US-ASCII $arg = decode($arg);
# and in some combinations as UTF8 (e.g. ঐ ও ঔ ক 𐅪 𐅫 𐅬)
$arg =~ tr/[\011-\016\033\302-\365]//d;
my $eta_dhms = ::seconds_to_time_units($eta); my $eta_dhms = ::seconds_to_time_units($eta);
my $bar_text = my $bar_text =
sprintf("%d%% %d:%d=%s %s", sprintf("%d%% %d:%d=%s %s",