implement worker

2 files changed, 127 insertions, 48 deletions

diff --git a/modules/libDLImage.js b/modules/libDLImage.js
new file mode 100644
index 0000000..b2dabda
--- /dev/null
+++ b/modules/libDLImage.js
@@ -0,0 +1,39 @@
+var JSONMessage;
+var xhrImg;
+
+function trueImage(){
+  var instream=xhrImg.responseText;
+  self.postMessage(
+    {'status':'normal','message':instream,'savePath':JSONMessage.savePath}
+  );
+  return;
+};
+
+function falseImage(){
+  self.postMessage({'status':'error','message':'IMAGE FILE ACCEPT ERROR!!'});
+  return false;
+};
+
+function downloadImage(){
+  xhrImg=new XMLHttpRequest();
+  xhrImg.addEventListener("load",trueImage,false);
+  xhrImg.addEventListener("error",falseImage,false);
+  xhrImg.open("GET",JSONMessage.imageUrl,false);
+  xhrImg.overrideMimeType('text/plain;charset=x-user-defined');
+  if(0<JSONMessage.refererUrl.length){
+    xhrImg.setRequestHeader('Referer',JSONMessage.refererUrl);
+  };
+  if(0<JSONMessage.cookie){
+    xhrImg.setRequestHeader('Cookie',JSONMessage.cookie);
+  };
+  xhrImg.send(null);
+};
+
+addEventListener("message",function(event){
+  JSONMessage=JSON.parse(event.data);
+  if(JSONMessage.imageUrl===undefined||JSONMessage.savePath===undefined){
+    self.postMessage({'status':'error','message':'PARAMETA ERROR!!'});
+    return false;
+  }
+  downloadImage();
+}, false);
diff --git a/pixiv.js b/pixiv.js
index 5185535..d0a4dd4 100644
--- a/pixiv.js
+++ b/pixiv.js
@@ -1,12 +1,12 @@
 // INFO //
 var INFO =
-<plugin name="pixiv.js" version="0.6"
+<plugin name="pixiv.js" version="0.7"
         summary="Download image from pixiv"
         href="http://github.com/vimpr/vimperator-plugins/blob/master/pixiv.js"
         xmlns="http://vimperator.org/namespaces/liberator">
   <author email="mitsugu.oyama@gmail.com">Mitsugu Oyama</author>
   <license href="http://opensource.org/licenses/mit-license.php">MIT</license>
-  <project name="Vimperator" minVersion="2.3"/>
+  <project name="Vimperator" minVersion="3.2"/>
   <p>
     You can save image from pixiv by this plugin.
   </p>
@@ -15,6 +15,7 @@ var INFO =
     <spec>:pixiv</spec>
     <description>
       <p>You can save image from <link topic="http://www.pixiv.net/">pixiv</link> by this plugin.</p>
+      <p>You need libDLImage.js under of plugin/modules.</p>
       <p>You must login pixiv.</p>
     </description>
   </item>
@@ -34,8 +35,55 @@ commands.addUserCommand(
       return false;
     }
 
