mirror of
https://github.com/GothenburgBitFactory/timewarrior.git
synced 2025-07-07 20:06:39 +02:00
CmdUntag: Added 'untag' command
This commit is contained in:
parent
126f0da6af
commit
19aa8b7ac4
4 changed files with 85 additions and 1 deletions
|
@ -25,7 +25,8 @@ set (commands_SRCS CmdCancel.cpp
|
||||||
CmdTag.cpp
|
CmdTag.cpp
|
||||||
CmdTags.cpp
|
CmdTags.cpp
|
||||||
CmdTrack.cpp
|
CmdTrack.cpp
|
||||||
CmdUndo.cpp)
|
CmdUndo.cpp
|
||||||
|
CmdUntag.cpp)
|
||||||
|
|
||||||
add_library (commands STATIC ${commands_SRCS})
|
add_library (commands STATIC ${commands_SRCS})
|
||||||
|
|
||||||
|
|
80
src/commands/CmdUntag.cpp
Normal file
80
src/commands/CmdUntag.cpp
Normal file
|
@ -0,0 +1,80 @@
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// 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 <cmake.h>
|
||||||
|
#include <commands.h>
|
||||||
|
#include <timew.h>
|
||||||
|
#include <iostream>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
int CmdUntag (
|
||||||
|
const CLI& cli,
|
||||||
|
Rules& rules,
|
||||||
|
Database& database)
|
||||||
|
{
|
||||||
|
// Gather IDs and TAGs.
|
||||||
|
std::vector <int> ids;
|
||||||
|
std::vector <std::string> tags;
|
||||||
|
for (auto& arg : cli._args)
|
||||||
|
{
|
||||||
|
if (arg.hasTag ("ID"))
|
||||||
|
ids.push_back (strtol (arg.attribute ("value").c_str (), NULL, 10));
|
||||||
|
|
||||||
|
if (arg.hasTag ("TAG"))
|
||||||
|
tags.push_back (arg.attribute ("raw"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load the data.
|
||||||
|
// Note: There is no filter.
|
||||||
|
Interval filter;
|
||||||
|
auto tracked = getTracked (database, rules, filter);
|
||||||
|
|
||||||
|
// Apply tags to ids.
|
||||||
|
for (auto& id : ids)
|
||||||
|
{
|
||||||
|
if (id <= static_cast <int> (tracked.size ()))
|
||||||
|
{
|
||||||
|
// Note: It's okay to subtract a one-based number from a zero-based index.
|
||||||
|
Interval i = tracked[tracked.size () - id];
|
||||||
|
|
||||||
|
for (auto& tag : tags)
|
||||||
|
i.untag (tag);
|
||||||
|
|
||||||
|
database.modifyInterval (tracked[tracked.size () - id], i);
|
||||||
|
|
||||||
|
// Feedback.
|
||||||
|
std::cout << "Removed:";
|
||||||
|
for (auto& tag : tags)
|
||||||
|
std::cout << ' ' << quoteIfNeeded (tag);
|
||||||
|
std::cout << '\n';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
|
@ -52,6 +52,7 @@ int CmdTag (const CLI&, Rules&, Database& );
|
||||||
int CmdTags ( Rules&, Database& );
|
int CmdTags ( Rules&, Database& );
|
||||||
int CmdTrack (const CLI&, Rules&, Database& );
|
int CmdTrack (const CLI&, Rules&, Database& );
|
||||||
int CmdUndo ( );
|
int CmdUndo ( );
|
||||||
|
int CmdUntag (const CLI&, Rules&, Database& );
|
||||||
|
|
||||||
int CmdChartDay (const CLI&, Rules&, Database& );
|
int CmdChartDay (const CLI&, Rules&, Database& );
|
||||||
int CmdChartWeek (const CLI&, Rules&, Database& );
|
int CmdChartWeek (const CLI&, Rules&, Database& );
|
||||||
|
|
|
@ -75,6 +75,7 @@ void initializeEntities (CLI& cli)
|
||||||
cli.entity ("command", "tags");
|
cli.entity ("command", "tags");
|
||||||
cli.entity ("command", "track");
|
cli.entity ("command", "track");
|
||||||
cli.entity ("command", "undo");
|
cli.entity ("command", "undo");
|
||||||
|
cli.entity ("command", "untag");
|
||||||
|
|
||||||
// Some command list themselves as extensions, to integrate with the real
|
// Some command list themselves as extensions, to integrate with the real
|
||||||
// extensions.
|
// extensions.
|
||||||
|
@ -262,6 +263,7 @@ int dispatchCommand (
|
||||||
else if (command == "tags") status = CmdTags ( rules, database );
|
else if (command == "tags") status = CmdTags ( rules, database );
|
||||||
else if (command == "track") status = CmdTrack (cli, rules, database );
|
else if (command == "track") status = CmdTrack (cli, rules, database );
|
||||||
else if (command == "undo") status = CmdUndo ( );
|
else if (command == "undo") status = CmdUndo ( );
|
||||||
|
else if (command == "untag") status = CmdUntag (cli, rules, database );
|
||||||
else if (command == "week") status = CmdChartWeek (cli, rules, database );
|
else if (command == "week") status = CmdChartWeek (cli, rules, database );
|
||||||
else status = CmdReport (cli, rules, database, extensions);
|
else status = CmdReport (cli, rules, database, extensions);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue