forked from TeamNewPipe/NewPipe
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use better pattern for matching timestamp in text and some reworks
Also extracted overhead code into ``TimestampExtractor``
- Loading branch information
Showing
3 changed files
with
121 additions
and
40 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
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
78 changes: 78 additions & 0 deletions
78
app/src/main/java/org/schabi/newpipe/util/external_communication/TimestampExtractor.java
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 |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package org.schabi.newpipe.util.external_communication; | ||
|
|
||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Extracts timestamps. | ||
| */ | ||
| public final class TimestampExtractor { | ||
| public static final Pattern TIMESTAMPS_PATTERN = Pattern.compile( | ||
| "(?:^|(?!:)\\W)(?:([0-5]?[0-9]):)?([0-5]?[0-9]):([0-5][0-9])(?=$|(?!:)\\W)"); | ||
|
|
||
| private TimestampExtractor() { | ||
| // No impl pls | ||
| } | ||
|
|
||
| /** | ||
| * Get's a single timestamp from a matcher. | ||
| * | ||
| * @param timestampMatches The matcher which was created using {@link #TIMESTAMPS_PATTERN} | ||
| * @param baseText The text where the pattern was applied to / where the matcher is based upon | ||
| * @return If a match occurred: a {@link TimestampMatchDTO} filled with information.<br/> | ||
| * If not <code>null</code>. | ||
| */ | ||
| public static TimestampMatchDTO getTimestampFromMatcher( | ||
| final Matcher timestampMatches, | ||
| final String baseText) { | ||
| int timestampStart = timestampMatches.start(1); | ||
| if (timestampStart == -1) { | ||
| timestampStart = timestampMatches.start(2); | ||
| } | ||
| final int timestampEnd = timestampMatches.end(3); | ||
|
|
||
| final String parsedTimestamp = baseText.substring(timestampStart, timestampEnd); | ||
| final String[] timestampParts = parsedTimestamp.split(":"); | ||
|
|
||
| final int seconds; | ||
| if (timestampParts.length == 3) { // timestamp format: XX:XX:XX | ||
| seconds = Integer.parseInt(timestampParts[0]) * 3600 // hours | ||
| + Integer.parseInt(timestampParts[1]) * 60 // minutes | ||
| + Integer.parseInt(timestampParts[2]); // seconds | ||
| } else if (timestampParts.length == 2) { // timestamp format: XX:XX | ||
| seconds = Integer.parseInt(timestampParts[0]) * 60 // minutes | ||
| + Integer.parseInt(timestampParts[1]); // seconds | ||
| } else { | ||
| return null; | ||
| } | ||
|
|
||
| return new TimestampMatchDTO(timestampStart, timestampEnd, seconds); | ||
| } | ||
|
|
||
| public static class TimestampMatchDTO { | ||
| private final int timestampStart; | ||
| private final int timestampEnd; | ||
| private final int seconds; | ||
|
|
||
| public TimestampMatchDTO( | ||
| final int timestampStart, | ||
| final int timestampEnd, | ||
| final int seconds) { | ||
| this.timestampStart = timestampStart; | ||
| this.timestampEnd = timestampEnd; | ||
| this.seconds = seconds; | ||
| } | ||
|
|
||
| public int timestampStart() { | ||
| return timestampStart; | ||
| } | ||
|
|
||
| public int timestampEnd() { | ||
| return timestampEnd; | ||
| } | ||
|
|
||
| public int seconds() { | ||
| return seconds; | ||
| } | ||
| } | ||
| } |