From 72ffeaef2043d1f830ec493b48d3844d71eaf3d0 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 8 Jun 2016 07:30:47 -0400 Subject: [PATCH] CmdMove: Impplemented 'move' command --- src/commands/CMakeLists.txt | 1 + src/commands/CmdMove.cpp | 94 +++++++++++++++++++++++++++++++++++++ src/commands/commands.h | 1 + src/init.cpp | 2 + 4 files changed, 98 insertions(+) create mode 100644 src/commands/CmdMove.cpp diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index 40d5d993..edba6d23 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -18,6 +18,7 @@ set (commands_SRCS CmdCancel.cpp CmdHelp.cpp CmdImport.cpp CmdLengthen.cpp + CmdMove.cpp CmdReport.cpp CmdStart.cpp CmdStop.cpp diff --git a/src/commands/CmdMove.cpp b/src/commands/CmdMove.cpp new file mode 100644 index 00000000..8bd2c41d --- /dev/null +++ b/src/commands/CmdMove.cpp @@ -0,0 +1,94 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Copyright 2015 - 2016, 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 +#include +#include +#include +#include + +//////////////////////////////////////////////////////////////////////////////// +int CmdMove ( + const CLI& cli, + Rules& rules, + Database& database) +{ + // Gather IDs and TAGs. + std::vector ids; + std::string new_start; + for (auto& arg : cli._args) + { + if (arg.hasTag ("ID")) + ids.push_back (strtol (arg.attribute ("value").c_str (), NULL, 10)); + + if (arg.hasTag ("FILTER") && + arg._lextype == Lexer::Type::date) + new_start = arg.attribute ("raw"); + } + + // TODO Support :adjust + + // Load the data. + // Note: There is no filter. + Interval filter; + auto tracked = getTracked (database, rules, filter); + + // Move start times. + for (auto& id : ids) + { + if (id <= static_cast (tracked.size ())) + { + // Note: It's okay to subtract a one-based number from a zero-based index. + Interval i = tracked[tracked.size () - id]; + Datetime start (new_start); + + // Changing the start date should also change the end date by the same + // amount. + if (i.range.start < start) + { + auto delta = start - i.range.start; + i.range.start = start; + i.range.end += delta; + } + else + { + auto delta = i.range.start - start; + i.range.start = start; + i.range.end -= delta; + } + + database.modifyInterval (tracked[tracked.size () - id], i); + + // Feedback. + std::cout << "Moved @" << id << " to " << i.range.start.toISOLocalExtended () << '\n'; + } + } + + return 0; +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/commands.h b/src/commands/commands.h index a4077d11..b0a07321 100644 --- a/src/commands/commands.h +++ b/src/commands/commands.h @@ -45,6 +45,7 @@ int CmdHelpUsage ( ); int CmdHelp (const CLI& ); int CmdImport ( ); int CmdLengthen (const CLI&, Rules&, Database& ); +int CmdMove (const CLI&, Rules&, Database& ); int CmdReport (const CLI&, Rules&, Database&, const Extensions&); int CmdShorten (const CLI&, Rules&, Database& ); int CmdShow ( Rules& ); diff --git a/src/init.cpp b/src/init.cpp index 1024df61..a2062b22 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -68,6 +68,7 @@ void initializeEntities (CLI& cli) cli.entity ("command", "help"); cli.entity ("command", "import"); cli.entity ("command", "lengthen"); + cli.entity ("command", "move"); cli.entity ("command", "report"); cli.entity ("command", "shorten"); cli.entity ("command", "show"); @@ -264,6 +265,7 @@ int dispatchCommand ( else if (command == "import") status = CmdImport ( ); else if (command == "lengthen") status = CmdLengthen (cli, rules, database ); else if (command == "month") status = CmdChartMonth (cli, rules, database ); + else if (command == "move") status = CmdMove (cli, rules, database ); else if (command == "report") status = CmdReport (cli, rules, database, extensions); else if (command == "shorten") status = CmdShorten (cli, rules, database ); else if (command == "show") status = CmdShow ( rules );