GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add functions to add/remove a set of tags to/from an interval

Browse source 
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2018-12-17 20:15:46 +01:00
parent c2c4691a23
commit 8e96ad5229
6 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CLI.h
View file

@ -70,7 +70,7 @@ public:
bool getComplementaryHint (const std::string&, bool) const;
bool getHint(const std::string&, bool) const;
std::set <int> getIds () const;
std::set<std::string> getTags () const;
std::set <std::string> getTags () const;
std::string getAnnotation() const;
Duration getDuration() const;
std::vector<std::string> getDomReferences () const;

23
src/Interval.cpp
View file

@ -75,8 +75,13 @@ const std::set <std::string>& Interval::tags () const
////////////////////////////////////////////////////////////////////////////////
void Interval::tag (const std::string& tag)
{
if (_tags.find (tag) == _tags.end ())
_tags.insert (tag);
_tags.insert (tag);
}
////////////////////////////////////////////////////////////////////////////////
void Interval::tag (const std::set<std::string>& tags)
{
_tags.insert (tags.begin (), tags.end ());
}
////////////////////////////////////////////////////////////////////////////////
@ -85,6 +90,20 @@ void Interval::untag (const std::string& tag)
_tags.erase (tag);
}
////////////////////////////////////////////////////////////////////////////////
void Interval::untag (const std::set <std::string>& tags)
{
std::set<std::string> updated;
std::set_difference (
_tags.begin (), _tags.end (),
tags.begin (), tags.end (),
std::inserter (updated, updated.end ())
);
_tags = updated;
}
////////////////////////////////////////////////////////////////////////////////
void Interval::clearTags ()
{

2
src/Interval.h
View file

@ -46,7 +46,9 @@ public:
bool hasTag (const std::string&) const;
const std::set <std::string>& tags () const;
void tag (const std::string&);
void tag (const std::set<std::string>&);
void untag (const std::string&);
void untag (const std::set<std::string>&);
void clearTags ();
void setRange (const Range& range);

5
src/commands/CmdTag.cpp
View file

@ -103,10 +103,7 @@ int CmdTag (
{
Interval modified {interval};
for (auto& tag : tags)
{
modified.tag (tag);
}
modified.tag (tags);
database.modifyInterval (interval, modified, verbose);

5
src/commands/CmdUntag.cpp
View file

@ -103,10 +103,7 @@ int CmdUntag (
{
Interval modified {interval};
for (auto& tag : tags)
{
modified.untag (tag);
}
modified.untag (tags);
database.modifyInterval (interval, modified, verbose);

18
test/tag.t Executable file → Normal file
View file

@ -206,6 +206,15 @@ class TestTag(TestCase):
expectedTags=["foo"],
description="unmodified interval")
def test_tag_with_identical_tags(self):
self.t("track 2016-01-01T00:00:00 - 2016-01-01T01:00:00")
self.t("tag @1 foo foo")
j = self.t.export()
self.assertEquals(len(j), 1)
self.assertEqual(j[0]['tags'], ['foo'])
def test_tag_with_identical_ids(self):
"""Call 'tag' with identical ids"""
now_utc = datetime.now().utcnow()
@ -271,6 +280,15 @@ class TestTag(TestCase):
code, out, err = self.t.runError("tag @2 foo")
self.assertIn("ID '@2' does not correspond to any tracking.", err)
def test_untag_with_identical_tags(self):
self.t("track 2016-01-01T00:00:00 - 2016-01-01T01:00:00 foo bar")
self.t("untag @1 foo foo")
j = self.t.export()
self.assertEquals(len(j), 1)
self.assertEqual(j[0]['tags'], ['bar'])
if __name__ == "__main__":
from simpletap import TAPTestRunner