Changed formatting of the calendar command.

project.properties

@@ -1,7 +1,7 @@
-#Mon, 29 Apr 2013 11:30:52 -0500
+#Wed, 01 May 2013 09:43:41 -0500
 lib.local=true
 name=jdb-gtd
-version=0.3
+version=0.5
 nailgun.classpath.dir=/home/jdbernard/programs/nailgun/classpath
 
-build.number=6
+build.number=1

src/main/com/jdblabs/gtd/cli/GTDCLI.groovy

@@ -10,7 +10,7 @@ import org.joda.time.DateTime
 
 public class GTDCLI {
 
-    public static final String VERSION = "0.3"
+    public static final String VERSION = "0.5"
     private static String EOL = System.getProperty("line.separator")
     private static GTDCLI nailgunInst
 
@@ -95,9 +95,9 @@ public class GTDCLI {
                 case ~/done/: done(parsedArgs); break
                 case ~/cal|calendar/: calendar(parsedArgs); break
                 case ~/process/: process(parsedArgs); break
+                case ~/list-copies/: listCopies(parsedArgs); break
                 default: 
-                    parsedArgs.addFirst(command)
-                    process(parsedArgs)
+                    println "Unrecognized command: ${command}"
                     break } } }
 
     protected void process(LinkedList args) {
@@ -105,7 +105,7 @@ public class GTDCLI {
         def path = args.poll()
         if (path) {
             def givenDir = new File(path)
-            if (!(gtdDirs = findGtdRootDir(givenPath))) {
+            if (!(gtdDirs = findGtdRootDir(givenDir))) {
                 println "'$path' is not a valid directory."; return }}
 
         // Start processing items
@@ -267,29 +267,26 @@ public class GTDCLI {
         if (inPath(gtdDirs.projects, oldFile)) {
 
             // Delete any copies of this item in the next actions folder.
-            gtdDirs["next-actions"].eachFileRecurse({ file -> 
-                if (file.isFile() && md5.digest(file.bytes) == itemMd5) {
-                    println "Deleting duplicate entry from the " +
+            findAllCopies(oldFile, gtdDrs."next-actions").each { file ->
+                println "Deleting duplicate entry from the " +
                         "${file.parentFile.name} context."
-                    file.delete() }})
+                file.delete() }
 
             // Delete any copies of this item in the waiting folder.
-            gtdDirs.waiting.eachFileRecurse({ file -> 
-                if (file.isFile() && md5.digest(file.bytes) == itemMd5) {
-                    println "Deleting duplicate entry from the " +
-                        "${file.parentFile.name} waiting context."
-                    file.delete() }})}
+            findAllCopies(oldFile, gtdDirs.waiting).each { file ->
+                println "Deleting duplicate entry from the " +
+                    "${file.parentFile.name} waiting context."
+                file.delete() }}
 
         // Check if this item was in the next-action or waiting folder.
         if (inPath(gtdDirs["next-actions"], oldFile) ||
             inPath(gtdDirs.waiting, oldFile)) {
 
             // Delete any copies of this item in the projects folder.
-            gtdDirs.projects.eachFileRecurse({ file ->
-                if (file.isFile() && md5.digest(file.bytes) == itemMd5) {
-                    println "Deleting duplicate entry from the " +
-                        "${file.parentFile.name} project."
-                    file.delete() }})}
+            findAllCopies(oldFile, gtdDirs.projects).each { file ->
+                println "Deleting duplicate entry from the " +
+                    "${file.parentFile.name} project."
+                file.delete() }}
 
         // Delete the original
         oldFile.delete()
@@ -318,12 +315,35 @@ public class GTDCLI {
         itemsOnCalendar.each { item ->
             def itemDay = new DateMidnight(item.date)
             if (itemDay != currentDate) {
+                if (currentDate != null) println ""
                 println itemDay.toString("EEE, MM/dd")
                 println "----------"
                 currentDate = itemDay }
 
             println "  $item" } }
 
+    protected void listCopies(LinkedList args) {
+
+        args.each { filePath ->
+            def file = new File(filePath)
+
+            if (!file.isAbsolute()) file = new File(workingDir, filePath)
+
+            if (!file.isFile()) {
+                println "${file.canonicalPath} is not a regular file."
+                return }
+
+            String originalRelativePath = getRelativePath(gtdDirs.root, file)
+            println "Copies of $originalRelativePath:"
+            println ""
+
+            findAllCopies(file, gtdDirs.root).each { copy ->
+                if (copy.canonicalPath != file.canonicalPath) {
+                    String relativePath = getRelativePath(gtdDirs.root, copy)
+                    println "  $relativePath" }} }
+
+        args.clear() }
+
     protected void printUsage(LinkedList args) {
 
         if (!args) {
@@ -402,6 +422,16 @@ exact file contents (MD5 has of the file contents)."""
         }
     }
 
+    protected List<File> findAllCopies(File original, File inDir) {
+        def copies = []
+        def originalMD5 = md5.digest(original.bytes)
+
+        inDir.eachFileRecurse { file -> 
+            if (file.isFile() && md5.digest(file.bytes) == originalMD5)
+                copies << file }
+        
+        return copies }
+
     protected boolean inPath(File parent, File child) {
         def parentPath = parent.canonicalPath.split("/")
         def childPath = child.canonicalPath.split("/")
@@ -422,6 +452,18 @@ exact file contents (MD5 has of the file contents)."""
         // parent path.
         return true }
 
+    protected String getRelativePath(File parent, File child) {
+        def parentPath = parent.canonicalPath.split("/")
+        def childPath = child.canonicalPath.split("/")
+
+        if (parentPath.length > childPath.length) return ""
+
+        int b = 0
+        while (b < parentPath.length && parentPath[b] == childPath[b] ) b++;
+
+        if (b != parentPath.length) return ""
+        return (['.'] + childPath[b..<childPath.length]).join('/') }
+
     protected Map findGtdRootDir(File givenDir) {
 
         def gtdDirs = [:]