root vor 4 Jahren
Ursprung
Commit
36e5890370
1 geänderte Dateien mit 7 neuen und 8 gelöschten Zeilen
  1. 7 8
      src/renderer/uploader.js

+ 7 - 8
src/renderer/uploader.js

@@ -330,10 +330,15 @@ export function upload(code, val, socket) {
                 //code = code.replace(new RegExp("\n", "gm"), "\\n")
                 code = code.replace(new RegExp("\"", "gm"), "\\\"").replace(/^\s+|\s+$/g, '')
                 var complete_command = "rm /home/user/upload.py && echo \"" + code + "\" > /home/user/upload.py && python /home/user/upload.py" + "\r\n";
+                var _tf = false;
                 serialPort.on('data', function (data) {
                     resolve();
                     if (data) {
-                        if (data.indexOf("root@sipeed:") == -1 && data.indexOf("rm /home/user/upload.py") != 0 && data.indexOf("python /home/user/upload.py") == -1) {
+                        data = data.toString();
+                        if (data.indexOf("python /home/user/upload.py") > -1) {
+                            _tf = true;
+                        }
+                        if (_tf && data.indexOf("root@sipeed:") == -1 && data.indexOf("rm /home/user/upload.py") != 0 && data.indexOf("python /home/user/upload.py") == -1) {
                             socket.emit('repl', { code: data });
                         }
                     }
@@ -360,7 +365,7 @@ export function upload(code, val, socket) {
                     }
                     else if (msg) {
                         resolve();
-                        socket.emit('repl', { code: msg });
+                        socket.emit('repl', { code: msg.toString() });
                     }
                 })
             }
@@ -395,12 +400,6 @@ export function upload(code, val, socket) {
     */
 }
 
-
-linuxupload = function () {
-
-
-}
-
 //     * 上传插件收到来自前端的 python 文件,将 python 代码通过 ampy 命令上传至模块中
 //     * ampy --port [端口名] put user_code.py /user_code.py
 // * 等待上传插件将代码上传成功以后,运行该文件