admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Improve output.

Browse Source
This commit is contained in:
Markus Reiter 2024-07-15 17:00:01 -04:00
parent 6434533ff5
commit 3b5b669b61
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/fetch.rb
View File

@ -264,24 +264,23 @@ module Homebrew
until remaining_downloads.empty? until remaining_downloads.empty?
begin begin
finished_downloads = {}
finished_states = [:fulfilled, :rejected] finished_states = [:fulfilled, :rejected]
remaining_downloads.each do |downloadable, promise|
break unless finished_states.include?(promise.state)
finished_downloads[downloadable] = remaining_downloads.delete(downloadable)
end finished_downloads, remaining_downloads = remaining_downloads.partition { |_,promise| finished_states.include?(promise.state) }
finished_downloads.each do |downloadable, promise| finished_downloads.each do |downloadable, promise|
previous_pending_line_count -= 1 previous_pending_line_count -= 1
print "\033[K"
output_message.call(downloadable, promise) output_message.call(downloadable, promise)
end end
previous_pending_line_count = 0 previous_pending_line_count = 0
remaining_downloads.each do |downloadable, promise| remaining_downloads.each do |downloadable, promise|
break if previous_pending_line_count >= (Tty.height - 1) break if previous_pending_line_count >= [concurrency, (Tty.height - 1)].min
print "\033[K"
previous_pending_line_count += output_message.call(downloadable, promise) previous_pending_line_count += output_message.call(downloadable, promise)
end end
@ -289,6 +288,8 @@ module Homebrew
$stdout.print "\033[#{previous_pending_line_count}A" $stdout.print "\033[#{previous_pending_line_count}A"
$stdout.flush $stdout.flush
end end
sleep 0.05
rescue Interrupt rescue Interrupt
print "\n" * previous_pending_line_count print "\n" * previous_pending_line_count
raise raise