implement drag something from outside

harytfw · Sep 5, 2017 · 30dc6f4 · 30dc6f4
1 parent 77bca56
commit 30dc6f4
Show file tree

Hide file tree

Showing 10 changed files with 399 additions and 143 deletions.
diff --git a/.vscode/formatter.json b/.vscode/formatter.json
@@ -16,7 +16,7 @@
         "unescape_strings": false,
         "wrap_line_length": 0,
         "e4x": false,
-        "end_with_newline": false,
+        "end_with_newline": true,
         "comma_first": false,
         "brace_style": "end-expand"
     },

diff --git a/background.js b/background.js
@@ -2,13 +2,17 @@ var supportCopyImage = false;
 
 const TAB_ID_NONE = browser.tabs.TAB_ID_NONE;
 
+function createObjectURL(blob = new Blob(), removeTime = 1000 * 60 * 5) {
+    const url = window.URL.createObjectURL(blob);
+    setTimeout(u => window.URL.revokeObjectURL(u), removeTime, url); // auto revoke
+    return url
+}
+
 function createBlobObjectURLForText(text = "") {
     let blob = new window.Blob([text], {
         type: "text/plain"
     });
-    let url = window.URL.createObjectURL(blob);
-    setTimeout((u) => window.URL.revokeObjectURL(u), 1000 * 60 * 5, url);
-    return url;
+    return createObjectURL(blob);
 }
 
 const tabsRelation = {
@@ -103,14 +107,28 @@ class ExecutorClass {
     }
     execute() {
         this.action = config.getAct(this.data.actionType, this.data.direction, this.data.modifierKey);
+        let imageFile = null;
         if (this.data.selection.length === 0) {
             return;
         }
+        if (this.data.hasImageBinary) {
+            let array = new Uint8Array(this.data.selection.split(","));
+            imageFile = new File([array], this.data.fileInfo.name, {
+                type: this.data.fileInfo.mime
+            });
+            this.data.selection = createObjectURL(imageFile);
+        }
         switch (this.action.act_name) {
             case commons.ACT_OPEN:
                 if (this.data.actionType === "linkAction" && this.action.open_type === commons.OPEN_IMAGE_LINK && this.data.imageLink !== "") {
                     this.openURL(this.data.imageLink)
                 }
+                else if (this.data.selection.startsWith("blob:")) { // blob url
+                    this.redirector({
+                        url: this.data.selection,
+                        cmd: "open"
+                    })
+                }
                 else {
                     this.openURL(this.data.selection)
                 }
@@ -156,6 +174,9 @@ class ExecutorClass {
                 else if (this.action.search_type === commons.SEARCH_TEXT) {
                     this.searchText(this.data.textSelection);
                 }
+                else if (this.action.search_type === commons.SEARCH_IMAGE) {
+                    this.searchImage(this.data.selection);
+                }
                 else {
                     this.searchText(this.data.selection);
                 }
@@ -206,7 +227,7 @@ class ExecutorClass {
         return index;
     }
 
-    openTab(url) {
+    openTab(url = "") {
         this.previousTabId = this.newTabId = browser.tabs.TAB_ID_NONE; // reset
         if ([commons.TAB_NEW_WINDOW, commons.TAB_NEW_PRIVATE_WINDOW].includes(this.action.tab_pos)) {
             browser.windows.create({
@@ -307,56 +328,39 @@ class ExecutorClass {
         );
     }
 
-    searchImage(url, keyword) { // unused
-        this.openURL(this.searchTemplate.replace("%s", keyword));
+    searchImage(url) {
+        this.redirector({
+            url,
+            cmd: "search",
+            engineName: "baidu",
+            type: this.data.fileInfo.mime
+        })
     }
 
-    searchImageViaUploadImage(engineName, binary) {
-        const form = new FormData();
-        const image = new File(binary);
-        let server = "";
-        if (engineName === "baidu") {
-            server = "http://image.baidu.com/pcdutu/a_upload?fr=html5&target=pcSearchImage&needJson=true";
-            form.append("file", image);
-            fetch(server, {
-                method: "POST",
-                body: form
-            }).then(async(res) => {
-                return res.json();
-            }).then((json) => {
-                if (json.url) this.openTab(`http://image.baidu.com/n/pc_search?queryImageUrl=${json.url}`)
-            }).catch((error) => {
-                console.error(error);
-            })
-        }
-        else if (engineName === "google") {
-            server = "https://www.google.com/searchbyimage/upload";
-            form.append("encoded_image", image);
-            fetch(server, {
-                method: "POST",
-                body: form
-            }).then(async(res) => {
-                return res.json();
-            }).then((json) => {
-                if (json.url) this.openTab(json.url);
-            }).catch((error) => {
-                console.error(error);
-            })
+    redirector(params = {}) {
+        const url = new URL(browser.runtime.getURL(`redirect/redirect.html`));
+        for (const key of Object.keys(params)) {
+            url.searchParams.append(key, params[key]);
         }
+        this.openTab(url.toString());
     }
+
     randomString(length = 8) {
         // https://stackoverflow.com/questions/10726909/random-alpha-numeric-string-in-javascript
         const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         let result = '';
         for (var i = length; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)];
         return result;
     }
-    download(url, filename = "") {
+    download(url = "", filename = "") {
         let opt = {
             url,
             saveAs: this.action.download_saveas
         };
         const directories = config.get("downloadDirectories");
+        if (url.startsWith("blob:") && this.data.fileInfo) {
+            filename = this.data.fileInfo.name || "file.dat";
+        }
         if (this.action.download_type !== commons.DOWNLOAD_TEXT) {
 
             let pathname = new URL(url).pathname;
@@ -464,4 +468,4 @@ function connected(port) {
         }
     }
 }
-browser.runtime.onConnect.addListener(connected);
+browser.runtime.onConnect.addListener(connected);
diff --git a/common.js b/common.js
@@ -242,4 +242,4 @@ const testCheckDragTargetType = () => {
     assert(fn(selection, textSelection, imageLink, target) === commons.TYPE_ELEM, "elem");
 }
 
-// testCheckDragTargetType()
+// testCheckDragTargetType()