diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java index 34b56d64..5a04a772 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java @@ -302,7 +302,7 @@ public class YoutubeStreamExtractor extends StreamExtractor { @Override public long getTimeStamp() throws ParsingException { final long timestamp = - getTimestampSeconds("((#|&|\\?)t=\\d{0,3}h?\\d{0,3}m?\\d{1,3}s?)"); + getTimestampSeconds("((#|&|\\?)t=\\d*h?\\d*m?\\d+s?)"); if (timestamp == -2) { // Regex for timestamp was not found diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java index 12cd5d34..b78f8664 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java @@ -441,9 +441,9 @@ public abstract class StreamExtractor extends Extractor { String minutesString = ""; String hoursString = ""; try { - secondsString = Parser.matchGroup1("(\\d{1,3})s", timeStamp); - minutesString = Parser.matchGroup1("(\\d{1,3})m", timeStamp); - hoursString = Parser.matchGroup1("(\\d{1,3})h", timeStamp); + secondsString = Parser.matchGroup1("(\\d+)s", timeStamp); + minutesString = Parser.matchGroup1("(\\d+)m", timeStamp); + hoursString = Parser.matchGroup1("(\\d+)h", timeStamp); } catch (Exception e) { //it could be that time is given in another method if (secondsString.isEmpty() //if nothing was got, diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java index ae8bc95d..c36d42c9 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java @@ -112,8 +112,8 @@ public class YoutubeStreamExtractorDefaultTest { public static class DescriptionTestPewdiepie extends DefaultStreamExtractorTest { private static final String ID = "7PIMiDcwNvc"; - private static final int TIMESTAMP = 17; - private static final String URL = BASE_URL + ID + "&t=" + TIMESTAMP; + private static final int TIMESTAMP = 7483; + private static final String URL = BASE_URL + ID + "&t=" + TIMESTAMP + "s"; private static StreamExtractor extractor; @BeforeClass