Minor Refactoring

- Added support for more type-specific checks of attribute values. - Added support for more type-specific attribute rendering. - Improved generalized methods for checking columns in a report. - Added unit tests. - Minor code cleanup. - Added secret hidden feature for internal testing.
2025-07-07 20:06:36 +02:00 · 2012-02-05 20:56:46 -05:00 · 2012-02-05 20:56:46 -05:00 · 96fe3f42ba
commit 96fe3f42ba
parent cffc42484e
83 changed files with 351 additions and 81 deletions
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdColor.cpp
+++ b/src/commands/CmdColor.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdColumns.cpp
+++ b/src/commands/CmdColumns.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <algorithm>
--- a/src/commands/CmdCommands.cpp
+++ b/src/commands/CmdCommands.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdCount.cpp
+++ b/src/commands/CmdCount.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <Context.h>
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <iomanip>
--- a/src/commands/CmdExec.cpp
+++ b/src/commands/CmdExec.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <stdlib.h>
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <Context.h>
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <algorithm>
--- a/src/commands/CmdHistory.cpp
+++ b/src/commands/CmdHistory.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdImport.cpp
+++ b/src/commands/CmdImport.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <iostream>
--- a/src/commands/CmdInfo.cpp
+++ b/src/commands/CmdInfo.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
@ -308,6 +307,23 @@ int CmdInfo::execute (std::string& output)
    view.set (row, 0, STRING_COLUMN_LABEL_URGENCY);
    view.set (row, 1, trimLeft (format (task->urgency (), 4, 4)));

+    // Show any UDAs
+    std::vector <std::string> all = task->all ();
+    std::vector <std::string>::iterator att;
+    for (att = all.begin (); att != all.end (); ++att)
+    {
+      if (context.config.get ("uda." + *att + ".type") != "")
+      {
+        Column* col = context.columns[*att];
+        if (col)
+        {
+          row = view.addRow ();
+          view.set (row, 0, col->label ());
+          view.set (row, 1, task->get (*att));
+        }
+      }
+    }
+
    // Create a second table, containing undo log change details.
    ViewText journal;

--- a/src/commands/CmdInstall.cpp
+++ b/src/commands/CmdInstall.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <CmdInstall.h>
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <Context.h>
--- a/src/commands/CmdLogo.cpp
+++ b/src/commands/CmdLogo.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <CmdLogo.h>
--- a/src/commands/CmdMerge.cpp
+++ b/src/commands/CmdMerge.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <fstream>
--- a/src/commands/CmdProjects.cpp
+++ b/src/commands/CmdProjects.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdPull.cpp
+++ b/src/commands/CmdPull.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <fstream>
--- a/src/commands/CmdPush.cpp
+++ b/src/commands/CmdPush.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <fstream>
--- a/src/commands/CmdReports.cpp
+++ b/src/commands/CmdReports.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdShell.cpp
+++ b/src/commands/CmdShell.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <iostream>
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <vector>
@ -232,6 +231,7 @@ int CmdShow::execute (std::string& output)
          i->substr (0,  5) != "push."                 &&
          i->substr (0,  5) != "pull."                 &&
          i->substr (0,  6) != "merge."                &&
+          i->substr (0,  4) != "uda."                  &&
          i->substr (0, 21) != "urgency.user.project." &&
          i->substr (0, 17) != "urgency.user.tag.")
      {
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdTimesheet.cpp
+++ b/src/commands/CmdTimesheet.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <Context.h>
--- a/src/commands/CmdUrgency.cpp
+++ b/src/commands/CmdUrgency.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-
 #define L10N                                           // Localization complete.

 #include <sstream>
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@ -30,6 +30,8 @@
 #include <iostream>
 #include <vector>
 #include <stdlib.h>
+#include <Date.h>
+#include <Duration.h>
 #include <E9.h>
 #include <text.h>
 #include <util.h>
@ -487,15 +489,56 @@ void Command::modify_task (

            // If the date value is less than 5 years, it is a duration, not a
            // date, therefore add 'now'.
-            long l = strtol (result.c_str (), NULL, 10);
+            long l = (long) strtod (result.c_str (), NULL);
            if (labs (l) < 5 * 365 * 86400)
            {
+              Duration dur (result);
              Date now;
              now += l;
+              //now += dur;
              task.set (name, now.toEpochString ());
            }
            else
+            {
+              Date d (result, context.config.get ("dateformat"));
+              task.set (name, d.toEpochString ());
+            }
+          }
+
+          // Durations too.
+          else if (column->type () == "duration")
+          {
+            // All values must be eval'd first.
+            A3 value_tokens;
+            value_tokens.capture (value);
+            value_tokens = value_tokens.postfix (value_tokens.tokenize (value_tokens));
+
+            E9 e (value_tokens);
+            std::string result = e.evalExpression (task);
+            context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
+
+            Duration d (result);
+            task.set (name, result);
+          }
+
+          // Need handling for numeric types, used by UDAs.
+          else if (column->type () == "numeric")
+          {
+            A3 value_tokens;
+            value_tokens.capture (value);
+            value_tokens = value_tokens.postfix (value_tokens.tokenize (value_tokens));
+
+            E9 e (value_tokens);
+            std::string result = e.evalExpression (task);
+            context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
+
+            Nibbler n (result);
+            double d;
+            if (n.getNumber (d) &&
+                n.depleted ())
              task.set (name, result);
+            else
+              throw format (STRING_UDA_NUMERIC, result);
          }

          // By default, just add/remove it.