<!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>[121226] 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/121226">121226</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2014-06-20 16:14:07 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added the ability to remove all empty directories.</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 (121225 => 121226)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-06-20 23:14:06 UTC (rev 121225)
+++ branches/gsoc14-cleanup/src/macports1.0/reclaim.tcl 2014-06-20 23:14:07 UTC (rev 121226)
</span><span class="lines">@@ -1,12 +1,14 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx">
</span><span class="cx"> # TODO:
</span><del>-# Add distfile version checking.
</del><span class="cx"> # Remove the useless/structure comments and add actual docstrings.
</span><span class="cx"> # Add test cases
</span><span class="cx"> # Add copyright notice
</span><ins>+# Check if inactive files are dependents for other files.
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Finished:
</span><ins>+# Add distfile version checking.
</ins><span class="cx"> # Pretty sure we should be using ui_msg, instead of puts and what not. Should probably add that.
</span><span class="cx"> # Register the "port cleanup" command with port.tcl and all that involves.
</span><span class="cx"> # Implement a hash-map, or multidimensional array for ease of app info keeping. Write it yourself if you have to.
</span><span class="lines">@@ -30,8 +32,18 @@
</span><span class="cx"> remove_distfiles
</span><span class="cx"> }
</span><span class="cx">
</span><del>- proc is_emtpy_dir {dir} {
</del><ins>+ proc is_empty_dir {dir} {
+
+ # Test if the given directory is empty.
+ # Args:
+ # dir - A string path of the given directory to test
+ # Returns:
+ # 0 if the directory is not empty, 1 if it is.
+
+ # Get _all_ files
</ins><span class="cx"> set filenames [glob -nocomplain -tails -directory $dir * .*]
</span><ins>+
+ # Yay complex statements! Use RE, lsearch, and llength to determine if the directory is empty.
</ins><span class="cx"> expr {![llength [lsearch -all -not -regexp $filenames {^\.\.?$}]]}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -47,28 +59,45 @@
</span><span class="cx">
</span><span class="cx"> set found_distfile no
</span><span class="cx">
</span><ins>+ # If the directory is empty, and this isn't the root folder, delete it and recursively go up directories until a non-empty one is found.
+ if { $dir ne "distfiles" && [readdir $dir] eq ""} {
</ins><span class="cx">
</span><ins>+ # Get the directory above the current one
+ set up_dir [file dirname $dir]
+
+ puts "Found empty directory: $dir. Attempting to delete."
+ file delete -force $dir
+
+ walk_files $up_dir $delete $dist_paths
+
+ # Recursion is fun, eh? Unwind the stack.
+ return
+ }
+
</ins><span class="cx"> foreach item [readdir $dir] {
</span><span class="cx">
</span><span class="cx"> set currentPath [file join $dir $item]
</span><span class="cx">
</span><span class="cx"> if {[file isdirectory $currentPath]} {
</span><ins>+
</ins><span class="cx"> walk_files $currentPath $delete $dist_paths
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx">
</span><ins>+ # If the current file isn't in the known-installed-distfiles
</ins><span class="cx"> if {[lsearch $dist_paths $currentPath] == -1} {
</span><span class="cx"> set found_distfile yes
</span><span class="cx">
</span><del>- # Only care about files that exist in /distfiles that are not a distfile from an installed file.
</del><span class="cx"> ui_msg "Found distfile: $item"
</span><span class="cx">
</span><span class="cx"> if {$delete eq "yes"} {
</span><span class="cx"> ui_msg "Removing distfile: $item"
</span><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>+ file delete $currentPath
+
+ # If the directory is now empty, recursively call on this directory, to delete it.
+ if {[is_empty_dir $dir]} {
+ walk_files $dir $delete $dist_paths
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -127,6 +156,7 @@
</span><span class="cx"> ui_msg "No distfiles found in root directory."
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # FIXME: Only commented because I accidentally delete all my dotfiles (including the home_dist location). It does in fact work on normal machines.
</ins><span class="cx"> #if {[walk_files $home_dist yes $dist_path] eq "no"} {
</span><span class="cx"> # ui_msg "No distfiles found in home directory."
</span><span class="cx"> #}
</span></span></pre>
</div>
</div>
</body>
</html>