Skip to content

M
mpd
Commit d7dbf47a authored by Max Kellermann's avatar Max Kellermann Committed by Max Kellermann
Browse files
Options

time/ISO8601: support omitting minutes

parent 3db584a3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
src/time/ISO8601.cxx
View file @ d7dbf47a
...@@ -138,6 +138,8 @@ ParseISO8601(const char *s) ...@@ -138,6 +138,8 @@ ParseISO8601(const char *s)
precision = std::chrono::seconds(1); precision = std::chrono::seconds(1);
else if ((end = strptime(s, "%H:%M", &tm)) != nullptr) else if ((end = strptime(s, "%H:%M", &tm)) != nullptr)
precision = std::chrono::minutes(1); precision = std::chrono::minutes(1);
else if ((end = strptime(s, "%H", &tm)) != nullptr)
precision = std::chrono::hours(1);
else else
throw std::runtime_error("Failed to parse time of day"); throw std::runtime_error("Failed to parse time of day");
......
test/TestISO8601.cxx
View file @ d7dbf47a
...@@ -62,6 +62,10 @@ static constexpr struct { ...@@ -62,6 +62,10 @@ static constexpr struct {
{ "2019-02-04T16:46", 1549298760, std::chrono::minutes(1) }, { "2019-02-04T16:46", 1549298760, std::chrono::minutes(1) },
{ "2019-02-04T16:46Z", 1549298760, std::chrono::minutes(1) }, { "2019-02-04T16:46Z", 1549298760, std::chrono::minutes(1) },
/* without minutes */
{ "2019-02-04T16", 1549296000, std::chrono::hours(1) },
{ "2019-02-04T16Z", 1549296000, std::chrono::hours(1) },
/* with time zone */ /* with time zone */
{ "2019-02-04T16:46:41+02", 1549291601, std::chrono::seconds(1) }, { "2019-02-04T16:46:41+02", 1549291601, std::chrono::seconds(1) },
{ "2019-02-04T16:46:41+0200", 1549291601, std::chrono::seconds(1) }, { "2019-02-04T16:46:41+0200", 1549291601, std::chrono::seconds(1) },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment