picosh 0.1.2 → 0.1.4

package/index.js

@@ -7,31 +7,29 @@ const https = require('https');
 const http = require('http');
 
 const SAVE_DIR = path.join(os.tmpdir(), 'picosh');
+const SAVE_PATH = path.join(SAVE_DIR, 'clip_latest.png');
 
-function saveClipboardImage(clipboard) {
-  const img = clipboard.readImage();
-  if (!img.isEmpty()) {
-    fs.mkdirSync(SAVE_DIR, {recursive: true});
-    const filepath = path.join(SAVE_DIR, `clip_${Date.now()}.png`);
-    fs.writeFileSync(filepath, img.toPNG());
-    return Promise.resolve(filepath);
-  }
-
+function hasImage(clipboard) {
+  if (!clipboard.readImage().isEmpty()) return {type: 'bitmap'};
   const html = clipboard.readHTML();
   if (html) {
     const match = html.match(/<img[^>]+src=["']([^"']+)["']/i);
-    if (match) {
-      return downloadImage(match[1]);
-    }
+    if (match) return {type: 'url', src: match[1]};
   }
+  return null;
+}
 
-  return Promise.resolve(null);
+function saveBitmap(clipboard) {
+  fs.mkdirSync(SAVE_DIR, {recursive: true});
+  const filepath = SAVE_PATH;
+  fs.writeFileSync(filepath, clipboard.readImage().toPNG());
+  return Promise.resolve(filepath);
 }
 
 function downloadImage(url) {
   return new Promise((resolve) => {
     fs.mkdirSync(SAVE_DIR, {recursive: true});
-    const filepath = path.join(SAVE_DIR, `clip_${Date.now()}.png`);
+    const filepath = SAVE_PATH;
     const file = fs.createWriteStream(filepath);
     const client = url.startsWith('https') ? https : http;
 
@@ -53,11 +51,18 @@ exports.decorateTerm = (Term, {React}) => {
 
         try {
           const {clipboard} = require('electron');
-          saveClipboardImage(clipboard).then((filepath) => {
-            if (!filepath) return;
-            e.preventDefault();
-            e.stopPropagation();
-            if (this.props.onData) {
+          const found = hasImage(clipboard);
+          if (!found) return;
+
+          e.preventDefault();
+          e.stopPropagation();
+
+          const save = found.type === 'bitmap'
+            ? saveBitmap(clipboard)
+            : downloadImage(found.src);
+
+          save.then((filepath) => {
+            if (filepath && this.props.onData) {
               this.props.onData(filepath);
             }
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picosh",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Hyper plugin: paste clipboard images as file paths",
   "main": "index.js",
   "license": "MIT",