Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASKBIN may set custom taskwarrior binary. #76

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TASKBIN may set custom taskwarrior binary. #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ const std::string getResponse (const std::string& prompt)
}

////////////////////////////////////////////////////////////////////////////////
static const std::string taskBin = std::getenv("TASKBIN") ? std::getenv("TASKBIN") : "task";

static int commandLoop (bool autoClear)
{
// Compose the prompt.
Expand Down Expand Up @@ -126,11 +128,11 @@ static int commandLoop (bool autoClear)
args[0][0] == '!') status = cmdShell (args);
else if (command != "")
{
command = "task " + command;
command = taskBin + " " + command;
std::cout << "[" << command << "]\n";
system (command.c_str ());

// Deliberately ignoreѕ taskwarrior exit status, otherwise empty filters
// Deliberately ignores taskwarrior exit status, otherwise empty filters
// cause the shell to terminate.
}
}
Expand All @@ -156,7 +158,7 @@ int main (int argc, const char** argv)
bool autoClear = false;
std::string input;
std::string output;
execute ("task", {"_get", "rc.tasksh.autoclear"}, input, output);
execute (taskBin, {"_get", "rc.tasksh.autoclear"}, input, output);
output = lowerCase (output);
autoClear = (output == "true\n" ||
output == "1\n" ||
Expand Down
36 changes: 19 additions & 17 deletions src/review.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ static unsigned int getWidth ()
}

////////////////////////////////////////////////////////////////////////////////
static const std::string taskBin = std::getenv("TASKBIN") ? std::getenv("TASKBIN") : "task";

static void editTask (const std::string& uuid)
{
std::string command = "task rc.confirmation:no rc.verbose:nothing " + uuid + " edit";
std::string command = taskBin + " rc.confirmation:no rc.verbose:nothing " + uuid + " edit";
system (command.c_str ());

command = "task rc.confirmation:no rc.verbose:nothing " + uuid + " modify reviewed:now";
command = taskBin + " rc.confirmation:no rc.verbose:nothing " + uuid + " modify reviewed:now";
system (command.c_str ());
std::cout << "Modified.\n\n\n\n";
}
Expand All @@ -90,7 +92,7 @@ static void modifyTask (const std::string& uuid)
}
while (modifications == "");

std::string command = "task rc.confirmation:no rc.verbose:nothing " + uuid + " modify " + modifications;
std::string command = taskBin + " rc.confirmation:no rc.verbose:nothing " + uuid + " modify " + modifications;
system (command.c_str ());

std::cout << "Modified.\n\n\n\n";
Expand All @@ -99,23 +101,23 @@ static void modifyTask (const std::string& uuid)
////////////////////////////////////////////////////////////////////////////////
static void reviewTask (const std::string& uuid)
{
std::string command = "task rc.confirmation:no rc.verbose:nothing " + uuid + " modify reviewed:now";
std::string command = taskBin + " rc.confirmation:no rc.verbose:nothing " + uuid + " modify reviewed:now";
system (command.c_str ());
std::cout << "Marked as reviewed.\n\n\n\n";
}

////////////////////////////////////////////////////////////////////////////////
static void completeTask (const std::string& uuid)
{
std::string command = "task rc.confirmation:no rc.verbose:nothing " + uuid + " done";
std::string command = taskBin + " rc.confirmation:no rc.verbose:nothing " + uuid + " done";
system (command.c_str ());
std::cout << "Completed.\n\n\n\n";
}

////////////////////////////////////////////////////////////////////////////////
static void deleteTask (const std::string& uuid)
{
std::string command = "task rc.confirmation:no rc.verbose:nothing " + uuid + " delete";
std::string command = taskBin + " rc.confirmation:no rc.verbose:nothing " + uuid + " delete";
system (command.c_str ());
std::cout << "Deleted.\n\n\n\n";
}
Expand Down Expand Up @@ -214,7 +216,7 @@ static void reviewLoop (const std::vector <std::string>& uuids, unsigned int lim
// Display banner for this task.
std::string dummy;
std::string description;
execute ("task",
execute (taskBin,
{"_get", uuid + ".description"},
dummy,
description);
Expand All @@ -227,7 +229,7 @@ static void reviewLoop (const std::vector <std::string>& uuids, unsigned int lim
std::cout << banner (current + 1, total, width, Lexer::trimRight (description, "\n"));

// Use 'system' to run the command and show the output.
std::string command = "task " + uuid + " information";
std::string command = taskBin + " " + uuid + " information";
system (command.c_str ());

// Display prompt, get input.
Expand Down Expand Up @@ -275,33 +277,33 @@ int cmdReview (const std::vector <std::string>& args, bool autoClear)
// Configure 'reviewed' UDA, but only if necessary.
std::string input;
std::string output;
auto status = execute ("task", {"_get", "rc.uda.reviewed.type"}, input, output);
auto status = execute (taskBin, {"_get", "rc.uda.reviewed.type"}, input, output);
if (status || output != "date\n")
{
if (confirm ("Tasksh needs to define a 'reviewed' UDA of type 'date' for all tasks. Ok to proceed?"))
{
execute ("task", {"rc.confirmation:no", "rc.verbose:nothing", "config", "uda.reviewed.type", "date"}, input, output);
execute ("task", {"rc.confirmation:no", "rc.verbose:nothing", "config", "uda.reviewed.label", "Reviewed"}, input, output);
execute (taskBin, {"rc.confirmation:no", "rc.verbose:nothing", "config", "uda.reviewed.type", "date"}, input, output);
execute (taskBin, {"rc.confirmation:no", "rc.verbose:nothing", "config", "uda.reviewed.label", "Reviewed"}, input, output);
}
}

// Configure '_reviewed' report, but only if necessary.
status = execute ("task", {"_get", "rc.report._reviewed.columns"}, input, output);
status = execute (taskBin, {"_get", "rc.report._reviewed.columns"}, input, output);
if (status || output != "uuid\n")
{
if (confirm ("Tasksh needs to define a '_reviewed' report to identify tasks needing review. Ok to proceed?"))
{
execute ("task", {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.description",
execute (taskBin, {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.description",
"Tasksh review report. Adjust the filter to your needs." }, input, output);
execute ("task", {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.columns", "uuid" }, input, output);
execute ("task", {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.sort", "reviewed+,modified+"}, input, output);
execute ("task", {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.filter",
execute (taskBin, {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.columns", "uuid" }, input, output);
execute (taskBin, {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.sort", "reviewed+,modified+"}, input, output);
execute (taskBin, {"rc.confirmation:no", "rc.verbose:nothing", "config", "report._reviewed.filter",
"( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )" }, input, output);
}
}

// Obtain a list of UUIDs to review.
status = execute ("task",
status = execute (taskBin,
{
"rc.color=off",
"rc.detection=off",
Expand Down