<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121224] branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121224">121224</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2014-06-20 16:14:05 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Changed the reclaim namespace appearance.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14cleanupsrcmacports10reclaimtcl">branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14cleanupsrcmacports10reclaimtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl (121223 => 121224)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-06-20 23:14:04 UTC (rev 121223)
+++ branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-06-20 23:14:05 UTC (rev 121224)
</span><span class="lines">@@ -17,193 +17,191 @@
</span><span class="cx"> package require macports
</span><span class="cx">
</span><span class="cx"> namespace eval reclaim {
</span><del>-}
</del><span class="cx">
</span><del>-proc reclaim::main {args} {
</del><ins>+ proc main {args} {
</ins><span class="cx">
</span><del>- # The main function. Calls each individual function that needs to be run.
- # Args:
- # None
- # Returns:
- # None
</del><ins>+ # The main function. Calls each individual function that needs to be run.
+ # Args:
+ # None
+ # Returns:
+ # None
</ins><span class="cx">
</span><del>- uninstall_inactive
- remove_distfiles
-}
</del><ins>+ uninstall_inactive
+ remove_distfiles
+ }
</ins><span class="cx">
</span><del>-proc reclaim::walk_files {dir delete dist_paths} {
</del><ins>+ proc walk_files {dir delete dist_paths} {
</ins><span class="cx">
</span><del>- # Recursively walk through each directory that isn't an installed port and if delete each file that isn't a directory if requested.
- # Args:
- # dir - A string path of the given directory to walk through
- # delete - Whether to delete each file found that isn't a directory or not. Set to 'yes' or 'no'.
- # dist_paths - A list of the full paths for all distfiles from installed ports
- # Returns:
- # 'no' if no distfiles were found, and 'yes' if distfiles were found.
</del><ins>+ # Recursively walk through each directory that isn't an installed port and if delete each file that isn't a directory if requested.
+ # Args:
+ # dir - A string path of the given directory to walk through
+ # delete - Whether to delete each file found that isn't a directory or not. Set to 'yes' or 'no'.
+ # dist_paths - A list of the full paths for all distfiles from installed ports
+ # Returns:
+ # 'no' if no distfiles were found, and 'yes' if distfiles were found.
</ins><span class="cx">
</span><del>- set found_distfile no
</del><ins>+ set found_distfile no
</ins><span class="cx">
</span><span class="cx">
</span><del>- foreach item [readdir $dir] {
</del><ins>+ foreach item [readdir $dir] {
</ins><span class="cx">
</span><del>- set currentPath [file join $dir $item]
</del><ins>+ set currentPath [file join $dir $item]
</ins><span class="cx">
</span><del>- if {[file isdirectory $currentPath]} {
- walk_files $currentPath $delete $dist_paths
</del><ins>+ if {[file isdirectory $currentPath]} {
+ walk_files $currentPath $delete $dist_paths
</ins><span class="cx">
</span><del>- } else {
-
- if {[lsearch $dist_paths $currentPath] == -1} {
- set found_distfile yes
</del><ins>+ } else {
+
+ if {[lsearch $dist_paths $currentPath] == -1} {
+ set found_distfile yes
</ins><span class="cx">
</span><del>- # Only care about files that exist in /distfiles that are not a distfile from an installed file.
- ui_msg "Found distfile: $item"
</del><ins>+ # Only care about files that exist in /distfiles that are not a distfile from an installed file.
+ ui_msg "Found distfile: $item"
</ins><span class="cx">
</span><del>- if {$delete eq "yes"} {
- ui_msg "Removing distfile: $item"
</del><ins>+ if {$delete eq "yes"} {
+ ui_msg "Removing distfile: $item"
</ins><span class="cx">
</span><del>- # Because we're only deleting files (not directories) that we know exist, if there was an error, it's because of lack of root privledges.
- if {[catch {file delete $currentPath} result]} {
- file delete $currentPath
</del><ins>+ # Because we're only deleting files (not directories) that we know exist, if there was an error, it's because of lack of root privledges.
+ if {[catch {file delete $currentPath} result]} {
+ file delete $currentPath
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ return $found_distfile
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return $found_distfile
-}
</del><ins>+ proc remove_distfiles {} {
</ins><span class="cx">
</span><del>-proc reclaim::remove_distfiles {} {
</del><ins>+ # Check for distfiles in both the root, and home directories. If found, delete them.
+ # Args:
+ # None
+ # Returns:
+ # 0 on successful execution
</ins><span class="cx">
</span><del>- # Check for distfiles in both the root, and home directories. If found, delete them.
- # Args:
- # None
- # Returns:
- # 0 on successful execution
</del><ins>+ global macports::portdbpath
+ global macports::user_home
</ins><span class="cx">
</span><del>- global macports::portdbpath
- global macports::user_home
</del><ins>+ # The root and home distfile folder locations, respectively.
+ set root_dist [file join ${macports::portdbpath} distfiles]
+ set home_dist ${macports::user_home}/.macports$root_dist
</ins><span class="cx">
</span><del>- # The root and home distfile folder locations, respectively.
- set root_dist [file join ${macports::portdbpath} distfiles]
- set home_dist ${macports::user_home}/.macports$root_dist
</del><ins>+ set port_info [get_info]
+ set dist_path [list]
</ins><span class="cx">
</span><del>- set port_info [get_info]
- set dist_path [list]
</del><ins>+ foreach port $port_info {
</ins><span class="cx">
</span><del>- foreach port $port_info {
</del><ins>+ # Get mport reference
+ set mport [mportopen_installed [lindex $port 0] [lindex $port 1] [lindex $port 2] [lindex $port 3] {}]
</ins><span class="cx">
</span><del>- # Get mport reference
- set mport [mportopen_installed [lindex $port 0] [lindex $port 1] [lindex $port 2] [lindex $port 3] {}]
</del><ins>+ # Setup sub-Tcl-interpreter that executed the installed port
+ set workername [ditem_key $mport workername]
</ins><span class="cx">
</span><del>- # Setup sub-Tcl-interpreter that executed the installed port
- set workername [ditem_key $mport workername]
</del><ins>+ # Append that port's distfiles to the list
+ set subdir [$workername eval return \$dist_subdir]
+ set name [$workername eval return \$distfiles]
</ins><span class="cx">
</span><del>- # Append that port's distfiles to the list
- set subdir [$workername eval return \$dist_subdir]
- set name [$workername eval return \$distfiles]
</del><ins>+ set root_path [file join $root_dist $subdir $name]
+ set home_path [file join $home_dist $subdir $name]
</ins><span class="cx">
</span><del>- set root_path [file join $root_dist $subdir $name]
- set home_path [file join $home_dist $subdir $name]
</del><ins>+ # Add the full file path to the list, depending where it's located.
+ if {[file isfile $root_path]} {
+ lappend dist_path $root_path
</ins><span class="cx">
</span><del>- # Add the full file path to the list, depending where it's located.
- if {[file isfile $root_path]} {
- lappend dist_path $root_path
-
- } else {
- if {[file isfile $home_path]} {
- lappend dist_path $home_path
</del><ins>+ } else {
+ if {[file isfile $home_path]} {
+ lappend dist_path $home_path
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- # Walk through each directory, and delete any files found. Alert the user if no files were found.
- if {[walk_files $root_dist yes $dist_path] eq "no"} {
- ui_msg "No distfiles found in root directory."
- }
</del><ins>+ # Walk through each directory, and delete any files found. Alert the user if no files were found.
+ if {[walk_files $root_dist yes $dist_path] eq "no"} {
+ ui_msg "No distfiles found in root directory."
+ }
</ins><span class="cx">
</span><del>- #if {[walk_files $home_dist yes $dist_path] eq "no"} {
- # ui_msg "No distfiles found in home directory."
- #}
</del><ins>+ #if {[walk_files $home_dist yes $dist_path] eq "no"} {
+ # ui_msg "No distfiles found in home directory."
+ #}
</ins><span class="cx">
</span><del>- return 0
-}
</del><ins>+ return 0
+ }
</ins><span class="cx">
</span><del>-proc reclaim::is_inactive {app} {
</del><ins>+ proc is_inactive {app} {
</ins><span class="cx">
</span><del>- # Determine's whether an application is inactive or not.
- # Args:
- # app - An array where the fourth item in it is the activity of the application.
- # Returns:
- # 1 if inactive, 0 if active.
</del><ins>+ # Determine's whether an application is inactive or not.
+ # Args:
+ # app - An array where the fourth item in it is the activity of the application.
+ # Returns:
+ # 1 if inactive, 0 if active.
</ins><span class="cx">
</span><del>- if {[lindex $app 4] == 0} {
- return 1
</del><ins>+ if {[lindex $app 4] == 0} {
+ return 1
+ }
+ return 0
</ins><span class="cx"> }
</span><del>- return 0
-}
</del><span class="cx">
</span><del>-proc reclaim::get_info {} {
</del><ins>+ proc get_info {} {
</ins><span class="cx">
</span><del>- # Get's the information of all installed appliations (those returned by registry::installed), and returns it in a
- # multidimensional list.
- #
- # Args:
- # None
- #Returns:
- # A multidimensional list where each app is a sublist, i.e., [{First Application Info} {Second Application Info} {...}]
- # Indexes of each sublist are: 0 = name, 1 = version, 2 = revision, 3 = variants, 4 = activity, and 5 = epoch.
-
- return [registry::installed]
-}
</del><ins>+ # Get's the information of all installed appliations (those returned by registry::installed), and returns it in a
+ # multidimensional list.
+ #
+ # Args:
+ # None
+ #Returns:
+ # A multidimensional list where each app is a sublist, i.e., [{First Application Info} {Second Application Info} {...}]
+ # Indexes of each sublist are: 0 = name, 1 = version, 2 = revision, 3 = variants, 4 = activity, and 5 = epoch.
+
+ return [registry::installed]
+ }
</ins><span class="cx">
</span><del>-proc reclaim::uninstall_inactive {} {
</del><ins>+ proc uninstall_inactive {} {
</ins><span class="cx">
</span><del>- # Attempts to uninstall all inactive applications. (Performance is now O(N)!)
- #
- # Args:
- # None
- # Returns:
- # 0 if execution was successful. Errors (for now) if execution wasn't.
</del><ins>+ # Attempts to uninstall all inactive applications. (Performance is now O(N)!)
+ #
+ # Args:
+ # None
+ # Returns:
+ # 0 if execution was successful. Errors (for now) if execution wasn't.
</ins><span class="cx">
</span><del>- set apps [get_info]
- set inactive_apps [list]
- set inactive_names [list]
- set inactive_count 0
</del><ins>+ set apps [get_info]
+ set inactive_apps [list]
+ set inactive_names [list]
+ set inactive_count 0
</ins><span class="cx">
</span><del>- foreach app $apps {
</del><ins>+ foreach app $apps {
</ins><span class="cx">
</span><del>- if { [is_inactive $app] } {
- lappend inactive_apps $app
- lappend inactive_names [lindex $app 0]
- incr inactive_count
</del><ins>+ if { [is_inactive $app] } {
+ lappend inactive_apps $app
+ lappend inactive_names [lindex $app 0]
+ incr inactive_count
+ }
</ins><span class="cx"> }
</span><del>- }
- if { $inactive_count == 0 } {
- ui_msg "Found no inactive ports."
</del><ins>+ if { $inactive_count == 0 } {
+ ui_msg "Found no inactive ports."
</ins><span class="cx">
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx">
</span><del>- ui_msg "Found inactive ports: $inactive_names."
- ui_msg "Would you like to uninstall these apps? \[Y/N\]: "
- set input [gets stdin]
</del><ins>+ ui_msg "Found inactive ports: $inactive_names."
+ ui_msg "Would you like to uninstall these apps? \[Y/N\]: "
+ set input [gets stdin]
</ins><span class="cx">
</span><del>- if {$input eq "Y" || $input eq "y" } {
</del><ins>+ if {$input eq "Y" || $input eq "y" } {
</ins><span class="cx">
</span><del>- foreach app $inactive_apps {
- set name [lindex $app 0]
- ui_msg "Uninstalling: $name"
- incr inactive_count
</del><ins>+ foreach app $inactive_apps {
+ set name [lindex $app 0]
+ ui_msg "Uninstalling: $name"
+ incr inactive_count
</ins><span class="cx">
</span><del>- # Note: 'uninstall' takes a name, version, and an options list.
- registry_uninstall::uninstall [lindex $app 0] [lindex $app 1] [lindex $app 2] [lindex $app 3] {}
</del><ins>+ # Note: 'uninstall' takes a name, version, and an options list.
+ registry_uninstall::uninstall [lindex $app 0] [lindex $app 1] [lindex $app 2] [lindex $app 3] {}
+ }
+ } else {
+ ui_msg "Not uninstalling applications."
</ins><span class="cx"> }
</span><del>- } else {
- ui_msg "Not uninstalling applications."
</del><span class="cx"> }
</span><ins>+ return 0
</ins><span class="cx"> }
</span><del>- return 0
</del><span class="cx"> }
</span><del>-
-
</del></span></pre>
</div>
</div>
</body>
</html>