Update YouTubeExtractor.java

Author: CROprogrammer

youtubeExtractor/src/main/java/at/huber/youtubeExtractor/YouTubeExtractor.java

@@ -82,6 +82,7 @@ public abstract class YouTubeExtractor extends AsyncTask<String, Void, SparseArr
     private static final Pattern patFunction = Pattern.compile("([{; =])([a-zA-Z$_][a-zA-Z0-9$]{0,2})\\(");
 
     private static final Pattern patDecryptionJsFile = Pattern.compile("\\\\/s\\\\/player\\\\/([^\"]+?)\\.js");
+    private static final Pattern patDecryptionJsFileWithoutSlash = Pattern.compile("/s/player/([^\"]+?).js");
     private static final Pattern patSignatureDecFunction = Pattern.compile("(?:\\b|[^a-zA-Z0-9$])([a-zA-Z0-9$]{2})\\s*=\\s*function\\(\\s*a\\s*\\)\\s*\\{\\s*a\\s*=\\s*a\\.split\\(\\s*\"\"\\s*\\)");
 
     private static final SparseArray<Format> FORMAT_MAP = new SparseArray<>();
@@ -310,6 +311,8 @@ private SparseArray<YtFile> getStreamUrls() throws IOException, InterruptedExcep
             encSignatures = new SparseArray<>();
 
             mat = patDecryptionJsFile.matcher(streamMap);
+            if(!mat.find())
+                mat = patDecryptionJsFileWithoutSlash.matcher(streamMap);
             if (mat.find()) {
                 curJsFileName = mat.group(0).replace("\\/", "/");
                 if (decipherJsFileName == null || !decipherJsFileName.equals(curJsFileName)) {
@@ -340,6 +343,10 @@ private SparseArray<YtFile> getStreamUrls() throws IOException, InterruptedExcep
                     mat2 = patEncSig.matcher(cipher);
                     if (mat2.find()) {
                         sig = URLDecoder.decode(mat2.group(1), "UTF-8");
+                        sig = sig.replace("\u0026", "&");
+                        String[] test = sig.split("&");
+                        sig = test[0];
+                        Log.d(LOG_TAG, "SIG:"+sig);
                     } else {
                         continue;
                     }