[128277] trunk/base/src/macports1.0

[cal at macports.org]

Revision: 128277
          https://trac.macports.org/changeset/128277
Author:   cal at macports.org
Date:     2014-11-17 15:58:17 -0800 (Mon, 17 Nov 2014)
Log Message:
-----------
base: reclaim: add progress bar

Unify the when-to-display-the-progress-bar code with doctor.tcl.

Modified Paths:
--------------
    trunk/base/src/macports1.0/doctor.tcl
    trunk/base/src/macports1.0/reclaim.tcl

Modified: trunk/base/src/macports1.0/doctor.tcl
===================================================================
--- trunk/base/src/macports1.0/doctor.tcl	2014-11-17 23:31:21 UTC (rev 128276)
+++ trunk/base/src/macports1.0/doctor.tcl	2014-11-17 23:58:17 UTC (rev 128277)
@@ -350,8 +350,10 @@
             }
         }
 
-        set fancyOutput [expr {![macports::ui_isset ports_debug] && ![macports::ui_isset ports_verbose] && [info exists macports::ui_options(progress_generic)] \
-                                && ${doctor::quiet} == 0}]
+        set fancyOutput [expr {   ![macports::ui_isset ports_debug] \
+                               && ![macports::ui_isset ports_verbose] \
+                               && [info exists macports::ui_options(progress_generic)] \
+                               && ${doctor::quiet} == 0}]
 
         if {$fancyOutput} {
             set progress $macports::ui_options(progress_generic)

Modified: trunk/base/src/macports1.0/reclaim.tcl
===================================================================
--- trunk/base/src/macports1.0/reclaim.tcl	2014-11-17 23:31:21 UTC (rev 128276)
+++ trunk/base/src/macports1.0/reclaim.tcl	2014-11-17 23:58:17 UTC (rev 128277)
@@ -111,6 +111,22 @@
         set port_info    [get_info]
         set files_in_use [list]
 
+        set fancyOutput [expr {   ![macports::ui_isset ports_debug] \
+                               && ![macports::ui_isset ports_verbose] \
+                               && [info exists macports::ui_options(progress_generic)]}]
+        if {$fancyOutput} {
+            set progress $macports::ui_options(progress_generic)
+        } else {
+            # provide a no-op if there is no progress function
+            proc noop {args} {}
+            set progress noop
+        }
+
+        ui_msg "$macports::ui_prefix Building list of files still in use"
+        set port_count [llength $port_info]
+        set i 1
+        $progress start
+
         foreach port $port_info {
             set name     [lindex $port 0]
             set version  [lindex $port 1]
@@ -119,6 +135,7 @@
 
             # Get mport reference
             if {[catch {set mport [mportopen_installed $name $version $revision $variants {}]} error]} {
+                $progress intermission
                 ui_warn [msgcat::mc "Failed to open port %s from registry: %s" $name $error]
                 continue
             }
@@ -145,8 +162,15 @@
                     lappend files_in_use $home_path
                 }
             }
+
+            $progress update $i $port_count
+            incr i
         }
 
+        $progress finish
+
+        ui_msg "$macports::ui_prefix Searching for unused files"
+
         # sort so we can use binary search in walk_files
         set files_in_use [lsort -unique $files_in_use]
 
@@ -225,7 +249,7 @@
                 }
             }
         } else {
-            ui_msg "No unused distfiles found."
+            ui_msg "No unused files found."
         }
 
         return 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141117/ac2db3b3/attachment-0001.html>