[linterna-magica-commit] [315] Merging r314 from trunk to stable branch 0.0.12 to fix bugs #37357.

[Ivaylo Valkov]

Revision: 315
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=315
Author:   valkov
Date:     2012-09-18 06:29:04 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Merging r314 from trunk to stable branch 0.0.12 to fix bugs #37357.

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=314

Ticket Links:
------------
    http://savannah.gnu.org/bugs/?37357

Modified Paths:
--------------
    branches/0.0.12/src/lm_site_youtube.js

Property Changed:
----------------
    branches/0.0.12/


Property changes on: branches/0.0.12
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:287,292
   + /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:287,292,314

Modified: branches/0.0.12/src/lm_site_youtube.js
===================================================================
--- branches/0.0.12/src/lm_site_youtube.js      2012-09-18 06:20:25 UTC (rev 
314)
+++ branches/0.0.12/src/lm_site_youtube.js      2012-09-18 06:29:04 UTC (rev 
315)
@@ -248,6 +248,9 @@
        this.log("LinternaMagica.extract_youtube_fmt_url_map:\n"+
                 "Extracted fmt_url_map.",1);
 
+       this.log("LinternaMagica.extract_youtube_fmt_url_map:\n"+
+                "RAW map variable:"+fmt,5);
+
        // Hash with keys fmt_ids and values video URLs
        var map = new Object();
 
@@ -262,14 +265,16 @@
            // (itag=fmt_id)*url=URL&type=video/...&(itag=fmt_id)*
            var link = fmt[url].match(/url=([^&]+)/);
            var fmt_id = fmt[url].match(/itag=([0-9]+)/);
-
+           var sig = fmt[url].replace(/\\u0026/g, '&').match(/sig=[^&]+/);
+               sig = sig[sig.length-1].replace(/sig/,'signature');
+           
            if (fmt_id && link)
            {
                links++;
                link = unescape(link[link.length-1]);
                link = link.split(/\\u0026/)[0];
 
-               map[fmt_id[fmt_id.length-1]] =  link;
+               map[fmt_id[fmt_id.length-1]] =  link+"&"+sig;
            }
        }