mirror
/
NewPipe
kopia lustrzana https://github.com/TeamNewPipe/NewPipe
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

added check and exception reporting to YoutubeExtractor:matchGroup1, so that a failed match doesn't go unnoticed

pull/73/head
Adam Howard 2015-11-04 00:29:30 +00:00
rodzic 59e512a64d
commit fc32377ce7
1 zmienionych plików z 11 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
Wyświetl plik

@ -154,9 +154,8 @@ public class YoutubeExtractor implements Extractor {
JSONObject ytAssets = null; JSONObject ytAssets = null;
String dashManifest; String dashManifest;
{ {
String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", site);
try { try {
String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", site);
JSONObject jsonObj = new JSONObject(jsonString); JSONObject jsonObj = new JSONObject(jsonString);
playerArgs = jsonObj.getJSONObject("args"); playerArgs = jsonObj.getJSONObject("args");
ytAssets = jsonObj.getJSONObject("assets"); ytAssets = jsonObj.getJSONObject("assets");
@ -461,7 +460,15 @@ public class YoutubeExtractor implements Extractor {
private String matchGroup1(String pattern, String input) { private String matchGroup1(String pattern, String input) {
Pattern pat = Pattern.compile(pattern); Pattern pat = Pattern.compile(pattern);
Matcher mat = pat.matcher(input); Matcher mat = pat.matcher(input);
mat.find(); boolean foundMatch = mat.find();
return mat.group(1); if(foundMatch){
return mat.group(1);
}
else {
Log.e(TAG, "failed to find pattern \""+pattern+"\"");
new Exception("failed to find pattern \""+pattern+"\"").printStackTrace();
return "";
}
} }
} }