From b40cc8923535f29b832a13ca62730b6f21cffafc Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 31 Mar 2017 08:38:35 -0400 Subject: [PATCH] Recurrence: Added stub for handleRecurrence2 --- src/CMakeLists.txt | 1 + src/main.h | 3 +++ src/recur.cpp | 5 +++++ src/recur2.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 src/recur2.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 382a19502..b478fd9d4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,6 +24,7 @@ add_library (task CLI2.cpp CLI2.h legacy.cpp nag.cpp recur.cpp + recur2.cpp rules.cpp sort.cpp util.cpp util.h) diff --git a/src/main.h b/src/main.h index 650aef1b8..8625fcf6f 100644 --- a/src/main.h +++ b/src/main.h @@ -42,6 +42,9 @@ Datetime getNextRecurrence (Datetime&, std::string&); bool generateDueDates (Task&, std::vector &); void updateRecurrenceMask (Task&); +// recur2.cpp +void handleRecurrence2 (); + // nag.cpp bool nag (Task&); diff --git a/src/recur.cpp b/src/recur.cpp index 427d51a48..c0bb621a6 100644 --- a/src/recur.cpp +++ b/src/recur.cpp @@ -54,6 +54,11 @@ extern Context context; // child tasks need to be generated to fill gaps. void handleRecurrence () { + // TODO This is inserted here to create parallel recurrence implememntations + // during feature development. This eliminates the need to inject this + // call into 11 command implementations. + handleRecurrence2 (); + // Recurrence can be disabled. // Note: This is currently a workaround for TD-44, TW-1520. if (! context.config.getBoolean ("recurrence")) diff --git a/src/recur2.cpp b/src/recur2.cpp new file mode 100644 index 000000000..2282dc519 --- /dev/null +++ b/src/recur2.cpp @@ -0,0 +1,50 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// http://www.opensource.org/licenses/mit-license.php +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include + +extern Context context; + +//////////////////////////////////////////////////////////////////////////////// +// Scans all tasks, and for any recurring tasks, determines whether any new +// child tasks need to be generated to fill gaps. +void handleRecurrence2 () +{ + // Recurrence can be disabled. + // Note: This is currently a workaround for TD-44, TW-1520. + if (context.config.getBoolean ("recurrence")) + { + context.debug ("handleRecurrence2 start"); + + + + + context.debug ("handleRecurrence2 end"); + } +} + +////////////////////////////////////////////////////////////////////////////////