added Extraction of Age restricted videos

nhCoder · Jan 7, 2020 · 5bb0f4b · 5bb0f4b
1 parent 1659728
commit 5bb0f4b
Show file tree

Hide file tree

Showing 79 changed files with 18 additions and 7 deletions.
diff --git a/YoutubeExtractor/app/build/bin/app.apk b/YoutubeExtractor/app/build/bin/app.apk
diff --git a/YoutubeExtractor/app/build/bin/classes.dex b/YoutubeExtractor/app/build/bin/classes.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/adrt/ADRTLogCatReader.dex b/YoutubeExtractor/app/build/bin/classesrelease/adrt/ADRTLogCatReader.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/adrt/ADRTSender.dex b/YoutubeExtractor/app/build/bin/classesrelease/adrt/ADRTSender.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$anim.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$anim.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$attr.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$attr.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$bool.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$bool.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$color.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$color.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$dimen.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$dimen.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$drawable.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$drawable.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$id.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$id.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$integer.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$integer.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$layout.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$layout.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$string.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$string.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$style.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$style.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$styleable.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R$styleable.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R.dex b/YoutubeExtractor/app/build/bin/classesrelease/android/support/v7/appcompat/R.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/BuildConfig.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/BuildConfig.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/CipherManager.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/CipherManager.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/ExtractorException.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/ExtractorException.dex
diff --git a/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000000.dex b/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000000.dex
diff --git a/.../app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000002$100000001.dex b/.../app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000002$100000001.dex
diff --git a/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000002.dex b/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000002.dex
diff --git a/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000003.dex b/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity$100000003.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/MainActivity.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$anim.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$anim.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$attr.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$attr.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$bool.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$bool.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$color.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$color.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$dimen.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$dimen.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$drawable.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$drawable.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$id.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$id.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$integer.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$integer.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$layout.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$layout.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$string.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$string.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$style.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$style.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$styleable.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R$styleable.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/R.dex
diff --git a/...ild/bin/classesrelease/com/naveed/ytextractor/YoutubeStreamExtractor$ExtractorListner.dex b/...ild/bin/classesrelease/com/naveed/ytextractor/YoutubeStreamExtractor$ExtractorListner.dex
diff --git a/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/YoutubeStreamExtractor.dex b/...eExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/YoutubeStreamExtractor.dex
diff --git a/...uild/bin/classesrelease/com/naveed/ytextractor/model/PlayerResponse$PlayabilityStatus.dex b/...uild/bin/classesrelease/com/naveed/ytextractor/model/PlayerResponse$PlayabilityStatus.dex
diff --git a/...ubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/PlayerResponse.dex b/...ubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/PlayerResponse.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/Response$Args.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/Response$Args.dex
diff --git a/...beExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/Response$Assets.dex b/...beExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/Response$Assets.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/Response.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/Response.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/StreamingData.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/StreamingData.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YTMedia.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YTMedia.dex
diff --git a/...actor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YoutubeMeta$Thumbnail.dex b/...actor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YoutubeMeta$Thumbnail.dex
diff --git a/...ctor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YoutubeMeta$Thumbnail_.dex b/...ctor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YoutubeMeta$Thumbnail_.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YoutubeMeta.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/model/YoutubeMeta.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/ContextUtils.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/ContextUtils.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/HTTPUtility.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/HTTPUtility.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/LogUtils.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/LogUtils.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/RegexUtils.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/RegexUtils.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/Utils.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/utils/Utils.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$anim.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$anim.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$attr.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$attr.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$bool.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$bool.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$color.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$color.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$dimen.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$dimen.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$drawable.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$drawable.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$id.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$id.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$integer.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$integer.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$layout.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$layout.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$string.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$string.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$style.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$style.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$styleable.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R$styleable.dex
diff --git a/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/universalvideoview/R.dex
diff --git a/YoutubeExtractor/app/build/bin/jardex/gson-2.8.5.jar.dex b/YoutubeExtractor/app/build/bin/jardex/gson-2.8.5.jar.dex
diff --git a/YoutubeExtractor/app/build/bin/jardex/rhino-1.7R4.jar.dex b/YoutubeExtractor/app/build/bin/jardex/rhino-1.7R4.jar.dex
diff --git a/YoutubeExtractor/app/build/bin/jardex/support-annotations-23.0.0.jar.dex b/YoutubeExtractor/app/build/bin/jardex/support-annotations-23.0.0.jar.dex
diff --git a/YoutubeExtractor/app/build/bin/res/drawable-hdpi/ic_launcher.png b/YoutubeExtractor/app/build/bin/res/drawable-hdpi/ic_launcher.png
diff --git a/YoutubeExtractor/app/build/bin/res/drawable-mdpi/ic_launcher.png b/YoutubeExtractor/app/build/bin/res/drawable-mdpi/ic_launcher.png
diff --git a/YoutubeExtractor/app/build/bin/res/drawable-xhdpi/ic_launcher.png b/YoutubeExtractor/app/build/bin/res/drawable-xhdpi/ic_launcher.png
diff --git a/YoutubeExtractor/app/build/bin/res/drawable-xxhdpi/ic_launcher.png b/YoutubeExtractor/app/build/bin/res/drawable-xxhdpi/ic_launcher.png
diff --git a/YoutubeExtractor/app/build/bin/resources.ap_ b/YoutubeExtractor/app/build/bin/resources.ap_
diff --git a/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/MainActivity.java b/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/MainActivity.java
@@ -145,7 +145,7 @@ public void onExtractionGoesWrong(final ExtractorException e) {
 
 
 											   }
