[update] remove useless comments
This commit is contained in:
@@ -127,14 +127,8 @@ class Project(threading.Thread):
|
||||
delay_time = 0
|
||||
check_list = copy(self._task_manager.check_list)
|
||||
|
||||
# print('!@#len: ', len(check_list))
|
||||
""" if len(check_list) == 2:
|
||||
if check_list[0] != None:
|
||||
print('\n##0: ', check_list[0].name)
|
||||
print('\n##1: ', check_list[1].name) """
|
||||
for task in check_list:
|
||||
if task != None:
|
||||
# print('\n!@#task: ', task.name)
|
||||
now = time()
|
||||
# print('round task', task.name)
|
||||
# print('running task', self._task_manager.running_task.name, self._task_manager.running_task.status)
|
||||
@@ -187,11 +181,7 @@ class Project(threading.Thread):
|
||||
if self.check_running_task_not_run() == True:
|
||||
if self._task_manager.running_task.cycle == -1:
|
||||
self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
|
||||
# self._task_manager.set_cycle_task()
|
||||
self._task_manager.running_task.stop()
|
||||
# if self._task_manager.running_task.cycle_count < self._task_manager.running_task.cycle and self._task_manager.running_task.cycle > 0:
|
||||
# print('\n\n\n!@#cycle: ', self._task_manager.running_task.cycle_count, self._task_manager.running_task.cycle)
|
||||
# self._task_manager.set_running_task(self._task_manager.next_task[0])
|
||||
|
||||
# check project done then close project
|
||||
if self.check_project_done() == True:
|
||||
|
||||
@@ -5,7 +5,6 @@ from xml.dom.expatbuilder import parseString
|
||||
import paho.mqtt.client as mqtt
|
||||
from biopro.text import *
|
||||
from .task import Task
|
||||
from copy import copy, deepcopy
|
||||
|
||||
_RUNTIME_COMPILE = False
|
||||
|
||||
@@ -119,37 +118,9 @@ class TaskManager():
|
||||
_task = next((task for task in self._task_list if task.uuid == task_uuid), None)
|
||||
if _task != None:
|
||||
_task.reset()
|
||||
# print('!@#WATCH', _task.status)
|
||||
# print('!@#_task._cycle_count: ', _task._cycle_count)
|
||||
_task_copy = _task # TODO: here fix one bug, and make another, due to the second time "stop" condition will be trigger in this way, while the number of cycle will be reset
|
||||
self._next_task.append(_task_copy)
|
||||
self._next_task.append(_task)
|
||||
except RuntimeError as e:
|
||||
print(e)
|
||||
|
||||
""" def set_cycle_task(self, task):
|
||||
try:
|
||||
# if there is task running & same task active ,then reject
|
||||
if self._running_task != None and self._running_task.uuid == task.uuid:
|
||||
return False
|
||||
|
||||
print(f'!!@#!\n\n\n{task._cycle_count}\n{task._cycle}\n\n\n')
|
||||
if task._cycle_count < task._cycle:
|
||||
task._cycle_count += 1
|
||||
self._next_task.append(self._task_list[task._cycle_next])
|
||||
else:
|
||||
task._cycle_count = 0
|
||||
except RuntimeError as e:
|
||||
print(e) """
|
||||
""" def set_cycle_task(self):
|
||||
try:
|
||||
print(f'!!@#!set_cycle_task\n\n\n{self._running_task._cycle_count}\n{self._running_task._cycle}\n\n\n')
|
||||
if self._running_task._cycle_count < self._running_task._cycle:
|
||||
self._running_task._cycle_count += 1
|
||||
self._next_task.append(self._task_list[self._running_task._cycle_next])
|
||||
else:
|
||||
self._running_task._cycle_count = 0
|
||||
except RuntimeError as e:
|
||||
print(e) """
|
||||
|
||||
def get_task(self, task_id):
|
||||
return self._task_list[task_id]
|
||||
|
||||
@@ -1015,10 +1015,7 @@ class ControlServer(SocketServer, ControlServerAPI):
|
||||
@logging_info
|
||||
def run_project(self, project) -> bool:
|
||||
if project is not None:
|
||||
# print('!@#', project)
|
||||
# print('\n\n\n!!@#')
|
||||
# print(project)
|
||||
# print('\n\n\n')
|
||||
project = self._project_manager.create(project)
|
||||
self._project_manager.run_project(project)
|
||||
return project.as_json()
|
||||
|
||||
Reference in New Issue
Block a user