alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils/mu-date: remove

Browse Source 
Remove mu-date.[ch] and convert its last users to use time_to_string instead.
This commit is contained in:
Dirk-Jan C. Binnema
2022-02-22 22:48:29 +02:00
parent a51272a2e6
commit af87cde217
9 changed files with 133 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
mu/mu-cmd-cfind.cc
View File

@ -33,7 +33,6 @@
#include "utils/mu-utils.hh"
#include "utils/mu-error.hh"
#include "utils/mu-str.h"
#include "utils/mu-date.h"
using namespace Mu;
@ -184,7 +183,7 @@ print_header(const MuConfigFormat format)
switch (format) {
case MU_CONFIG_FORMAT_BBDB:
g_print(";; -*-coding: utf-8-emacs;-*-\n"
";;; file-version: 6\n");
";;; file-version: 6\n");
break;
case MU_CONFIG_FORMAT_MUTT_AB:
g_print("Matching addresses in the mu database:\n");
@ -197,31 +196,30 @@ print_header(const MuConfigFormat format)
static void
each_contact_bbdb(const std::string& email, const std::string& name, time_t tstamp)
{
char *fname, *lname, *now, *timestamp;
char *fname, *lname;
fname = guess_first_name(name.c_str());
lname = guess_last_name(name.c_str());
now = mu_date_str("%Y-%m-%d", time(NULL));
timestamp = mu_date_str("%Y-%m-%d", tstamp);
fname = guess_first_name(name.c_str());
lname = guess_last_name(name.c_str());
const auto now{time_to_string("%Y-%m-%d", time(NULL))};
const auto timestamp{time_to_string("%Y-%m-%d", tstamp)};
g_print("[\"%s\" \"%s\" nil nil nil nil (\"%s\") "
"((creation-date . \"%s\") (time-stamp . \"%s\")) nil]\n",
fname,
lname,
email.c_str(),
now,
timestamp);
"((creation-date . \"%s\") (time-stamp . \"%s\")) nil]\n",
fname,
lname,
email.c_str(),
now.c_str(),
timestamp.c_str());
g_free(now);
g_free(timestamp);
g_free(fname);
g_free(lname);
}
static void
each_contact_mutt_alias(const std::string& email,
const std::string& name,
GHashTable* nicks)
const std::string& name,
GHashTable* nicks)
{
if (name.empty())
return;
@ -234,8 +232,8 @@ each_contact_mutt_alias(const std::string& email,
static void
each_contact_wl(const std::string& email,
const std::string& name,
GHashTable* nicks)
const std::string& name,
GHashTable* nicks)
{
if (name.empty())
return;
@ -287,9 +285,9 @@ each_contact(const Mu::MessageContact& ci, ECData& ecdata)
if (ecdata.rx &&
!g_regex_match(ecdata.rx, ci.email.c_str(), (GRegexMatchFlags)0, NULL) &&
!g_regex_match(ecdata.rx,
ci.name.empty() ? "" : ci.name.c_str(),
(GRegexMatchFlags)0,
NULL))
ci.name.empty() ? "" : ci.name.c_str(),
(GRegexMatchFlags)0,
NULL))
return;
++ecdata.n;
@ -305,26 +303,26 @@ each_contact(const Mu::MessageContact& ci, ECData& ecdata)
case MU_CONFIG_FORMAT_ORG_CONTACT:
if (!ci.name.empty())
mu_util_print_encoded("* %s\n:PROPERTIES:\n:EMAIL: %s\n:END:\n\n",
ci.name.c_str(),
ci.email.c_str());
ci.name.c_str(),
ci.email.c_str());
break;
case MU_CONFIG_FORMAT_BBDB: each_contact_bbdb(ci.email, ci.name, ci.message_date); break;
case MU_CONFIG_FORMAT_CSV:
mu_util_print_encoded("%s,%s\n",
ci.name.empty() ? "" : Mu::quote(ci.name).c_str(),
Mu::quote(ci.email).c_str());
ci.name.empty() ? "" : Mu::quote(ci.name).c_str(),
Mu::quote(ci.email).c_str());
break;
case MU_CONFIG_FORMAT_DEBUG: {
char datebuf[32];
strftime(datebuf, sizeof(datebuf), "%F %T", gmtime(&ci.message_date));
g_print("%s\n\tname: %s\n\t%s\n\tpersonal: %s\n\tfreq: %zu\n"
"\tlast-seen: %s\n",
ci.email.c_str(),
ci.name.empty() ? "<none>" : ci.name.c_str(),
ci.display_name().c_str(),
ci.personal ? "yes" : "no",
ci.frequency,
datebuf);
"\tlast-seen: %s\n",
ci.email.c_str(),
ci.name.empty() ? "<none>" : ci.name.c_str(),
ci.display_name().c_str(),
ci.personal ? "yes" : "no",
ci.frequency,
datebuf);
} break;
default: print_plain(ci.email, ci.name, ecdata.color);
}
@ -332,12 +330,12 @@ each_contact(const Mu::MessageContact& ci, ECData& ecdata)
static MuError
run_cmd_cfind(const Mu::Store& store,
const char* pattern,
gboolean personal,
time_t after,
const MuConfigFormat format,
gboolean color,
GError** err)
const char* pattern,
gboolean personal,
time_t after,
const MuConfigFormat format,
gboolean color,
GError** err)
{
ECData ecdata{};
@ -392,7 +390,7 @@ cfind_params_valid(const MuConfig* opts)
case MU_CONFIG_FORMAT_DEBUG: break;
default:
g_printerr("invalid output format %s\n",
opts->formatstr ? opts->formatstr : "<none>");
opts->formatstr ? opts->formatstr : "<none>");
return FALSE;
}
@ -413,20 +411,20 @@ Mu::mu_cmd_cfind(const Mu::Store& store, const MuConfig* opts, GError** err)
if (!cfind_params_valid(opts))
throw Mu::Error(Mu::Error::Code::InvalidArgument,
"invalid parameters");
"invalid parameters");
auto res = run_cmd_cfind(store,
opts->params[1],
opts->personal,
opts->after,
opts->format,
!opts->nocolor,
err);
opts->params[1],
opts->personal,
opts->after,
opts->format,
!opts->nocolor,
err);
if (res != MU_OK && res != MU_ERROR_NO_MATCHES)
throw Mu::Error(Mu::Error::Code::Internal,
err /*consumes*/,
"error in cfind");
err /*consumes*/,
"error in cfind");
return res;
}

