#21 Move method to gather tags to CLI

GothenburgBitFactory · May 12, 2018 · db13bd403f2fcf0df7310a3e387b01dcc8b83bea · db13bd4
1 parent d8169d7
commit db13bd403f2fcf0df7310a3e387b01dcc8b83bea
Unified Split

Showing with 18 additions and 6 deletions.

+14 −0 src/CLI.cpp

+1 −0 src/CLI.h

+3 −6 src/commands/CmdTag.cpp
diff --git a/src/CLI.cpp b/src/CLI.cpp
@@ -539,3 +539,17 @@ std::set<int> CLI::getIds() const
 }
 ////////////////////////////////////////////////////////////////////////////////
+  
+std::vector<std::string> CLI::getTags () const
+  
+{
+  
+  std::vector <std::string> tags;
+  
+
+  
+  for (auto& arg : _args)
+  
+  {
+  
+    if (arg.hasTag ("TAG"))
+  
+      tags.push_back (arg.attribute ("raw"));
+  
+  }
+  
+
+  
+  return tags;
+  
+}
+  
+
+  
+////////////////////////////////////////////////////////////////////////////////
diff --git a/src/CLI.h b/src/CLI.h
@@ -66,6 +66,7 @@ class CLI
  std::string getBinary () const;
  std::string getCommand () const;
  std::set <int> getIds () const;
+  
+  std::vector<std::string> getTags () const;
  std::string dump (const std::string& title = "CLI Parser") const;
 private:

diff --git a/src/commands/CmdTag.cpp b/src/commands/CmdTag.cpp
@@ -41,15 +41,12 @@ int CmdTag (
  std::set <int> ids = cli.getIds ();
  if (ids.empty ())
-  
-    throw std::string ("IDs must be specified. See 'timew help tag'.");
-  
-
-  
-  std::vector <std::string> tags;
-  
-  for (auto& arg : cli._args)
  {
-  
-    if (arg.hasTag ("TAG"))
-  
-      tags.push_back (arg.attribute ("raw"));
+  
+    throw std::string ("IDs must be specified. See 'timew help tag'.");
  }
+  
+  std::vector<std::string> tags = cli.getTags ();
+  
+
  // Load the data.
  // Note: There is no filter.
  Interval filter;