|
@@ -2,9 +2,10 @@ import asyncio
|
|
import websockets
|
|
import websockets
|
|
import sys
|
|
import sys
|
|
import json
|
|
import json
|
|
-import importlib
|
|
|
|
-import pathlib
|
|
|
|
|
|
+#import importlib
|
|
|
|
+#import pathlib
|
|
import os
|
|
import os
|
|
|
|
+import subprocess
|
|
|
|
|
|
async def hello(websocket):
|
|
async def hello(websocket):
|
|
#websocket is a WebSocketServerProtocol
|
|
#websocket is a WebSocketServerProtocol
|
|
@@ -46,14 +47,20 @@ def run(message):
|
|
with open(fsetup) as f:
|
|
with open(fsetup) as f:
|
|
setup=json.load(f)
|
|
setup=json.load(f)
|
|
|
|
|
|
|
|
+ parts=scriptFile.split('/')
|
|
|
|
+ scriptDir=parts[-2]#one before last, last is the script name
|
|
scriptFile=scriptFile.replace('_softwareSrc_',setup['paths']['softwareSrc'])
|
|
scriptFile=scriptFile.replace('_softwareSrc_',setup['paths']['softwareSrc'])
|
|
|
|
+ venv=setup['venv'][scriptDir]
|
|
|
|
+ pCall=os.path.join(venv,'bin','python')
|
|
|
|
+ argsCall=[pCall,scriptFile,args[0],args[2]]
|
|
|
|
+ subprocess.run(argsCall)
|
|
|
|
|
|
- spath=pathlib.Path(scriptFile)
|
|
|
|
- print('script: {} [{}]{}'.format(scriptFile,spath.parent,spath.stem))
|
|
|
|
- sys.path.append(str(spath.parent))
|
|
|
|
|
|
+ #spath=pathlib.Path(scriptFile)
|
|
|
|
+ #print('script: {} [{}]{}'.format(scriptFile,spath.parent,spath.stem))
|
|
|
|
+ #sys.path.append(str(spath.parent))
|
|
#print(sys.path)
|
|
#print(sys.path)
|
|
- module=importlib.import_module(spath.stem)
|
|
|
|
- module.main(args[0],args[2])
|
|
|
|
|
|
+ #module=importlib.import_module(spath.stem)
|
|
|
|
+ #module.main(args[0],args[2])
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
if __name__ == "__main__":
|