Refactor output and call

Each action has its own output from now on.
This commit is contained in:
jpic
2020-02-15 01:04:52 +01:00
parent b703ed379e
commit 984f09d704
15 changed files with 124 additions and 120 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ from .script import Script
class Async(Script):
async def __call__(self, *args, **kwargs):
async def call(self, *args, **kwargs):
return asyncio.gather(*[
procs.append(action(*args, **kwargs))
for action in self.actions
+2 -10
View File
@@ -27,17 +27,9 @@ class Script(Action):
super().__init__(**kwargs)
self.actions = Actions(self, actions)
async def __call__(self, *args, **kwargs):
async def call(self, *args, **kwargs):
for action in self.actions:
try:
await action(*args, **kwargs)
except WrongResult as e:
print(e)
action.status = 'fail'
break
else:
if action.status == 'running':
action.status = 'success'
await action(*args, **kwargs)
def shargs(self, *args, **kwargs):
user = kwargs.pop('user', None)