From 02c966bacbf19fa4058bcee807e65bdffd1b6720 Mon Sep 17 00:00:00 2001 From: rr- Date: Wed, 24 Feb 2016 21:55:48 +0100 Subject: [PATCH] Add getters to TagsHandlers for most things --- src/tags_handlers/composite_tags_handler.cc | 6 ++++++ src/tags_handlers/composite_tags_handler.h | 2 ++ src/tags_handlers/insertion_tags_handler.cc | 10 ++++++++++ src/tags_handlers/insertion_tags_handler.h | 3 +++ src/tags_handlers/modification_tags_handler.cc | 10 ++++++++++ src/tags_handlers/modification_tags_handler.h | 3 +++ src/tags_handlers/removal_tags_handler.cc | 5 +++++ src/tags_handlers/removal_tags_handler.h | 2 ++ src/tags_handlers/stream_tags_handler.cc | 7 +++++++ src/tags_handlers/stream_tags_handler.h | 2 ++ 10 files changed, 50 insertions(+) diff --git a/src/tags_handlers/composite_tags_handler.cc b/src/tags_handlers/composite_tags_handler.cc index 237ca25..b9847b8 100644 --- a/src/tags_handlers/composite_tags_handler.cc +++ b/src/tags_handlers/composite_tags_handler.cc @@ -36,3 +36,9 @@ bool CompositeTagsHandler::done() done &= handler->done(); return done; } + +const std::vector> + CompositeTagsHandler::get_handlers() const +{ + return handlers; +} diff --git a/src/tags_handlers/composite_tags_handler.h b/src/tags_handlers/composite_tags_handler.h index 513298d..f170fce 100644 --- a/src/tags_handlers/composite_tags_handler.h +++ b/src/tags_handlers/composite_tags_handler.h @@ -16,6 +16,8 @@ namespace opustags { bool edit(const int streamno, Tags &) override; bool done() override; + const std::vector> get_handlers() const; + private: std::vector> handlers; }; diff --git a/src/tags_handlers/insertion_tags_handler.cc b/src/tags_handlers/insertion_tags_handler.cc index 51bdab9..e7b1598 100644 --- a/src/tags_handlers/insertion_tags_handler.cc +++ b/src/tags_handlers/insertion_tags_handler.cc @@ -11,6 +11,16 @@ InsertionTagsHandler::InsertionTagsHandler( { } +std::string InsertionTagsHandler::get_tag_key() const +{ + return tag_key; +} + +std::string InsertionTagsHandler::get_tag_value() const +{ + return tag_value; +} + bool InsertionTagsHandler::edit_impl(Tags &tags) { if (tags.contains(tag_key)) diff --git a/src/tags_handlers/insertion_tags_handler.h b/src/tags_handlers/insertion_tags_handler.h index 889cc9d..a97d9e0 100644 --- a/src/tags_handlers/insertion_tags_handler.h +++ b/src/tags_handlers/insertion_tags_handler.h @@ -12,6 +12,9 @@ namespace opustags { const std::string &tag_key, const std::string &tag_value); + std::string get_tag_key() const; + std::string get_tag_value() const; + protected: bool edit_impl(Tags &) override; diff --git a/src/tags_handlers/modification_tags_handler.cc b/src/tags_handlers/modification_tags_handler.cc index 6f38065..6aab3a0 100644 --- a/src/tags_handlers/modification_tags_handler.cc +++ b/src/tags_handlers/modification_tags_handler.cc @@ -10,6 +10,16 @@ ModificationTagsHandler::ModificationTagsHandler( { } +std::string ModificationTagsHandler::get_tag_key() const +{ + return tag_key; +} + +std::string ModificationTagsHandler::get_tag_value() const +{ + return tag_value; +} + bool ModificationTagsHandler::edit_impl(Tags &tags) { tags.set(tag_key, tag_value); diff --git a/src/tags_handlers/modification_tags_handler.h b/src/tags_handlers/modification_tags_handler.h index 62c5827..07be3c2 100644 --- a/src/tags_handlers/modification_tags_handler.h +++ b/src/tags_handlers/modification_tags_handler.h @@ -12,6 +12,9 @@ namespace opustags { const std::string &tag_key, const std::string &tag_value); + std::string get_tag_key() const; + std::string get_tag_value() const; + protected: bool edit_impl(Tags &) override; diff --git a/src/tags_handlers/removal_tags_handler.cc b/src/tags_handlers/removal_tags_handler.cc index 97eba36..67b16c1 100644 --- a/src/tags_handlers/removal_tags_handler.cc +++ b/src/tags_handlers/removal_tags_handler.cc @@ -14,6 +14,11 @@ RemovalTagsHandler::RemovalTagsHandler( { } +std::string RemovalTagsHandler::get_tag_key() const +{ + return tag_key; +} + bool RemovalTagsHandler::edit_impl(Tags &tags) { if (tag_key.empty()) diff --git a/src/tags_handlers/removal_tags_handler.h b/src/tags_handlers/removal_tags_handler.h index df91d54..912c5bb 100644 --- a/src/tags_handlers/removal_tags_handler.h +++ b/src/tags_handlers/removal_tags_handler.h @@ -10,6 +10,8 @@ namespace opustags { RemovalTagsHandler(const int streamno); RemovalTagsHandler(const int streamno, const std::string &tag_key); + std::string get_tag_key() const; + protected: bool edit_impl(Tags &) override; diff --git a/src/tags_handlers/stream_tags_handler.cc b/src/tags_handlers/stream_tags_handler.cc index 98fbc4f..1634284 100644 --- a/src/tags_handlers/stream_tags_handler.cc +++ b/src/tags_handlers/stream_tags_handler.cc @@ -2,11 +2,18 @@ using namespace opustags; +const int StreamTagsHandler::ALL_STREAMS = -1; + StreamTagsHandler::StreamTagsHandler(const int streamno) : streamno(streamno), work_finished(false) { } +int StreamTagsHandler::get_streamno() const +{ + return streamno; +} + bool StreamTagsHandler::relevant(const int streamno) { return streamno == this->streamno; diff --git a/src/tags_handlers/stream_tags_handler.h b/src/tags_handlers/stream_tags_handler.h index 629b49d..40d2ce8 100644 --- a/src/tags_handlers/stream_tags_handler.h +++ b/src/tags_handlers/stream_tags_handler.h @@ -11,6 +11,8 @@ namespace opustags { public: StreamTagsHandler(const int streamno); + int get_streamno() const; + bool relevant(const int streamno) override; void list(const int streamno, const Tags &) override; bool edit(const int streamno, Tags &) override;