-    let Cc=Components.classes;
-    let Ci=Components.interfaces;
+    const Cc=Components.classes;
+    const Ci=Components.interfaces;
+
+    let createWorker=function(fileName){
+      let ret;
+      const resourceName="vimp-plugin";
+      const ioService=Cc["@mozilla.org/network/io-service;1"]
+                        .getService(Ci.nsIIOService); 
+      const resProt=ioService.getProtocolHandler("resource")  
+                      .QueryInterface(Ci.nsIResProtocolHandler);
+      let pluginDirs=io.getRuntimeDirectories("plugin");
+      if (pluginDirs.length === 0){
+        return null;
+      }
+      resProt.setSubstitution(resourceName,ioService.newFileURI(pluginDirs[0]));
+      try {
+        worker=new ChromeWorker("resource://"+resourceName+"/modules/"+fileName);
+      }catch(e){
+        return null;
+      }
+      return worker;
+    };
+    let worker=createWorker('libDLImage.js');
+    if(worker==null){
+      liberator.echoerr('plugin directory is not found');
+      return false;
+    }
+    worker.addEventListener('message',function(event){  
+      if(event.data.status=='error'){
+        liberator.echoerr(event.data.message);
+        return false;
+      };
+      let instream=event.data.message;
+      let savePath=event.data.savePath;
+      let aFile=Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+      aFile.initWithPath(savePath);
+      let outstream=Cc["@mozilla.org/network/safe-file-output-stream;1"]
+        .createInstance(Ci.nsIFileOutputStream);
+      outstream.init(aFile,0x02|0x08|0x20,0664,0);
+      outstream.write(instream,instream.length);
+      if (outstream instanceof Ci.nsISafeOutputStream) {
+        outstream.finish();
+      }else{
+        outstream.close();
+      }
+    },false);
+    worker.addEventListener('error',function(event){  
+      liberator.echoerr(event.data.status);
+    },false);
 
     let id;
     if(-1==contents.URL.search(/\&from_sid=/i)){
@@ -125,59 +173,48 @@ commands.addUserCommand(
     };
 
     let imgUrl;
+    let destPath;
 
-    let truePixivImg=function(){
-      let fileName=imgUrl.substr(imgUrl.lastIndexOf('/'));
-      if (-1!=fileName.indexOf('?')){
-        fileName=fileName.substr(0,fileName.indexOf('?'));
-      }
-      let tmpPath=saveDirectory+fileName;
-      let instream=xhrImg.responseText;
-      let aFile=Cc["@mozilla.org/file/local;1"]
-        .createInstance(Ci.nsILocalFile);
-      aFile.initWithPath(tmpPath);
+    let saveImage=function(){
+      let objMessage={
+        imageUrl  :'',
+        savePath  :'',
+        refererUrl:'',
+        cookie    :''
+      };
+      objMessage.imageUrl=imgUrl;
+      objMessage.savePath=destPath;
+      objMessage.refererUrl=contents.URL;
+      objMessage.cookie=cookie;
+      let JSONmessage=JSON.stringify(objMessage);
+      worker.postMessage(JSONmessage);
+    };
+
+    let getDestPath=function(url){
+      let fname=url.substr(url.lastIndexOf('/')+1);
+      let path=saveDirectory+'/'+fname;
+      let aFile=Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+      let newPath=path;
+      aFile.initWithPath(path);
       if(true===aFile.exists()){
-        let value=window.prompt('すでに同じ名前のファイルがあります。デフォルトファイル名を変更してください。',fileName.substr(1));
+        let value=window.prompt('すでに同じ名前のファイルがあります。デフォルトファイル名を変更してください。',fname);
         if(null===value){
-          return false;
+          return "";
+        };
+        if(fname!=value){
+          newPath=saveDirectory+'/'+value;
         }
-        fileName='/'+value;
-        tmpPath=saveDirectory+fileName;
-        aFile.initWithPath(tmpPath);
-      }
-      let outstream=Cc["@mozilla.org/network/safe-file-output-stream;1"]
-        .createInstance(Ci.nsIFileOutputStream);
-      outstream.init(aFile,0x02|0x08|0x20,0664,0);
-      outstream.write(instream,instream.length);
-      if (outstream instanceof Ci.nsISafeOutputStream) {
-        outstream.finish();
-      }else{
-        outstream.close();
       }
-    };
-
-    let falsePixivImg=function(){
-      liberator.echoerr("Image file accept error.");
-      return false;
-    };
-
-    let saveImage=function(){
-      xhrImg=Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
-        .createInstance();
-      xhrImg.QueryInterface(Ci.nsIDOMEventTarget);
-      xhrImg.addEventListener("load",truePixivImg,false);
-      xhrImg.addEventListener("error",falsePixivImg,false);
-      xhrImg.QueryInterface(Ci.nsIXMLHttpRequest);
-      xhrImg.open("GET",imgUrl,false);
-      xhrImg.overrideMimeType('text/plain;charset=x-user-defined');
-      xhrImg.setRequestHeader('Referer',contents.URL);
-      xhrImg.setRequestHeader('Cookie',cookie);
-      xhrImg.send(null);
+      return newPath;
     };
 
     let saveImageFile=function(){
       imgUrl=getImageUrl(xhrImgInfo.responseText);
       if(0<imgUrl.length){
+        destPath=getDestPath(imgUrl);
+        if(destPath.length<=0){
+          return false;
+        };
         saveImage();
       }else{
         liberator.echoerr("You should login pixiv :<");
@@ -228,6 +265,10 @@ commands.addUserCommand(
           if(-1!=pnt){
             imgUrl=imgUrl.substr(0,pnt);
           }
+          destPath=getDestPath(imgUrl);
+          if(destPath.length<=0){
+            continue;
+          };
           saveImage();
         }
       }else{
@@ -261,6 +302,5 @@ commands.addUserCommand(
     xhrImgInfo.setRequestHeader('Referer',contents.URL);
     xhrImgInfo.setRequestHeader('Cookie',cookie);
     xhrImgInfo.send(null);
-
   }
 );