Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

- changed icon again

Browse source 
- made ActionBarHandler not be a singelton anymore
 - fixed go back bug for the "Next Video" thing
 - fixed opening youtube mobile links
This commit is contained in:
Christian Schabesberger 2015-10-29 17:56:35 +01:00
parent ab4d626ea9
commit c22c2009d4
14 changed files with 682 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
View file

@ -98,9 +98,13 @@ public class YoutubeExtractor implements Extractor {
try {
URI uri = new URI(videoUrl);
if(uri.getHost().contains("youtube")) {
String fragment = uri.getFragment();
fragment = fragment.replace("/watch?", "");
String queryElements[] = fragment.split("&");
String query = uri.getFragment();
if(query == null) {
query = uri.getQuery();
} else {
query = query.replace("/watch?", "");
}
String queryElements[] = query.split("&");
Map<String, String> queryArguments = new HashMap<>();
for (String e : queryElements) {
String[] s = e.split("=");
@ -181,8 +185,6 @@ public class YoutubeExtractor implements Extractor {
videoInfo.thumbnail_url = playerArgs.getString("thumbnail_url");
videoInfo.duration = playerArgs.getInt("length_seconds");
videoInfo.average_rating = playerArgs.getString("avg_rating");
// View Count will be extracted from html
dashManifest = playerArgs.getString("dashmpd");
String playerUrl = ytAssets.getString("js");
if(playerUrl.startsWith("//")) {
playerUrl = "https:" + playerUrl;
@ -192,7 +194,14 @@ public class YoutubeExtractor implements Extractor {
}
// extract audio
videoInfo.audioStreams = parseDashManifest(dashManifest, decryptionCode);
try {
dashManifest = playerArgs.getString("dashmpd");
videoInfo.audioStreams = parseDashManifest(dashManifest, decryptionCode);
} catch (Exception e) {
//todo: check if the following statement is true
Log.e(TAG, "Dash manifest seems not to bee available.");
e.printStackTrace();
}
//------------------------------------
// extract video stream url