Fix decipher

Author: iamtorsten

YoutubeExtractor/ExampleApplication/Program.cs

@@ -89,19 +89,16 @@ private static void DownloadVideo(IEnumerable<VideoInfo> videoInfos)
         private static void Main()
         {
             // Our test youtube link
-            const string link = "https://www.youtube.com/watch?v=D92-DmVmB8Y";
+            //const string link = "https://www.youtube.com/watch?v=D92-DmVmB8Y"; // -> needs deciphering
+
+            const string link = "https://www.youtube.com/watch?v=2a4Uxdy9TQY"; // -> needs no deciphering
 
             /*
              * Get the available video formats.
              * We'll work with them in the video and audio download examples.
              */
             IEnumerable<VideoInfo> videoInfos = DownloadUrlResolver.GetDownloadUrls(link, false);
 
-            foreach (var x in videoInfos)
-            {
-                Console.WriteLine(x.DownloadUrl);
-            }
-
             //DownloadAudio(videoInfos);
             DownloadVideo(videoInfos);
         }

YoutubeExtractor/YoutubeExtractor/Decipherer.cs

@@ -13,7 +13,7 @@ public static string DecipherWithVersion(string cipher, string cipherVersion)
             string js = HttpHelper.DownloadString(jsUrl);
 
             //Find "yv" in this: c&&a.set(b,encodeURIComponent(yv(
-            string functNamePattern = @"\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*([\w$]+)\("; //Regex Formed To Find Word or DollarSign
+            string functNamePattern = @"(\w+)=function\(\w+\){(\w+)=\2\.split\(\x22{2}\);.*?return\s+\2\.join\(\x22{2}\)}"; //Regex Formed To Find Word or DollarSign
 
             var funcName = Regex.Match(js, functNamePattern).Groups[1].Value;
 
@@ -22,7 +22,7 @@ public static string DecipherWithVersion(string cipher, string cipherVersion)
                 funcName = "\\" + funcName; //Due To Dollar Sign Introduction, Need To Escape
             }
 
-            string funcPattern = @"(?!h\.)" + @funcName + @"=function\(\w+\)\{.*?\}"; //Escape funcName string
+            string funcPattern = @"(?!h\.)" + @funcName + @"=function\(\w+\)\{(.*?)\}"; //Escape funcName string
             var funcBody = Regex.Match(js, funcPattern, RegexOptions.Singleline).Value; //Entire sig function
             var lines = funcBody.Split(';'); //Each line in sig function