<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/effd43526fa6f20cf1242610cb480819630e2d78">https://github.com/macports/macports-base/commit/effd43526fa6f20cf1242610cb480819630e2d78</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit effd43526fa6f20cf1242610cb480819630e2d78
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Mar 19 02:43:03 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> registry2.0: Improve extract progress bar
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> … by ignoring directories and metadata files. This puts the total
</span><span style='display:block; white-space:pre;color:#404040;'> progress at the end of the extract phase exactly at 33.3 % where it
</span><span style='display:block; white-space:pre;color:#404040;'> should be.
</span>---
src/registry2.0/portimage.tcl | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 176beb144..95478fb2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -537,7 +537,16 @@ proc _extract_progress {event} {
</span> _progress start
}
stdin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we don't really care about the line, just that it exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set line [string trimright [dict get $event line]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We only want to count files, not directories. Additionally,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # filter MacPorts metadata files that start with "+".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # directories bsdtar output for metadata gnutar output for metadata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string index $line end] == "/" || [string range $line 0 4] eq "x ./+" || [string range $line 0 2] eq "./+"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> incr progress_step
_progress update $progress_step $progress_total_steps
}
</pre><pre style='margin:0'>
</pre>