jdb/gtd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

done supports a list of actions, bugfix.

Browse Source 
* `done` command now accepts an unlimited list of tasks to mark as done.
* `GTDCLI.stringToFilename` now removes forward slashes.
This commit is contained in:
Jonathan Bernard 2013-10-30 11:31:28 -05:00
parent 415c0e622f
commit b4e01b6098
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project.properties
View File

@ -1,8 +1,8 @@
#Mon, 21 Oct 2013 14:08:15 +0000 #Wed, 30 Oct 2013 10:46:52 -0500
lib.local=true lib.local=true
name=jdb-gtd name=jdb-gtd
version=1.5 version=1.6
nailgun.classpath.dir=/home/jdbernard/programs/nailgun/classpath nailgun.classpath.dir=/home/jdbernard/programs/nailgun/classpath
executable.jar=true executable.jar=true
main.class=com.jdblabs.gtd.cli.GTDCLI main.class=com.jdblabs.gtd.cli.GTDCLI
build.number=1 build.number=0

78
src/main/com/jdblabs/gtd/cli/GTDCLI.groovy
View File

@ -23,7 +23,7 @@ import static com.jdblabs.gtd.Util.*
* @org gtd.jdb-labs.com/cli/GTDCLI */ * @org gtd.jdb-labs.com/cli/GTDCLI */
public class GTDCLI { public class GTDCLI {
public static final String VERSION = "1.5" public static final String VERSION = "1.6"
private static String EOL = System.getProperty("line.separator") private static String EOL = System.getProperty("line.separator")
/// We have a persistent instance when we are in the context of a Nailgun /// We have a persistent instance when we are in the context of a Nailgun
@ -318,51 +318,59 @@ public class GTDCLI {
protected void done(LinkedList args) { protected void done(LinkedList args) {
def selectedFilePath = args.poll() def selectedFilePath = args.poll()
def selectedFile = new File(selectedFilePath)
if (!selectedFile) { if (!selectedFilePath) {
println "gtd done command requires a <action-file> parameter." println "gtd done command requires a <action-file> parameter."
return } return }
def item while (selectedFilePath) {
if (selectedFile.isAbsolute()) item = new Item(selectedFile) def item
else item = new Item(new File(workingDir, selectedFilePath)) def selectedFile = new File(selectedFilePath)
/// Move to the done folder. if (!selectedFile.exists() || !selectedFile.isFile()) {
def oldFile = item.file println "File does not exist or is a directory:"
def date = new DateMidnight().toString("YYYY-MM-dd") println "\t" + selectedFile.canonicalPath
item.file = new File(gtdDirs.done, "$date-${item.file.name}") continue }
item.save()
/// Check if this item was in a project folder. if (selectedFile.isAbsolute()) item = new Item(selectedFile)
if (inPath(gtdDirs.projects, oldFile)) { else item = new Item(new File(workingDir, selectedFilePath))
/// Delete any copies of this item from the next actions folder. /// Move to the done folder.
findAllCopies(oldFile, gtdDirs."next-actions").each { file -> def oldFile = item.file
println "Deleting duplicate entry from the " + def date = new DateMidnight().toString("YYYY-MM-dd")
"${file.parentFile.name} context." item.file = new File(gtdDirs.done, "$date-${item.file.name}")
file.delete() } item.save()
/// Delete any copies of this item from the waiting folder. /// Check if this item was in a project folder.
findAllCopies(oldFile, gtdDirs.waiting).each { file -> if (inPath(gtdDirs.projects, oldFile)) {
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. /// Delete any copies of this item from the next actions folder.
if (inPath(gtdDirs["next-actions"], oldFile) || findAllCopies(oldFile, gtdDirs."next-actions").each { file ->
inPath(gtdDirs.waiting, oldFile)) { println "Deleting duplicate entry from the " +
"${file.parentFile.name} context."
file.delete() }
/// Delete any copies of this item from the projects folder. /// Delete any copies of this item from the waiting folder.
findAllCopies(oldFile, gtdDirs.projects).each { file -> findAllCopies(oldFile, gtdDirs.waiting).each { file ->
println "Deleting duplicate entry from the " + println "Deleting duplicate entry from the " +
"${file.parentFile.name} project." "${file.parentFile.name} waiting context."
file.delete() }} file.delete() }}
/// Delete the original /// Check if this item was in the next-action or waiting folder.
oldFile.delete() if (inPath(gtdDirs["next-actions"], oldFile) ||
inPath(gtdDirs.waiting, oldFile)) {
println "'$item' marked as done." } /// Delete any copies of this item from the projects folder.
findAllCopies(oldFile, gtdDirs.projects).each { file ->
println "Deleting duplicate entry from the " +
"${file.parentFile.name} project."
file.delete() }}
/// Delete the original
oldFile.delete()
selectedFilePath = args.poll()
println "'$item' marked as done." } }
/** #### `calendar` /** #### `calendar`
* Implement the `calendar` command to show all the items which are * Implement the `calendar` command to show all the items which are
@ -749,7 +757,7 @@ context or project is named, all contexts are listed."""
* palatable for a filename. */ * palatable for a filename. */
public static String stringToFilename(String s) { public static String stringToFilename(String s) {
return s.replaceAll(/\s/, '-'). return s.replaceAll(/\s/, '-').
replaceAll(/[';:(\.$)]/, ''). replaceAll(/[';:(\.$\/)]/, '').
toLowerCase() } toLowerCase() }
} }