emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu: better output 

Improve the output of various mu commands
This commit is contained in:
Dirk-Jan C. Binnema 2020-06-27 11:37:43 +03:00
parent f416ad4249
commit 0e50bfc02c
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mu/mu.cc
View File

@ -26,7 +26,9 @@
#include "mu-config.hh" #include "mu-config.hh"
#include "mu-cmd.hh" #include "mu-cmd.hh"
#include "mu-runtime.h" #include "mu-runtime.h"
#include "utils/mu-utils.hh"
using namespace Mu;
static void static void
show_version (void) show_version (void)
@ -47,42 +49,51 @@ show_version (void)
static void static void
handle_error (MuConfig *conf, MuError merr, GError **err) handle_error (MuConfig *conf, MuError merr, GError **err)
{ {
if (!(err && *err)) if (!(err && *err))
return; return;
using Color = MaybeAnsi::Color;
MaybeAnsi col{conf ? !conf->nocolor : false};
if (*err) if (*err)
g_printerr ("error: %s (%u)\n", std::cerr << col.fg(Color::Red) << "error" << col.reset() << ": "
(*err)->message, << col.fg(Color::BrightYellow)
(*err)->code); << ((*err) ? (*err)->message : "something when wrong")
<< "\n";
std::cerr << col.fg(Color::Green);
switch ((*err)->code) { switch ((*err)->code) {
case MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK: case MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK:
g_printerr ("maybe mu is already running?\n"); std::cerr << "Maybe mu is already running?\n";
break; break;
case MU_ERROR_XAPIAN_NEEDS_REINDEX:
g_printerr ("database needs (re)indexing.\n" case MU_ERROR_XAPIAN_NEEDS_REINDEX:
"try 'mu index' " std::cerr << "Database needs (re)indexing.\n"
"(see mu-index(1) for details)\n"); << "try 'mu index' "
<< "(see mu-index(1) for details)\n";
return; return;
case MU_ERROR_IN_PARAMETERS: case MU_ERROR_IN_PARAMETERS:
if (conf && mu_config_cmd_is_valid(conf->cmd)) if (conf && mu_config_cmd_is_valid(conf->cmd))
mu_config_show_help (conf->cmd); mu_config_show_help (conf->cmd);
break; break;
case MU_ERROR_SCRIPT_NOT_FOUND: case MU_ERROR_SCRIPT_NOT_FOUND:
g_printerr ("see the mu manpage for commands, or " std::cerr << "See the mu manpage for commands, or "
"'mu script' for the scripts\n"); << "'mu script' for the scripts\n";
break; break;
case MU_ERROR_XAPIAN_CANNOT_OPEN: case MU_ERROR_XAPIAN_CANNOT_OPEN:
g_printerr("Please (re)initialize mu with 'mu init' " std::cerr << "Please (re)initialize mu with 'mu init' "
"see mu-init(1) for details\n"); << "see mu-init(1) for details\n";
return; return;
case MU_ERROR_XAPIAN_SCHEMA_MISMATCH: case MU_ERROR_XAPIAN_SCHEMA_MISMATCH:
g_printerr("Please (re)initialize mu with 'mu init' " std::cerr << "Please (re)initialize mu with 'mu init' "
"see mu-init(1) for details\n"); << "see mu-init(1) for details\n";
return; return;
default: default:
break; /* nothing to do */ break; /* nothing to do */
} }
std::cerr << col.reset();
} }
@ -119,7 +130,7 @@ main (int argc, char *argv[])
rv = mu_cmd_execute (conf, &err); rv = mu_cmd_execute (conf, &err);
cleanup: cleanup:
handle_error (conf, rv, &err); handle_error (conf, rv, &err);
g_clear_error (&err); g_clear_error (&err);
mu_config_uninit (conf); mu_config_uninit (conf);