Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
f3ed2c0a
Commit
f3ed2c0a
authored
Aug 19, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
time/ISO8601: support omitting seconds
parent
2c35ea92
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
ISO8601.cxx
src/time/ISO8601.cxx
+6
-3
TestISO8601.cxx
test/TestISO8601.cxx
+4
-0
No files found.
src/time/ISO8601.cxx
View file @
f3ed2c0a
...
...
@@ -133,12 +133,15 @@ ParseISO8601(const char *s)
/* parse the time of day */
if
(
*
s
==
'T'
)
{
++
s
;
end
=
strptime
(
s
,
"%T"
,
&
tm
);
if
(
end
==
nullptr
)
if
((
end
=
strptime
(
s
,
"%T"
,
&
tm
))
!=
nullptr
)
precision
=
std
::
chrono
::
seconds
(
1
);
else
if
((
end
=
strptime
(
s
,
"%H:%M"
,
&
tm
))
!=
nullptr
)
precision
=
std
::
chrono
::
minutes
(
1
);
else
throw
std
::
runtime_error
(
"Failed to parse time of day"
);
s
=
end
;
precision
=
std
::
chrono
::
seconds
(
1
);
}
auto
tp
=
TimeGm
(
tm
);
...
...
test/TestISO8601.cxx
View file @
f3ed2c0a
...
...
@@ -58,6 +58,10 @@ static constexpr struct {
/* without time zone */
{
"2019-02-04T16:46:41"
,
1549298801
,
std
::
chrono
::
seconds
(
1
)
},
/* without seconds */
{
"2019-02-04T16:46"
,
1549298760
,
std
::
chrono
::
minutes
(
1
)
},
{
"2019-02-04T16:46Z"
,
1549298760
,
std
::
chrono
::
minutes
(
1
)
},
/* with time zone */
{
"2019-02-04T16:46:41+02"
,
1549291601
,
std
::
chrono
::
seconds
(
1
)
},
{
"2019-02-04T16:46:41+0200"
,
1549291601
,
std
::
chrono
::
seconds
(
1
)
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment