Ticket #103: devtodo-path-recursive.patch

doc/todorc.example

@@ -21 +21 @@
 # Be generally paranoid about file ownerships and permissions
 #paranoid
 
+# Enable path recursivity
+path-recursive
+
 # The database to use if --global or -G is specified
 global-database $HOME/.todo_global
 

src/main.cc

@@ -2 +2 @@
 #include "support.h"
 #include "config.h"
 #include "todorl.h"
+#include "stdio.h"
+#include "unistd.h"
 
 void joinArgs(TodoDB &todo, vector<string> const &args, int argc, char const **argv) {
 char const *av[args.size() + argc];
@@ -40 +42 @@
                                 if (options.verbose > 1)
                                         cout << "todo: switched to global database '" << database << "'" << endl;
                         }
-                        if (options.verbose > 1)
-                                cout << "todo: attempting load of '" << database << "'" << endl;
-                        todo.load(database);
+            // Switch to recursive database
+            else if (options.pathrecursive) {
+                // Grab current location
+                char cur_path[FILENAME_MAX];
+                getcwd(cur_path, sizeof(cur_path));
+
+                string local_path = cur_path;
+
+                // Flag for match in todo file
+                int invalid_todo = 1;
+                while (invalid_todo) {
+                    database = local_path + "/" + options.database;
+                    // Check if .todo exists in the local folder
+                    FILE* fp = fopen(database.c_str(), "r");
+                    if (fp) {
+                        invalid_todo = 0;
+                    } else {
+                        if (options.verbose > 1)
+                            cout << "todo: no database found in path " << database << " , continuing" << endl;
+                        // file doesn't exist or is unreadable
+                        // remove the last folder and keep searching
+                        size_t match;
+                        match = local_path.rfind('/');
+
+                        if (local_path.length()) {
+                            local_path.erase(match);
+                        } else {
+                            // Abort the while cycle if we have no match
+                            // or reached the root the second time
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (options.verbose > 1)
+                cout << "todo: attempting load of '" << database << "'" << endl;
+            todo.load(database);
+
                 } catch (TodoDB::quit &e) {
                         // Quit is thrown if the .todo file can't be accessed
                         if (options.verbose > 1)

src/support.cc

@@ -19 +19 @@
 
 Options::Options() :
         verbose(0), purgeage(0), mono(false), paranoid(false), global(false),
-        summary(false), timeout(false), comment(false),
+        pathrecursive(false), summary(false), timeout(false), comment(false),
         database(".todo"),
         priority(Todo::None),
         mode(TodoDB::View),
@@ -224 +224 @@
         args.setHelp('D', "Mark the specified notes (and all children) as not done.");
         args.addArgument(GlobalDatabase, "global-database", CommandArgs::Required);
         args.setHelp(GlobalDatabase, "Specify the database to use if the -G (--global) parameter is used.");
+        args.addArgument('P', "path-recursive");
+        args.setHelp('P', "Navigate the recursively the parent folders searching for a todo database.");
         args.addArgument('G', "global");
         args.setHelp('G', "Use the database specified by the --global-database option. Defaults to ~/.todo_global.");
         args.addArgument(Database, "database", CommandArgs::Required);
@@ -352 +354 @@
                         case 's' :
                                 options.summary = !options.summary;
                         break;
+                        case 'P' :
+                                options.pathrecursive = true;
+                        break;
                         case 'G' :
                                 options.global = true;
                         break;
@@ -769 +774 @@
 static bool rcvalid(string const &str) {
         return str == "verbose" || str == "filter" || str == "priority" ||
                 str == "TODO" || str == "colour" || str == "mono" ||
-                str == "global-database" || str == "global" ||
+                str == "global-database" || str == "global" || str == "path-recursive" ||
                 str == "database" || str == "date-format" || 
                 str == "sort" || str == "display-format" || 
                 str == "generated-format" || str == "verbose-display-format" || 

src/support.h

@@ -16 +16 @@
         enum Dir { Negative = -1, Equal = 0, Positive = +1 };
 
         int verbose, purgeage;
-        bool mono, paranoid, global, summary, timeout, comment;
+        bool mono, paranoid, global, pathrecursive, summary, timeout, comment;
         string text, database, globaldatabase, filename,
                 dateformat;
         map<string, string> format;

src/todoterm.cc

@@ -2 +2 @@
 #include "todoterm.h"
 
 #ifdef USETERMCAP
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <stdexcept>