add initial bulk run from pre-commit over all files
This commit is contained in:
@@ -31,100 +31,81 @@
|
||||
#include <Context.h>
|
||||
#include <Duration.h>
|
||||
#include <Eval.h>
|
||||
#include <Variant.h>
|
||||
#include <Lexer.h>
|
||||
#include <Filter.h>
|
||||
#include <shared.h>
|
||||
#include <Lexer.h>
|
||||
#include <Variant.h>
|
||||
#include <format.h>
|
||||
#include <shared.h>
|
||||
#include <utf8.h>
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
ColumnRecur::ColumnRecur ()
|
||||
{
|
||||
_name = "recur";
|
||||
_style = "duration";
|
||||
_label = "Recur";
|
||||
ColumnRecur::ColumnRecur() {
|
||||
_name = "recur";
|
||||
_style = "duration";
|
||||
_label = "Recur";
|
||||
_modifiable = true;
|
||||
_styles = {"duration", "indicator"};
|
||||
_examples = {"weekly", Context::getContext ().config.get ("recurrence.indicator")};
|
||||
_styles = {"duration", "indicator"};
|
||||
_examples = {"weekly", Context::getContext().config.get("recurrence.indicator")};
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Overriden so that style <----> label are linked.
|
||||
// Note that you can not determine which gets called first.
|
||||
void ColumnRecur::setStyle (const std::string& value)
|
||||
{
|
||||
Column::setStyle (value);
|
||||
void ColumnRecur::setStyle(const std::string& value) {
|
||||
Column::setStyle(value);
|
||||
|
||||
if (_style == "indicator" && _label == "Recur")
|
||||
_label = _label.substr (0, Context::getContext ().config.get ("recurrence.indicator").length ());
|
||||
_label = _label.substr(0, Context::getContext().config.get("recurrence.indicator").length());
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Set the minimum and maximum widths for the value.
|
||||
void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
|
||||
{
|
||||
void ColumnRecur::measure(Task& task, unsigned int& minimum, unsigned int& maximum) {
|
||||
minimum = maximum = 0;
|
||||
if (task.has (_name))
|
||||
{
|
||||
if (_style == "default" ||
|
||||
_style == "duration")
|
||||
{
|
||||
minimum = maximum = Duration (task.get (_name)).formatISO ().length ();
|
||||
}
|
||||
else if (_style == "indicator")
|
||||
{
|
||||
minimum = maximum = utf8_width (Context::getContext ().config.get ("recurrence.indicator"));
|
||||
if (task.has(_name)) {
|
||||
if (_style == "default" || _style == "duration") {
|
||||
minimum = maximum = Duration(task.get(_name)).formatISO().length();
|
||||
} else if (_style == "indicator") {
|
||||
minimum = maximum = utf8_width(Context::getContext().config.get("recurrence.indicator"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void ColumnRecur::render (
|
||||
std::vector <std::string>& lines,
|
||||
Task& task,
|
||||
int width,
|
||||
Color& color)
|
||||
{
|
||||
if (task.has (_name))
|
||||
{
|
||||
if (_style == "default" ||
|
||||
_style == "duration")
|
||||
renderStringRight (lines, width, color, Duration (task.get (_name)).formatISO ());
|
||||
void ColumnRecur::render(std::vector<std::string>& lines, Task& task, int width, Color& color) {
|
||||
if (task.has(_name)) {
|
||||
if (_style == "default" || _style == "duration")
|
||||
renderStringRight(lines, width, color, Duration(task.get(_name)).formatISO());
|
||||
|
||||
else if (_style == "indicator")
|
||||
renderStringRight (lines, width, color, Context::getContext ().config.get ("recurrence.indicator"));
|
||||
renderStringRight(lines, width, color,
|
||||
Context::getContext().config.get("recurrence.indicator"));
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// The duration is stored in raw form, but it must still be valid,
|
||||
// and therefore is parsed first.
|
||||
void ColumnRecur::modify (Task& task, const std::string& value)
|
||||
{
|
||||
void ColumnRecur::modify(Task& task, const std::string& value) {
|
||||
// Try to evaluate 'value'. It might work.
|
||||
Variant evaluatedValue;
|
||||
try
|
||||
{
|
||||
try {
|
||||
Eval e;
|
||||
e.addSource (domSource);
|
||||
e.evaluateInfixExpression (value, evaluatedValue);
|
||||
e.addSource(domSource);
|
||||
e.evaluateInfixExpression(value, evaluatedValue);
|
||||
}
|
||||
|
||||
catch (...)
|
||||
{
|
||||
evaluatedValue = Variant (value);
|
||||
catch (...) {
|
||||
evaluatedValue = Variant(value);
|
||||
}
|
||||
|
||||
if (evaluatedValue.type () == Variant::type_duration)
|
||||
{
|
||||
if (evaluatedValue.type() == Variant::type_duration) {
|
||||
// Store the raw value, for 'recur'.
|
||||
std::string label = " [1;37;43mMODIFICATION[0m ";
|
||||
Context::getContext ().debug (label + _name + " <-- '" + value + '\'');
|
||||
task.set (_name, value);
|
||||
}
|
||||
else
|
||||
throw format ("The duration value '{1}' is not supported.", value);
|
||||
Context::getContext().debug(label + _name + " <-- '" + value + '\'');
|
||||
task.set(_name, value);
|
||||
} else
|
||||
throw format("The duration value '{1}' is not supported.", value);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user