@whyour/qinglong 2.17.9-rc.3 → 2.17.9-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.17.9-rc.3",
+  "version": "2.17.9-rc.5",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/preload/sitecustomize.js

@@ -1,13 +1,5 @@
 const { execSync } = require('child_process');
-const { sendNotify } = require('./notify.js');
 require(`./env.js`);
-
-function initGlobal() {
-  global.QLAPI = {
-    notify: sendNotify,
-  };
-}
-
 function expandRange(rangeStr, max) {
   const tempRangeStr = rangeStr
     .trim()
@@ -45,10 +37,8 @@ function run() {
     const fileName = process.argv[1].replace(`${dir_scripts}/`, '');
     let command = `bash -c "source ${file_task_before} ${fileName}`;
     if (task_before) {
-      command = `${command} && echo -e '执行前置命令\n' && eval '${task_before.replace(
-        /"/g,
-        '\\"',
-      )}' && echo -e '\n执行前置命令结束\n'`;
+      const escapeTaskBefore = task_before.replace(/"/g, '\\"');
+      command = `${command} && echo -e '执行前置命令\n' && eval '${escapeTaskBefore}' && echo -e '\n执行前置命令结束\n'`;
     }
     const res = execSync(
       `${command} && echo -e '${splitStr}' && NODE_OPTIONS= node -p 'JSON.stringify(process.env)'"`,
@@ -78,8 +68,12 @@ function run() {
 }
 
 try {
-  initGlobal();
   run();
+
+  const { sendNotify } = require('./notify.js');
+  global.QLAPI = {
+    notify: sendNotify,
+  };
 } catch (error) {
   console.log(`run builtin code error: `, error, '\n');
 }

package/shell/preload/sitecustomize.py

@@ -5,17 +5,6 @@ import json
 import builtins
 import sys
 import env
-from notify import send
-
-
-class BaseApi:
-    def notify(self, *args, **kwargs):
-        return send(*args, **kwargs)
-
-
-def init_global():
-    QLAPI = BaseApi()
-    builtins.QLAPI = QLAPI
 
 
 def try_parse_int(value):
@@ -55,7 +44,8 @@ def run():
         task_before = os.getenv("task_before")
 
         if task_before:
-            command += f" && echo -e '执行前置命令\n' && eval '{task_before.replace('"', '\\"')}' && echo -e '\n执行前置命令结束\n'"
+            escape_task_before = task_before.replace('"', '\\"')
+            command += f" && echo -e '执行前置命令\n' && eval '{escape_task_before}' && echo -e '\n执行前置命令结束\n'"
 
         python_command = "PYTHONPATH= python3 -c 'import os, json; print(json.dumps(dict(os.environ)))'"
         command += f" && echo -e '{split_str}' && {python_command}\""
@@ -91,7 +81,15 @@ def run():
 
 
 try:
-    init_global()
     run()
+    
+    from notify import send
+
+    class BaseApi:
+        def notify(self, *args, **kwargs):
+            return send(*args, **kwargs)
+
+    QLAPI = BaseApi()
+    builtins.QLAPI = QLAPI
 except Exception as error:
     print(f"run builtin code error: {error}\n")