Merge branch '3.6'

1 files changed, 4 insertions, 4 deletions

diff --git a/ldrize_cooperation_fetch_flv.js b/ldrize_cooperation_fetch_flv.js
index 8ba6737..59e9856 100644
--- a/ldrize_cooperation_fetch_flv.js
+++ b/ldrize_cooperation_fetch_flv.js
@@ -1,5 +1,5 @@
 // Last Change: 12-Jun-2009. Jan 2008

-var PLUGIN_INFO =

+var PLUGIN_INFO = xml`

 <VimperatorPlugin>

     <name>{NAME}</name>

     <description>Flv Downloader for Nicovideo</description>

@@ -42,7 +42,7 @@ Flv downloader for nicovideo.
     Nicovideo Mylist of registration destination.

 ||<

     ]]></detail>

-</VimperatorPlugin>;

+</VimperatorPlugin>`;

 

 (function () {

 function Deferred () this instanceof Deferred ? this.init(this) : new Deferred();

@@ -184,7 +184,7 @@ var groupId = liberator.globalVariables.nicovideo_mylist || '';
 

 function NiconicoFlvHandler(url, title) {

     let videoId = url.match(/\w{2}\d+/)[0];

-    let fileName = title.replace(/[?\\*\/:<>|"]/g, '_') + '.flv';

+    let fileName = title.replace(/[?\\*\/:`|"]/g, '_') + '.flv';

 

     Deferred.http.get(nicoApiEndPoint + videoId).next(function(apiResult){

         let flvUrl = decodeURIComponent(apiResult.responseText.match(/url=(.*?)&/)[1]);

@@ -218,7 +218,7 @@ function NiconicoMylistHandler(url, title){
             var csrfToken = getElementsByXPath('//input[@name="csrf_token"]', html)[0].value;

             var mylists = getElementsByXPath('id("mylist_add_group_id")/option', html).map(function(element) [element.innerHTML, element.value]);

 

-            var params = [['ajax', '1'], ['mylist', 'add'], ['mylist_add', '“o˜^'], ['csrf_token', csrfToken], ['group_id', groupId]].map(function(p) p[0] + "=" + encodeURIComponent(p[1])).join("&");

+            var params = [['ajax', '1'], ['mylist', 'add'], ['mylist_add', '登録'], ['csrf_token', csrfToken], ['group_id', groupId]].map(function(p) p[0] + "=" + encodeURIComponent(p[1])).join("&");

             return Deferred.wait(count++ * 5).next(function(est){

                 return Deferred.http.post(nicoWatchEndPoint + videoId, params).next(function(mylistResult){

                         liberator.log(mylistResult.responseText);