validate: Moved verbose check

This commit is contained in:
Paul Beckingham 2016-07-09 10:31:00 -04:00
parent 94ed12de2f
commit 0cbf9a0bdd

View file

@ -92,25 +92,29 @@ static void autoAdjust (
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Warn on new tag. // Warn on new tag.
static void warnOnNewTag ( static void warnOnNewTag (
const Rules& rules,
Database& database, Database& database,
const Interval& interval) const Interval& interval)
{ {
std::set <std::string> tags; if (rules.getBoolean ("verbose"))
for (auto& line : database.allLines ())
{ {
if (line[0] == 'i') std::set <std::string> tags;
for (auto& line : database.allLines ())
{ {
Interval interval; if (line[0] == 'i')
interval.initialize (line); {
Interval interval;
interval.initialize (line);
for (auto& tag : interval.tags ()) for (auto& tag : interval.tags ())
tags.insert (tag); tags.insert (tag);
}
} }
}
for (auto& tag : interval.tags ()) for (auto& tag : interval.tags ())
if (tags.find (tag) == tags.end ()) if (tags.find (tag) == tags.end ())
std::cout << "Note: '" << tag << "' is a new tag.\n"; std::cout << "Note: '" << tag << "' is a new tag.\n";
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -131,8 +135,7 @@ void validate (
if (findHint (cli, ":adjust")) if (findHint (cli, ":adjust"))
autoAdjust (rules, database, filter, interval); autoAdjust (rules, database, filter, interval);
if (rules.getBoolean ("verbose")) warnOnNewTag (rules, database, interval);
warnOnNewTag (database, interval);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////