From 79d0144e778c6e9a1f7283d57e6e1fc4dd373af1 Mon Sep 17 00:00:00 2001 From: Naibo Wang Date: Tue, 28 Mar 2023 23:10:36 +0800 Subject: [PATCH] MACOS version --- .DS_Store | Bin 8196 -> 10244 bytes ElectronJS/.DS_Store | Bin 10244 -> 10244 bytes ElectronJS/main.js | 6 ++++-- ElectronJS/package_macos.sh | 8 ++++---- ElectronJS/server.js | 12 +++++++++++- ElectronJS/src/taskGrid/invokeTask.html | 8 ++++++-- ExecuteStage/easyspider_executestage.py | 3 ++- Releases/EasySpider_MacOS_all_arch/.gitignore | 1 + .../Data/task_1_72688922.csv | 0 .../Data/task_1_72688922_log.txt | 1 + .../Data/task_3_104112403.csv | 0 .../Data/task_3_104112403_log.txt | 1 + .../Data/task_3_488425267.csv | 0 .../Data/task_3_488425267_log.txt | 1 + .../Data/task_3_801869708.csv | 0 .../Data/task_3_801869708_log.txt | 1 + .../Data/task_4_855450949.csv | 1 + .../Data/task_4_855450949_log.txt | 3 +++ .../Data/task_4_973818304.csv | 0 .../Data/task_4_973818304_log.txt | 1 + .../Data/task_5_578126210.csv | 1 + .../Data/task_5_578126210_log.txt | 3 +++ .../easyspider_executestage | Bin 5010080 -> 5010096 bytes Releases/EasySpider_MacOS_all_arch/readme.txt | 4 ++-- 24 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 Releases/EasySpider_MacOS_all_arch/.gitignore create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_1_72688922.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_1_72688922_log.txt create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_3_104112403.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_3_104112403_log.txt create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_3_488425267.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_3_488425267_log.txt create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_3_801869708.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_3_801869708_log.txt create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_4_855450949.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_4_855450949_log.txt create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_4_973818304.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_4_973818304_log.txt create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_5_578126210.csv create mode 100644 Releases/EasySpider_MacOS_all_arch/Data/task_5_578126210_log.txt diff --git a/.DS_Store b/.DS_Store index 3330b1864f03c7ad9dd50eb3f6ea553c21abbe41..1ea8f758976cede1963e8c0267c61aabbcd80980 100644 GIT binary patch literal 10244 zcmeHMYitx%6h3EK=nNfTTFO&4-CBeO7utmu3J7jrK%qSBw)8=<&h8HF(CJLwncWsh zO^xvtNi@C^V1y22>1y22>1xh1_Wr%W|vsVrJwo;_z3t2Od!C%4?((_jCgX4OZU@3iMs_LnNMo> zqG#F%xIRHoMm#yjrRz#{^4$Y^uIOzskh@cPkeQQ=cyf$O?heS^0lk*d+o7P_I{5`% zbHE6fe(EFOBQO;Kws#jH1}V_N$lkxl3@b)uES&1-UVp{C=!pe;BUlgzo9*+n>|V^V zn+Hu)r$&|zB+0{sJrJGjgMn-Di4EIBUOQ)FLxyfURaNIv$jhHIw?Hfq3&kVRerq`D zs7}hRSCfZXuFbNHSms%c9n!VoUZteLG96VnwWRByCp0qY>CnxDHC%6{%!KXwMtOlK ziBhk!{N%~%>ToC+uB{yn1y6>(!4@>exReXt6T2r)Z>;J)lX=>%0ioZ*i6}jNi9u1 z>xf%MYS6TMm7=(6#8ZaqXmy6cj7hi9jwda{IB40rqg!TIr=yKHnTjSAb#~iU(rIuj z>s6GLt+i@Ym!8%dsYa@*n6-9bh*e`B(vmjG@<o#n@Dbm!uzjb_} zQdBIL$V)oXx~<0yt$kQeIQ?C!9oNi+ZuWH(%%-Cs)wQHlgdwTTR0p;3;$_QMT(>e1 z$hFSY(wU0sx2JUHxKb{Pyp6Izxum=%_9W;f_gM*6W5O*7lm*s^;$fz5NNSXFwY)YE zk`z^Jvk4$xMWq~;6kBQ=ATDs%YI&2WB&2pjjcEo~ZIQQ$%3i4>&3n$3CGyRp)ET!1 z2dOhQ*VP9aMdf|*R@QKfYC8vpG?Ut9UE5g}2y`)hT_T|+s0S;SEiVr24eS$@&%|!K zUrlNUhKZmV{Vk&CjyLI9O-%{iu_g-JS)rnvX`Q%FW5Gi}ERU4%At{ekcn@3vxEM7FopwYpotbbIEr`R7~YBZ;Dh)OK8%mx6Zi~1i_hZ=cm`j`H}EXJ zhacdF_%VKh7x6p%5r4v;@i)ATR|F6Wg%V-0utca3!omh&qp(xhB^(sGgqYAL^z)tw znK(O=>6xcLMslV&^FAWNlhemp>8{<)d*qr~A7@`IV3D<`Wbu-v!5h|AR@ZK?o8TX( zYlflO%y-E?DMVbdyM)LkDi1-qw4I_s8<{B*l>!#E;yAM|yIw9;=1{!w?CLd?olCL8 zvp0rHOBI1alxM5LrLvMo0Vuh?H6hBPm)WvamX&-8MP9ZeKw0oI^$k=F3oP-^DSlOg ze+n1iEBGFMflD|S3sJ#RtibhHO@!WwyNT2-xQ|HPiQRY@dr-qZ)bSWm+`%-C;Bh>G zcj4W5FW!gu6Tu(F$MA7HjZYKFpCg)|!I$u5dm2&FOr|e> zGZTH&(WGfuW*?O^>WehDj(|$1?L+Pyn==<9n~t*QY}vJEb8(7hV-2E|s?Y~o&U}37 zTK)bjbMlP96Pl+(p(?SqnG`TB$9ST4QZa{Ibbf z%CRM1wuk6?u*IB8Eojp&{jO^NuhV7orciK0&6dBrgqs3H4owI*|MC&=5%3Y1^$6tg zHw?1#|E8J$|Ihk<_%G-q;3M$Y5y1S$Xk$J3XZF;&RSBdB(tR7<>|%CfT)HllFcYSC xkK-xBj^o|42hw@xLvDG*vm4{mbtga9og_ca|Hpp@`1^l$MCR}R|Hu3PKLFra%GCe> delta 150 zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7Z0TH$S7`W*z|*Mh+u$3mpYR zW0T2eBpfDJ2#RjrA}+wlVQc^rH89Ca4p%s}&iK!O`cxPpw{SoocJ aGQUb72P4EnhRN|fGbaC#5CN+Hzytu!nIGB! diff --git a/ElectronJS/.DS_Store b/ElectronJS/.DS_Store index 6141cf0b7f3e23d504bcba656258652029d7455a..856a71cdc04834eb0353fc5513412c25f795f529 100644 GIT binary patch delta 20 bcmZn(XbIS`U7Fq8LPx>S*ktoQX*V7KNz(>n delta 16 XcmZn(XbIS`U3&6&VfW4dq}g}?KxGE) diff --git a/ElectronJS/main.js b/ElectronJS/main.js index 0f261b2..7507271 100644 --- a/ElectronJS/main.js +++ b/ElectronJS/main.js @@ -94,7 +94,7 @@ function createWindow() { } -async function beginInvoke(msg) { +async function beginInvoke(msg, ws) { if (msg.type == 1) { if (msg.message.id != -1) { let url = ""; @@ -220,6 +220,8 @@ async function beginInvoke(msg) { child_process.stdout.on('data', function (data) { console.log(data.toString()); }); + } else { + ws.send(task_server.getDir() + "/"); } } } @@ -265,7 +267,7 @@ wss.on('connection', function (ws) { } } else { - await beginInvoke(msg); + await beginInvoke(msg, ws); } }); }); diff --git a/ElectronJS/package_macos.sh b/ElectronJS/package_macos.sh index 1def8cb..a170f1b 100755 --- a/ElectronJS/package_macos.sh +++ b/ElectronJS/package_macos.sh @@ -3,12 +3,12 @@ # This script is used to build.md the package for Linux 64-bit. rm -rf out rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app -npm run package -# unzip out/EasySpider-darwin-x64 -d ../Releases/EasySpider_MacOS_all_arch/ -mv out/EasySpider-darwin-x64/EasySpider.app ../Releases/EasySpider_MacOS_all_arch/ +npm run make +unzip out/make/zip/darwin/x64/EasySpider-darwin-x64* -d ../Releases/EasySpider_MacOS_all_arch/ +# mv out/EasySpider-darwin-x64/EasySpider.app ../Releases/EasySpider_MacOS_all_arch/ rm ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/VS_BuildTools.exe rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/chrome_win64 -# rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/Data +rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/Data rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/.idea # rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/tasks # rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/execution_instances diff --git a/ElectronJS/server.js b/ElectronJS/server.js index 1306479..9a6719d 100644 --- a/ElectronJS/server.js +++ b/ElectronJS/server.js @@ -3,6 +3,7 @@ const querystring = require('querystring'); const url = require('url'); const fs = require('fs'); const path=require('path'); +const {app, dialog} = require('electron'); function travel(dir,callback){ fs.readdirSync(dir).forEach((file)=>{ const pathname=path.join(dir,file) @@ -24,7 +25,7 @@ function compare(p){ //这是比较函数 function getDir(){ if(__dirname.indexOf("app") >= 0 && __dirname.indexOf("sources") >= 0){ if(process.platform == "darwin"){ - return __dirname; + return app.getPath("userData"); } else { return path.join(__dirname,"../../.."); } @@ -32,6 +33,15 @@ function getDir(){ return __dirname; } } +if(!fs.existsSync(path.join(getDir(), "tasks"))){ + fs.mkdirSync(path.join(getDir(), "tasks")); +} +if(!fs.existsSync(path.join(getDir(), "execution_instances"))){ + fs.mkdirSync(path.join(getDir(), "execution_instances")); +} +if(!fs.existsSync(path.join(getDir(), "config.json"))){ + fs.writeFileSync(path.join(getDir(), "config.json"), JSON.stringify({"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","absolute_user_data_folder":""})); +} exports.getDir = getDir; FileMimes = JSON.parse(fs.readFileSync(path.join(__dirname,'mime.json')).toString()); diff --git a/ElectronJS/src/taskGrid/invokeTask.html b/ElectronJS/src/taskGrid/invokeTask.html index 48f2b77..77f3a57 100644 --- a/ElectronJS/src/taskGrid/invokeTask.html +++ b/ElectronJS/src/taskGrid/invokeTask.html @@ -50,7 +50,7 @@ - +