Skip to content

Progressmeter for output to file #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MarcMush wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Progressmeter for output to file #223

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
578f336
keepall for Progress
MarcMush Nov 9, 2021
3acc1ba
merge master
MarcMush Nov 9, 2021
d529787
add notover in printover
MarcMush Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions src/ProgressMeter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ end
# update progress display
function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, valuecolor = :blue,
offset::Integer = p.offset, keep = (offset == 0), desc::Union{Nothing,AbstractString} = nothing,
ignore_predictor = false)
ignore_predictor = false, keepall=false)
!p.enabled && return
if p.counter == 2 # ignore the first loop given usually uncharacteristically slow
p.tsecond = time()
Expand All @@ -278,11 +278,13 @@ function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, v
sec_per_iter = elapsed_time / (p.counter - p.start)
msg = @sprintf "%s (%s)" msg speedstring(sec_per_iter)
end
!CLEAR_IJULIA[] && print(p.output, "\n" ^ (p.offset + p.numprintedvalues))
move_cursor_up_while_clearing_lines(p.output, p.numprintedvalues)
printover(p.output, msg, p.color)
printvalues!(p, showvalues; color = valuecolor, truncate = truncate_lines)
if keep
if !keepall
!CLEAR_IJULIA[] && print(p.output, "\n" ^ (p.offset + p.numprintedvalues))
move_cursor_up_while_clearing_lines(p.output, p.numprintedvalues)
end
printover(p.output, msg, p.color; notover=keepall)
printvalues!(p, showvalues; color = valuecolor, truncate = truncate_lines, notover=keepall)
if keep || keepall
println(p.output)
else
print(p.output, "\r\u1b[A" ^ (p.offset + p.numprintedvalues))
Expand Down Expand Up @@ -313,11 +315,18 @@ function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, v
sec_per_iter = elapsed_time / (p.counter - p.start)
msg = @sprintf "%s (%s)" msg speedstring(sec_per_iter)
end
!CLEAR_IJULIA[] && print(p.output, "\n" ^ (p.offset + p.numprintedvalues))
move_cursor_up_while_clearing_lines(p.output, p.numprintedvalues)
printover(p.output, msg, p.color)
printvalues!(p, showvalues; color = valuecolor, truncate = truncate_lines)
!CLEAR_IJULIA[] && print(p.output, "\r\u1b[A" ^ (p.offset + p.numprintedvalues))

if !keepall
!CLEAR_IJULIA[] && print(p.output, "\n" ^ (p.offset + p.numprintedvalues))
move_cursor_up_while_clearing_lines(p.output, p.numprintedvalues)
end
printover(p.output, msg, p.color; notover=keepall)
printvalues!(p, showvalues; color = valuecolor, truncate = truncate_lines, notover=keepall)
if keepall
println(p.output)
else
print(p.output, "\r\u1b[A" ^ (p.offset + p.numprintedvalues))
end
flush(p.output)
# Compensate for any overhead of printing. This can be
# especially important if you're running over a slow network
Expand Down Expand Up @@ -582,7 +591,7 @@ function finish!(p::ProgressUnknown; options...)
end

# Internal method to print additional values below progress bar
function printvalues!(p::AbstractProgress, showvalues; color = :normal, truncate = false)
function printvalues!(p::AbstractProgress, showvalues; color = :normal, truncate = false, notover = false)
length(showvalues) == 0 && return
maxwidth = maximum(Int[length(string(name)) for (name, _) in showvalues])

Expand All @@ -596,10 +605,10 @@ function printvalues!(p::AbstractProgress, showvalues; color = :normal, truncate
msg_lines = ceil(Int, (length(msg)-1) / max_len)
if truncate && msg_lines >= 2
# For multibyte characters, need to index with nextind.
printover(p.output, msg[1:nextind(msg, 1, max_len-1)] * "…", color)
printover(p.output, msg[1:nextind(msg, 1, max_len-1)] * "…", color; notover=notover)
p.numprintedvalues += 1
else
printover(p.output, msg, color)
printover(p.output, msg, color; notover=notover)
p.numprintedvalues += msg_lines
end
end
Expand All @@ -622,12 +631,12 @@ function move_cursor_up_while_clearing_lines(io, numlinesup)
end
end

function printover(io::IO, s::AbstractString, color::Symbol = :color_normal)
print(io, "\r")
function printover(io::IO, s::AbstractString, color::Symbol = :normal; notover = false)
!notover && print(io, "\r")
printstyled(io, s; color=color)
if isdefined(Main, :IJulia)
Main.IJulia.stdio_bytes[] = 0 # issue #76: circumvent IJulia I/O throttling
elseif isdefined(Main, :ESS) || isdefined(Main, :Atom)
elseif isdefined(Main, :ESS) || isdefined(Main, :Atom) || notover
else
print(io, "\u1b[K") # clear the rest of the line
end
Expand Down