Merge pull request #151 from ovnisoftware/master

Applied Kimmax's issue #150 fix
flagbug · Nov 17, 2015 · ec58da9 · ec58da9
2 parents 3b6165f + 6126488
commit ec58da9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/YoutubeExtractor/YoutubeExtractor/Decipherer.cs b/YoutubeExtractor/YoutubeExtractor/Decipherer.cs
@@ -9,7 +9,7 @@ internal static class Decipherer
     {
         public static string DecipherWithVersion(string cipher, string cipherVersion)
         {
-            string jsUrl = string.Format("http://s.ytimg.com/yts/jsbin/html5player-{0}.js", cipherVersion);
+            string jsUrl = string.Format("http://s.ytimg.com/yts/jsbin/player-{0}.js", cipherVersion);
             string js = HttpHelper.DownloadString(jsUrl);
 
             //Find "C" in this: var A = B.sig||C (B.s)
@@ -22,9 +22,8 @@ public static string DecipherWithVersion(string cipher, string cipherVersion)
                 funcName = "\\" + funcName; //Due To Dollar Sign Introduction, Need To Escape
             }
 
-            string funcBodyPattern = @"(?<brace>{([^{}]| ?(brace))*})";  //Match nested angle braces
-            string funcPattern = string.Format(@"{0}\(\w+\){1}", @funcName, funcBodyPattern); //Escape funcName string
-            var funcBody = Regex.Match(js, funcPattern).Groups["brace"].Value; //Entire sig function
+            string funcPattern = @"var " + @funcName + @"=function\(\w+\)\{.*?\};"; //Escape funcName string
+            var funcBody = Regex.Match(js, funcPattern).Value; //Entire sig function
             var lines = funcBody.Split(';'); //Each line in sig function
 
             string idReverse = "", idSlice = "", idCharSwap = ""; //Hold name for each cipher method

diff --git a/YoutubeExtractor/YoutubeExtractor/DownloadUrlResolver.cs b/YoutubeExtractor/YoutubeExtractor/DownloadUrlResolver.cs
@@ -230,7 +230,7 @@ private static string GetDecipheredSignature(string htmlPlayerVersion, string si
 
         private static string GetHtml5PlayerVersion(JObject json)
         {
-            var regex = new Regex(@"html5player-(.+?)\.js");
+            var regex = new Regex(@"player-(.+?).js");
 
             string js = json["assets"]["js"].ToString();