Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
578b9545
authored
Mar 09, 2017
by
Ben Wilber
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Support commas in ISO-8601 date/time format for millis
parent
a9079f67
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java
library/src/main/java/com/google/android/exoplayer2/util/Util.java
library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java
View file @
578b9545
...
@@ -142,8 +142,10 @@ public class UtilTest extends TestCase {
...
@@ -142,8 +142,10 @@ public class UtilTest extends TestCase {
public
void
testParseXsDateTime
()
throws
Exception
{
public
void
testParseXsDateTime
()
throws
Exception
{
assertEquals
(
1403219262000L
,
Util
.
parseXsDateTime
(
"2014-06-19T23:07:42"
));
assertEquals
(
1403219262000L
,
Util
.
parseXsDateTime
(
"2014-06-19T23:07:42"
));
assertEquals
(
1407322800000L
,
Util
.
parseXsDateTime
(
"2014-08-06T11:00:00Z"
));
assertEquals
(
1407322800000L
,
Util
.
parseXsDateTime
(
"2014-08-06T11:00:00Z"
));
assertEquals
(
1407322800000L
,
Util
.
parseXsDateTime
(
"2014-08-06T11:00:00,000Z"
));
assertEquals
(
1411161535000L
,
Util
.
parseXsDateTime
(
"2014-09-19T13:18:55-08:00"
));
assertEquals
(
1411161535000L
,
Util
.
parseXsDateTime
(
"2014-09-19T13:18:55-08:00"
));
assertEquals
(
1411161535000L
,
Util
.
parseXsDateTime
(
"2014-09-19T13:18:55-0800"
));
assertEquals
(
1411161535000L
,
Util
.
parseXsDateTime
(
"2014-09-19T13:18:55-0800"
));
assertEquals
(
1411161535000L
,
Util
.
parseXsDateTime
(
"2014-09-19T13:18:55.000-0800"
));
}
}
public
void
testUnescapeInvalidFileName
()
{
public
void
testUnescapeInvalidFileName
()
{
...
...
library/src/main/java/com/google/android/exoplayer2/util/Util.java
View file @
578b9545
...
@@ -94,7 +94,7 @@ public final class Util {
...
@@ -94,7 +94,7 @@ public final class Util {
private
static
final
String
TAG
=
"Util"
;
private
static
final
String
TAG
=
"Util"
;
private
static
final
Pattern
XS_DATE_TIME_PATTERN
=
Pattern
.
compile
(
private
static
final
Pattern
XS_DATE_TIME_PATTERN
=
Pattern
.
compile
(
"(\\d\\d\\d\\d)\\-(\\d\\d)\\-(\\d\\d)[Tt]"
"(\\d\\d\\d\\d)\\-(\\d\\d)\\-(\\d\\d)[Tt]"
+
"(\\d\\d):(\\d\\d):(\\d\\d)(
\\.
(\\d+))?"
+
"(\\d\\d):(\\d\\d):(\\d\\d)(
[\\.,]
(\\d+))?"
+
"([Zz]|((\\+|\\-)(\\d\\d):?(\\d\\d)))?"
);
+
"([Zz]|((\\+|\\-)(\\d\\d):?(\\d\\d)))?"
);
private
static
final
Pattern
XS_DURATION_PATTERN
=
private
static
final
Pattern
XS_DURATION_PATTERN
=
Pattern
.
compile
(
"^(-)?P(([0-9]*)Y)?(([0-9]*)M)?(([0-9]*)D)?"
Pattern
.
compile
(
"^(-)?P(([0-9]*)Y)?(([0-9]*)M)?(([0-9]*)D)?"
...
...
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