-										   }).Extract(edit.getText().toString());
+										   }).useDefaultLogin().Extract(edit.getText().toString());
 
 								   }
 							   }));

diff --git a/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/YoutubeStreamExtractor.java b/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/YoutubeStreamExtractor.java
@@ -43,6 +43,7 @@ public class YoutubeStreamExtractor extends AsyncTask<String,Void,Void> {
 
 
 
+
 	public YoutubeStreamExtractor(ExtractorListner EL) {
 		this.listener = EL;
 		Headers.put("Accept-Language", "en");
@@ -52,6 +53,12 @@ public void setHeaders(Map<String, String> headers) {
 		Headers = headers;
 	}
 
+	public YoutubeStreamExtractor useDefaultLogin() {
+		Headers.put("Cookie", Utils.loginCookie);
+		setHeaders(Headers);
+		return this;
+	}
+
 	public Map<String, String> getHeaders() {
 		return Headers;
 	}
@@ -159,14 +166,14 @@ private List<YTMedia> parseUrls(YTMedia[] rawMedia) {
 					String decodedSig = "";
 					for (String partCipher:media.getCipher().split("&")) {
 
-						
-						
+
+
 						if (partCipher.startsWith("s=")) {
 							decodedSig = CipherManager.dechiperSig(URLDecoder.decode(partCipher.replace("s=", "")), response.getAssets().getJs());
 						}
 
 						if (partCipher.startsWith("url=")) {
-							 tempUrl=URLDecoder.decode(partCipher.replace("url=", ""));
+							tempUrl = URLDecoder.decode(partCipher.replace("url=", ""));
 
 							for (String url_part:tempUrl.split("&")) {
 								if (url_part.startsWith("s=")) {
@@ -175,11 +182,11 @@ private List<YTMedia> parseUrls(YTMedia[] rawMedia) {
 							}
 						}
 					}
-						
+
 					String	FinalUrl= tempUrl + "&sig=" + decodedSig;
 					media.setUrl(FinalUrl);
 					links.add(media);
-					
+
 
 				} else {
 					links.add(media);
@@ -194,7 +201,7 @@ private List<YTMedia> parseUrls(YTMedia[] rawMedia) {
 		return links;
 	}
 
-	
+
 
 
 

diff --git a/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/utils/Utils.java b/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/utils/Utils.java
@@ -9,6 +9,10 @@
 
 public class Utils {
 
+	public static String loginCookie="SID=sQebaLqpbk6gtBslCoKf2QMlnsSGyHZ10Ape5KC4w6A2xNcwmoB-l1xew71X6vvjm4D7Yw.;__Secure-3PSID=sQebaLqpbk6gtBslCoKf2QMlnsSGyHZ10Ape5KC4w6A2xNcwYZWWACA_8IrlbEWauUE_Wg.;HSID=AZIcZ8BttTa33E_1m;SSID=AfAdb5xkm4o5xYY0Y;APISID=mhQXsz03mKxKRJ2a/AFVQUDIGbgnQtpUWj;SAPISID=DyN8WKX8Y8mKkr3w/A9hFkEgGGnKgh5R-Y;__Secure-HSID=AZIcZ8BttTa33E_1m;__Secure-SSID=AfAdb5xkm4o5xYY0Y;__Secure-APISID=mhQXsz03mKxKRJ2a/AFVQUDIGbgnQtpUWj;__Secure-3PAPISID=DyN8WKX8Y8mKkr3w/A9hFkEgGGnKgh5R-Y;CONSENT=YES+en+202001;VISITOR_INFO1_LIVE=4Hp4-x4BFMQ;YSC=bNQ8TA61Fu8;GPS=1;LOGIN_INFO=AFmmF2swRgIhAL6ujtG8K3M0a4xThywxj4q3WGcotlfzfQlB2te4wgwIAiEAihKRgpgxwjvwSoiinpkywMoA6bkm-gWp7pycMJSAwgU:QUQ3MjNmekZ5SGU3YUZhT1NlN3lQcV9hQnY2ZjZuRjRUblpjT09QdEozZ3hQY0ZyN0lkU0tKeURhc2R4b3luR3BUQTQzOVpLNHpjTkxSa1JmVEh5Qll6RVhfT1JEOU9VYTZkV0RobDN1cTJhZEtHV2FYZWt1dUs3TEJUenpGSnlkeFUzdVNIREk0cjVGeGYtU0RDVDR1OXhCTUh6UXlzX3JyN0FRVDhhREM5ZW82M09qWHNXeVFr;SIDCC=AN0-TYs22Wg_H5D4kzTjQgEFunRGQljZGxdNtosqFUrGVHU-qRIHF6PFHovUG9S9pE333EZd";
+
+
+
 	public static List<YTMedia> filterInvalidLinks(List<YTMedia> urls) {
 		List<YTMedia> workingLinks=new ArrayList<>();
 		for (YTMedia media:urls) {
-Original file line number
+Diff line change
@@ Expand Up @@
     											   }
-    										   }).Extract(edit.getText().toString());
+    										   }).useDefaultLogin().Extract(edit.getText().toString());
     								   }
     							   }));
@@ Expand Down @@