Fixed Extraction of protected videos

nhCoder · Jan 24, 2020 · e29179b · e29179b
1 parent 680b776
commit e29179b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -24,9 +24,9 @@ Copy the classes or compile project.
 - Mozilla Rhino
 - UniversalVideoView(Used only for video testing)
 
-Example
+Usage
 
-```
+```Java
 new YoutubeStreamExtractor(new YoutubeStreamExtractor.ExtractorListner(){ 
 				@Override 
 				public void onExtractionDone(List adativeStream, final List muxedStream, YoutubeMeta meta) {
@@ -43,4 +43,4 @@ new YoutubeStreamExtractor(new YoutubeStreamExtractor.ExtractorListner(){
 
 ## For age restricted Videos
 
-For extraction of age restricted videos use `useDefaultLogin()`  to Use default cookie.. OR YOU CAN override with your own cookies by method `setHeaders` 
+For extraction of age restricted videos use `useDefaultLogin()` to Use default cookie.. OR YOU CAN override with your own cookies by method `setHeaders` 
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/com/naveed/ytextractor/CipherManager.dex b/YoutubeExtractor/app/build/bin/classesrelease/com/naveed/ytextractor/CipherManager.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/...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/src/main/java/com/naveed/ytextractor/CipherManager.java b/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/CipherManager.java
@@ -6,25 +6,29 @@
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.Scriptable;
+import com.naveed.ytextractor.utils.Utils;
 
 public class CipherManager {
 
-	private static final String RegexDesipherFunctionCode="\\{[a-zA-Z]{1,}=[a-zA-Z]{1,}\\.split\\(\"\"\\).*?\\};";
+	private static final String RegexDesipherFunctionCode="\\{[a-zA-Z]{1,}=[a-zA-Z]{1,}.split\\(\"\"\\);[a-zA-Z0-9$]{2}\\.[a-zA-Z0-9$]{2}.*?[a-zA-Z]{1,}.join\\(\"\"\\)\\};";
 	private static final String RegexVarName="[a-zA-Z0-9$]{2}\\.[a-zA-Z0-9$]{2}\\([a-zA-Z]\\,(\\d\\d|\\d)\\)";
 	private static  String RegexFindVarCode="";
 	private static String cachedDechiperFunction=null;
 
 
 
-	private  static String getDecipherCode(String Basejs) {
+	public  static String getDecipherCode(String Basejs) {
 		String DechipherCode;
 		String DecipherFun="decipher=function(a)" + RegexUtils.matchGroup(RegexDesipherFunctionCode, Basejs);
-		String RawName=RegexUtils.matchGroup(RegexVarName, DecipherFun).replace("$","\\$");;
+		//Utils.copyToBoard(Basejs);
+		LogUtils.log("decfun="+DecipherFun);
+		String RawName=RegexUtils.matchGroup(RegexVarName, DecipherFun).replace("$","\\$");
 		String RealVarName=RawName.split("\\.")[0];
 		RegexFindVarCode = "var\\s" + RealVarName + "=.*?\\};";	// Word 1
 		String varCode=RegexUtils.matchGroup(RegexFindVarCode, Basejs);
 		DechipherCode = DecipherFun + "\n" + varCode;
-		//LogUtils.log("code= "+DechipherCode);
+		LogUtils.log("code= "+DechipherCode);
+
 		return DechipherCode;
 	}
 

diff --git a/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/YoutubeStreamExtractor.java b/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/YoutubeStreamExtractor.java
@@ -106,7 +106,7 @@ protected Void doInBackground(String[] ids) {
 
 			PlayerResponse playerResponse=parseJson(jsonBody);
 			ytmeta = playerResponse.getVideoDetails();
-			//Utils.copyToBoard(playerResponse.getStreamingData().);
+			//Utils.copyToBoard(jsonBody);
 			if (playerResponse.getVideoDetails().getisLive()) {
 				parseLiveUrls(playerResponse.getStreamingData());
 			} else {
@@ -122,7 +122,7 @@ protected Void doInBackground(String[] ids) {
 			}
 		}
 		catch (Exception e) {
-			LogUtils.log(Arrays.toString(e.getStackTrace()));// e.toString());
+			LogUtils.log(Arrays.toString(e.getStackTrace()));
 			Ex = new ExtractorException("Error While getting Youtube Data:" + e.getMessage());
 			this.cancel(true);
 		}
@@ -174,7 +174,7 @@ private List<YTMedia> parseUrls(YTMedia[] rawMedia) {
 
 						if (partCipher.startsWith("url=")) {
 							tempUrl = URLDecoder.decode(partCipher.replace("url=", ""));
-
+							
 							for (String url_part:tempUrl.split("&")) {
 								if (url_part.startsWith("s=")) {
 									decodedSig = CipherManager.dechiperSig(URLDecoder.decode(url_part.replace("s=", "")), response.getAssets().getJs());
@@ -184,6 +184,7 @@ private List<YTMedia> parseUrls(YTMedia[] rawMedia) {
 					}
 
 					String	FinalUrl= tempUrl + "&sig=" + decodedSig;
+
 					media.setUrl(FinalUrl);
 					links.add(media);
 

diff --git a/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/model/Response.java b/YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/model/Response.java
@@ -73,7 +73,7 @@ public class Assets {
 	public String getJs() {
 		if(js.startsWith("http")&&js.contains("youtube.com")){
 			return js;
-		}else return "https://youtube.com"+js;
+		}else return "https://www.youtube.com"+js;
 	}
 
 	public void setJs(String js) {