From fcdb9bdbebc6271f7b7b9de7620ddd71d9af334f Mon Sep 17 00:00:00 2001 From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com> Date: Thu, 15 Jul 2021 20:05:06 +0200 Subject: [PATCH] add url to sout --- .../extractor/services/youtube/YoutubeThrottlingDecoder.java | 5 +++-- .../services/youtube/extractors/YoutubeStreamExtractor.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeThrottlingDecoder.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeThrottlingDecoder.java index 975df002a..2a429d4e6 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeThrottlingDecoder.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeThrottlingDecoder.java @@ -15,6 +15,7 @@ import java.util.regex.Pattern; public class YoutubeThrottlingDecoder { private static final String HTTPS = "https:"; + private static final String N_PARAM_REGEX = "[&?]n=([^&]+)"; private final String functionName; private final String function; @@ -85,7 +86,7 @@ public class YoutubeThrottlingDecoder { } public String parseNParam(String url) throws Parser.RegexException { - Pattern nValuePattern = Pattern.compile("[&?]n=([^&]+)"); + Pattern nValuePattern = Pattern.compile(N_PARAM_REGEX); return Parser.matchGroup1(nValuePattern, url); } @@ -95,7 +96,7 @@ public class YoutubeThrottlingDecoder { } public String replaceNParam(String url, String newValue) { - Pattern nValuePattern = Pattern.compile("[&?]n=([^&]+)"); + Pattern nValuePattern = Pattern.compile(N_PARAM_REGEX); return nValuePattern.matcher(url).replaceFirst(newValue); } } 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 55ba96a41..27d5607eb 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 @@ -534,7 +534,7 @@ public class YoutubeStreamExtractor extends StreamExtractor { String newNParam = throttlingDecoder.decodeNParam(oldNParam); String newUrl = throttlingDecoder.replaceNParam(url, newNParam); - System.out.println("aaaaaa " + oldNParam + " - " + newNParam); + System.out.println("aaaaaa " + url + " - " + oldNParam + " - " + newNParam); final VideoStream videoStream = new VideoStream(newUrl, false, itag); if (!Stream.containSimilarStream(videoStream, videoStreams)) { videoStreams.add(videoStream);