From a5610f367bd97ac8009c82cff9c7bceb18fc0bb4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 24 Jun 2020 17:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8C=B9=E9=85=8D=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=96=87=E4=BB=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/index.js   |  4 +++-
 src/assets/options.js | 18 ++++++++++++------
 src/plugin.json       |  8 +++++++-
 src/preload.js        | 21 ++++++++++++++++-----
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/assets/index.js b/src/assets/index.js
index 9e18ed7..aeb5e24 100644
--- a/src/assets/index.js
+++ b/src/assets/index.js
@@ -14,8 +14,10 @@ utools.onPluginEnter(async ({ code, type, payload }) => {
         // $("#options").show();
         showOptions();
     } else if (code == 'code') {
+        var file = ""
         utools.setExpendHeight(600);
-        showCodeEditor()
+        if (type == 'files') file = payload[0].path
+        showCodeEditor(file)
     } else {
         // console.log(new Date().getTime() - window.startTime);
         utools.setExpendHeight(0);
diff --git a/src/assets/options.js b/src/assets/options.js
index 9c47d35..ed09bbd 100644
--- a/src/assets/options.js
+++ b/src/assets/options.js
@@ -23,7 +23,7 @@ let importCommand = () => {
     var options = {
         filters: [{ name: 'json', extensions: ['json'] }, ]
     }
-    var file = openFileInDialog(options, true)
+    var file = getFileInfo({ type: 'dialog', argvs: options, readfile: true })
     if (file) {
         try {
             var pushData = JSON.parse(file.data);
@@ -700,7 +700,7 @@ $("#options").on('click', '#icon, #iconame', function () {
             extensions: ['png']
         }, ]
     }
-    var file = openFileInDialog(options, false)
+    var file = getFileInfo({ type: 'dialog', argvs: options, readfile: false })
     if (file) {
         $("#iconame").val(file.name);
         $("#icon").attr('src', file.path); 
@@ -960,7 +960,7 @@ let highlightIfKnown = ext => {
     if (lang.length) window.editor.setOption("mode", lang[0])
 }
 
-showCodeEditor = () => {
+showCodeEditor = file => {
     let options = `<option>${Object.keys(programs).join('</option><option>')}</option>`
     var customWindow = `<div id="customize">
         <select id="program">
@@ -991,9 +991,15 @@ showCodeEditor = () => {
     $("span.customscript > input").css({"height": "30px"})
     var db = getDB('codeHistory')
     window.editor.setOption("theme", "ambiance")
-    if (db.history) {
-        $('#program').val(db.history.program)
-        window.editor.setValue(db.history.cmd)
+    if (file) {
+        var fileinfo = getFileInfo({ type: 'file', argvs: file, readfile: true })
+        console.log(fileinfo);
+        window.editor.setValue(fileinfo.data)
+        var program = Object.keys(programs).filter(x => `.${programs[x].ext}` == fileinfo.ext)[0]
+        $('#program').val(program)
+        runCurrentCommand()
+    } else {
+        db.history && $('#program').val(db.history.program) && window.editor.setValue(db.history.cmd)
     }
     programCheck()
     $('#program').select2({
diff --git a/src/plugin.json b/src/plugin.json
index 8792543..d698462 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -17,7 +17,13 @@
         {
             "code": "code",
             "explain": "无需打开编辑器，快速运行临时代码",
-            "cmds": [ "运行代码", "RunCode"]
+            "cmds": [ "运行代码", "RunCode", {
+                "type": "files",
+                "label": "运行代码",
+                "fileType": "file",
+                "match": "/\\.(sh|scpt|bat|ps1|py|js|rb|php|c|cs|lua|pl)$/i",
+                "maxNum": 1
+            }]
         }
     ]
 }
\ No newline at end of file
diff --git a/src/preload.js b/src/preload.js
index 2914703..57f979b 100644
--- a/src/preload.js
+++ b/src/preload.js
@@ -356,15 +356,26 @@ getBase64Ico = path => {
     return fs.readFileSync(path, 'base64');
 }
 
-openFileInDialog = (options, readfile) => {
-    var dialog = utools.showOpenDialog(options);
-    if (!dialog) return false
-    var file = dialog[0]
+getFileInfo = options => {
+    var file
+    if (options.type == 'file') {
+        file = options.argvs
+    } else if (options.type == 'dialog') {
+        var dialog = utools.showOpenDialog(options.argvs);
+        if (!dialog) return false
+        file = dialog[0]
+    } else {
+        return false
+    }
     var information = {
         name: path.basename(file),
+        ext: path.extname(file),
         path: file
     }
-    if(readfile) information.data = fs.readFileSync(file)
+    if (options.readfile) {
+        var codec = (information.ext == '.bat' || information == '.ps1') ? 'gbk' : 'utf8'
+        information.data = iconv.decode(fs.readFileSync(file), codec)
+    }
     return information
 }