-
Notifications
You must be signed in to change notification settings - Fork 390
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mu-sexp: add -unix output for json tstamps
The json output (for mu-find etc.) just showed the converted sexp output, including the clumsy emacs-style tstamps (for changed/date). Add unix timestamps as well, which are easier to work with outside emacs. This handles #2770.
- Loading branch information
Showing
1 changed file
with
26 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| ** Copyright (C) 2022-2023 Dirk-Jan C. Binnema <[email protected]> | ||
| ** Copyright (C) 2022-2024 Dirk-Jan C. Binnema <[email protected]> | ||
| ** | ||
| ** This program is free software; you can redistribute it and/or modify it | ||
| ** under the terms of the GNU General Public License as published by the | ||
|
|
@@ -60,15 +60,18 @@ parse_list(const std::string& expr, size_t& pos) | |
| Sexp lst{}; | ||
|
|
||
| ++pos; | ||
| while (expr[pos] != ')' && pos != expr.size()) { | ||
| while (pos < expr.size() && expr[pos] != ')') { | ||
| if (auto&& item = parse(expr, pos); item) | ||
| lst.add(std::move(*item)); | ||
| else | ||
| return Err(item.error()); | ||
| } | ||
|
|
||
| if (expr[pos] != ')') | ||
| if (pos >= expr.size()) | ||
| return Err(parsing_error(pos, "expected: ')'")); | ||
| else if (expr[pos] != ')') | ||
| return Err(parsing_error(pos, "expected: ')' but got '{}'", expr[pos])); | ||
|
|
||
| ++pos; | ||
| return Ok(std::move(lst)); | ||
| } | ||
|
|
@@ -209,6 +212,17 @@ Sexp::to_string(Format fopts) const | |
|
|
||
| // LCOV_EXCL_START | ||
|
|
||
| // convert emacs-timestamp (a list) to a unix-tstamp | ||
| static uint64_t | ||
| unix_tstamp(const Sexp& emacs_tstamp) | ||
| { | ||
| if (!emacs_tstamp.listp() || emacs_tstamp.list().size() < 2) | ||
| throw std::runtime_error("unexpected type"); | ||
|
|
||
| const auto& lst{emacs_tstamp.list()}; | ||
| return (lst.at(0).number() << 16) | lst.at(1).number(); | ||
| } | ||
|
|
||
| std::string | ||
| Sexp::to_json_string(Format fopts) const | ||
| { | ||
|
|
@@ -222,11 +236,18 @@ Sexp::to_json_string(Format fopts) const | |
| auto it{list().begin()}; | ||
| bool first{true}; | ||
| while (it != list().end()) { | ||
| sstrm << (first ? "" : ",") << quote(it->symbol().name) << ":"; | ||
| const auto key{it->symbol().name}; | ||
| sstrm << (first ? "" : ",") << quote(key) << ":"; | ||
| ++it; | ||
| sstrm << it->to_json_string(); | ||
| const auto emacs_tstamp{*it}; | ||
| sstrm << emacs_tstamp.to_json_string(); | ||
| ++it; | ||
| first = false; | ||
| // special-case: tstamp-fields also get a "unix" value, | ||
| // which are easier to work with than the "emacs" timestamps | ||
| if (key == ":date" || key == ":changed") | ||
| sstrm << "," << quote(key + "-unix") << ":" | ||
| << unix_tstamp(emacs_tstamp); | ||
| } | ||
| sstrm << "}"; | ||
| if (any_of(fopts & Format::SplitList)) | ||
|
|
||