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

getTaskContext: Allow getting context info for a non-active context

Browse source
This commit is contained in:
Tomas Babej 2021-04-03 01:39:33 -04:00
parent c0ded37f91
commit 351c3b025c
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/CLI2.cpp
View file

@ -604,9 +604,10 @@ void CLI2::addContext (bool readable, bool writeable)
// Detect if any context is set, and bail out if not
std::string contextString;
if (readable)
contextString = Context::getContext ().getTaskContext("read");
// Empty string is treated as "currently selected context"
contextString = Context::getContext ().getTaskContext("read", "");
else if (writeable)
contextString = Context::getContext ().getTaskContext("write");
contextString = Context::getContext ().getTaskContext("write", "");
else
return;

17
src/Context.cpp
View file

@ -923,12 +923,15 @@ int Context::getHeight ()
}
////////////////////////////////////////////////////////////////////////////////
std::string Context::getTaskContext (const std::string& kind, bool fallback /* = true */)
std::string Context::getTaskContext (const std::string& kind, std::string name, bool fallback /* = true */)
{
// Consider currently selected context, if none specified
if (name.empty ())
name = config.get ("context");
// Detect if any context is set, and bail out if not
std::string contextName = config.get ("context");
if (! contextName.empty ())
debug (format ("Applying context '{1}'", contextName));
if (! name.empty ())
debug (format ("Applying context '{1}'", name));
else
{
debug ("No context set");
@ -936,14 +939,14 @@ std::string Context::getTaskContext (const std::string& kind, bool fallback /* =
}
// Figure out the context string for this kind (read/write)
std::string contextString = config.get ("context." + contextName + "." + kind);
std::string contextString = config.get ("context." + name + "." + kind);
if (contextString.empty ())
{
debug ("Specific " + kind + " context for '" + contextName + "' not defined. ");
debug ("Specific " + kind + " context for '" + name + "' not defined. ");
if (fallback)
{
debug ("Falling back on generic.");
contextString = config.get ("context." + contextName);
contextString = config.get ("context." + name);
}
}

2
src/Context.h
View file

@ -57,7 +57,7 @@ public:
int getWidth (); // determine terminal width
int getHeight (); // determine terminal height
std::string getTaskContext (const std::string&, bool fallback=true);
std::string getTaskContext (const std::string&, std::string, bool fallback=true);
const std::vector <std::string> getColumns () const;
void getLimits (int&, int&);