88
mu/mu-cmd-find.cc
View File

@ -37,9 +37,9 @@
#include "utils/mu-util.h"
#include "utils/mu-str.h"
#include "utils/mu-date.h"
#include "mu-cmd.hh"
#include "utils/mu-utils.hh"
using namespace Mu;
@ -58,10 +58,10 @@ using OutputFunc = std::function<bool(MuMsg*, const OutputInfo&, const MuConfig*
static gboolean
print_internal(const Store& store,
const std::string& expr,
gboolean xapian,
gboolean warn,
GError** err)
const std::string& expr,
gboolean xapian,
gboolean warn,
GError** err)
{
std::cout << store.parse_query(expr, xapian) << "\n";
@ -81,10 +81,10 @@ sort_field_from_string(const char* fieldstr, GError** err)
mfid = mu_msg_field_id_from_shortcut(fieldstr[0], FALSE);
if (mfid == MU_MSG_FIELD_ID_NONE)
g_set_error(err,
MU_ERROR_DOMAIN,
MU_ERROR_IN_PARAMETERS,
"not a valid sort field: '%s'\n",
fieldstr);
MU_ERROR_DOMAIN,
MU_ERROR_IN_PARAMETERS,
"not a valid sort field: '%s'\n",
fieldstr);
return mfid;
}
@ -142,20 +142,20 @@ resolve_bookmark(const MuConfig* opts, GError** err)
bm = mu_bookmarks_new(bmfile);
if (!bm) {
g_set_error(err,
MU_ERROR_DOMAIN,
MU_ERROR_FILE_CANNOT_OPEN,
"failed to open bookmarks file '%s'",
bmfile);
MU_ERROR_DOMAIN,
MU_ERROR_FILE_CANNOT_OPEN,
"failed to open bookmarks file '%s'",
bmfile);
return FALSE;
}
val = (gchar*)mu_bookmarks_lookup(bm, opts->bookmark);
if (!val)
g_set_error(err,
MU_ERROR_DOMAIN,
MU_ERROR_NO_MATCHES,
"bookmark '%s' not found",
opts->bookmark);
MU_ERROR_DOMAIN,
MU_ERROR_NO_MATCHES,
"bookmark '%s' not found",
opts->bookmark);
else
val = g_strdup(val);
@ -305,7 +305,7 @@ flags_s(MessageFlags flags)
return buf;
}
static const char*
static std::string
display_field(MuMsg* msg, MuMsgFieldId mfid)
{
gint64 val;
@ -328,9 +328,8 @@ display_field(MuMsg* msg, MuMsgFieldId mfid)
return mu_msg_get_field_string(msg, mfid);
case MU_MSG_FIELD_TYPE_TIME_T:
val = mu_msg_get_field_numeric(msg, mfid);
return mu_date_str_s("%c", (time_t)val);
return time_to_string(
"%c", static_cast<::time_t>(mu_msg_get_field_numeric(msg, mfid)));
case MU_MSG_FIELD_TYPE_BYTESIZE:
val = mu_msg_get_field_numeric(msg, mfid);
return mu_str_size_s((unsigned)val);
@ -391,8 +390,8 @@ thread_indent(const QueryMatch& info, const MuConfig* opts)
else
::fputs(" ", stdout);
::fputs(empty_parent ? "*> " : is_dup ? "=> "
: "-> ",
stdout);
: "-> ",
stdout);
}
}
@ -414,7 +413,8 @@ output_plain_fields(MuMsg* msg, const char* fields, gboolean color, gboolean thr
else {
ansi_color_maybe(mfid, color);
nonempty += mu_util_fputs_encoded(display_field(msg, mfid), stdout);
nonempty += mu_util_fputs_encoded(display_field(msg, mfid).c_str(),
stdout);
ansi_reset_maybe(mfid, color);
}
}
@ -482,7 +482,7 @@ to_string(const Mu::Sexp& sexp, bool color, size_t level = 0)
break;
case Sexp::Type::Symbol:
sstrm << (col.fg(sexp.value().at(0) == ':' ? Color::BrightGreen
: Color::BrightBlue))
: Color::BrightBlue))
<< sexp.value() << col.reset();
break;
default: throw std::logic_error("invalid type");
@ -517,8 +517,8 @@ output_json(MuMsg* msg, const OutputInfo& info, const MuConfig* opts, GError** e
}
g_print("%s%s\n",
msg_to_sexp(msg, info.docid, MU_MSG_OPTION_HEADERS_ONLY).to_json_string().c_str(),
info.last ? "" : ",");
msg_to_sexp(msg, info.docid, MU_MSG_OPTION_HEADERS_ONLY).to_json_string().c_str(),
info.last ? "" : ",");
return true;
}
@ -601,13 +601,13 @@ output_query_results(const QueryResults& qres, const MuConfig* opts, GError** er
continue;
rv = output_func(msg,
{item.doc_id(),
false,
false,
n == qres.size(), /* last? */
item.query_match()},
opts,
err);
{item.doc_id(),
false,
false,
n == qres.size(), /* last? */
item.query_match()},
opts,
err);
if (!rv)
break;
}
@ -660,16 +660,16 @@ format_params_valid(const MuConfig* opts, GError** err)
case MU_CONFIG_FORMAT_MQUERY:
if (opts->exec) {
mu_util_g_set_error(err,
MU_ERROR_IN_PARAMETERS,
"--exec and --format cannot be combined");
MU_ERROR_IN_PARAMETERS,
"--exec and --format cannot be combined");
return FALSE;
}
break;
default:
mu_util_g_set_error(err,
MU_ERROR_IN_PARAMETERS,
"invalid output format %s",
opts->formatstr ? opts->formatstr : "<none>");
MU_ERROR_IN_PARAMETERS,
"invalid output format %s",
opts->formatstr ? opts->formatstr : "<none>");
return FALSE;
}
@ -680,8 +680,8 @@ format_params_valid(const MuConfig* opts, GError** err)
if (opts->linksdir && opts->format != MU_CONFIG_FORMAT_LINKS) {
mu_util_g_set_error(err,
MU_ERROR_IN_PARAMETERS,
"--linksdir is only valid with --format=links");
MU_ERROR_IN_PARAMETERS,
"--linksdir is only valid with --format=links");
return FALSE;
}
@ -703,9 +703,9 @@ query_params_valid(const MuConfig* opts, GError** err)
return TRUE;
mu_util_g_set_error(err,
MU_ERROR_FILE_CANNOT_READ,
"'%s' is not a readable Xapian directory",
xpath);
MU_ERROR_FILE_CANNOT_READ,
"'%s' is not a readable Xapian directory",
xpath);
return FALSE;
}

7
mu/mu-cmd.cc
View File

@ -38,7 +38,6 @@
#include "utils/mu-util.h"
#include "utils/mu-str.h"
#include "utils/mu-date.h"
#include "utils/mu-error.hh"
@ -164,8 +163,10 @@ view_msg_plain(MuMsg* msg, const MuConfig* opts)
print_field("Bcc", mu_msg_get_bcc(msg), color);
print_field("Subject", mu_msg_get_subject(msg), color);
if ((date = mu_msg_get_date(msg)))
print_field("Date", mu_date_str_s("%c", date), color);
if ((date = mu_msg_get_date(msg))) {
const auto dstr{time_to_string("%c", date)};
print_field("Date", dstr.c_str(), color);
}
if ((lst = mu_msg_get_tags(msg))) {
gchar* tags;