be-gay-do-crimes
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Releases Wiki Activity

rename folder to subpath

This commit is contained in:
bopol 2021-02-13 22:22:50 +01:00
parent 8db40db4de
commit ee2012c948
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeStreamLinkHandlerFactory.java
View File

@ -40,7 +40,7 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
private static final Pattern YOUTUBE_VIDEO_ID_REGEX_PATTERN = Pattern.compile("^([a-zA-Z0-9_-]{11})"); private static final Pattern YOUTUBE_VIDEO_ID_REGEX_PATTERN = Pattern.compile("^([a-zA-Z0-9_-]{11})");
private static final YoutubeStreamLinkHandlerFactory instance = new YoutubeStreamLinkHandlerFactory(); private static final YoutubeStreamLinkHandlerFactory instance = new YoutubeStreamLinkHandlerFactory();
private static final List<String> folders = Arrays.asList("embed/", "shorts/", "watch/", "v/", "w/"); private static final List<String> subpaths = Arrays.asList("embed/", "shorts/", "watch/", "v/", "w/");
private YoutubeStreamLinkHandlerFactory() { private YoutubeStreamLinkHandlerFactory() {
} }
@ -153,7 +153,7 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
return assertIsId(viewQueryValue); return assertIsId(viewQueryValue);
} }
String maybeId = getIdFromFoldersInPath(path); String maybeId = getIdFromSubpathsInPath(path);
if (maybeId != null) return maybeId; if (maybeId != null) return maybeId;
String viewQueryValue = Utils.getQueryValue(url, "v"); String viewQueryValue = Utils.getQueryValue(url, "v");
@ -195,7 +195,7 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
return assertIsId(viewQueryValue); return assertIsId(viewQueryValue);
} }
} }
String maybeId = getIdFromFoldersInPath(path); String maybeId = getIdFromSubpathsInPath(path);
if (maybeId != null) return maybeId; if (maybeId != null) return maybeId;
String viewQueryValue = Utils.getQueryValue(url, "v"); String viewQueryValue = Utils.getQueryValue(url, "v");
@ -222,10 +222,10 @@ public class YoutubeStreamLinkHandlerFactory extends LinkHandlerFactory {
} }
} }
private String getIdFromFoldersInPath(String path) throws ParsingException { private String getIdFromSubpathsInPath(String path) throws ParsingException {
for (final String folder : folders) { for (final String subpath : subpaths) {
if (path.startsWith(folder)) { if (path.startsWith(subpath)) {
String id = path.substring(folder.length()); String id = path.substring(subpath.length());
return assertIsId(id); return assertIsId(id);
} }
} }