CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-06-03 18:49:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server: Fix logger and send launch files

Browse Source
This commit is contained in:
Arthur Golubtsov
2020-01-21 06:18:27 +03:00
parent d08bbc3b72
commit 28d1213456
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/server.py
View File

@@ -31,6 +31,8 @@ if not os.path.exists(log_path):
else:
print("Successfully created the directory {}".format(log_path))
logger = logging.getLogger(__name__)
ConfigOption = collections.namedtuple("ConfigOption", ["section", "option", "value"])

67
Server/server_qt.py
View File

@@ -29,6 +29,23 @@ from copter_table import CopterTableWidget
from visual_land_dialog import VisualLandDialog
from config_editor_models import ConfigDialog
logging.basicConfig(
level=logging.DEBUG,
format="%(asctime)s [%(name)-7.7s] [%(threadName)-19.19s] [%(levelname)-7.7s] %(message)s",
handlers=[
logging.FileHandler("server_logs/{}.log".format(now)),
logging.StreamHandler(sys.stdout)
])
handler = logging.StreamHandler(sys.stdout)
handler.setLevel(logging.DEBUG)
formatter = logging.Formatter("%(asctime)s [%(name)-7.7s] [%(threadName)-12.12s] [%(levelname)-5.5s] %(message)s")
handler.setFormatter(formatter)
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
logger.addHandler(handler)
def multi_glob(*patterns):
return itertools.chain.from_iterable(glob.iglob(pattern) for pattern in patterns)
@@ -48,10 +65,10 @@ def confirmation_required(text="Are you sure?", label="Confirm operation?"):
QMessageBox.Yes | QMessageBox.No, QMessageBox.No
)
if reply == QMessageBox.Yes:
logging.debug("Dialog accepted")
logger.debug("Dialog accepted")
return f(*args, **kwargs)
logging.debug("Dialog declined")
logger.debug("Dialog declined")
return wrapper
@@ -188,26 +205,26 @@ class MainWindow(QtWidgets.QMainWindow):
return list(self.iterate_selected(lambda copter: copter.client.send_message(command, command_args)))
def new_client_connected(self, client: Client):
logging.debug("Added client {}".format(client))
logger.debug("Added client {}".format(client))
self.ui.copter_table.add_client(copter_id=client.copter_id, client=client)
def client_connection_changed(self, client: Client):
logging.debug("Connection {} changed {}".format(client, client.connected))
logger.debug("Connection {} changed {}".format(client, client.connected))
row_data = self.model.get_row_by_attr("client", client)
if row_data is None:
logging.error("No row for client presented")
logger.error("No row for client presented")
return
if self.server.config.table_remove_disconnected and (not client.connected):
client.remove()
self.ui.copter_table.remove_client_data(row_data)
logging.debug("Removing from table")
logger.debug("Removing from table")
else:
row_num = self.model.get_row_index(row_data)
if row_num is not None:
self.ui.copter_table.update_data(row_num, 0, client.connected, table.ModelStateRole)
logging.debug("Client status updated")
logger.debug("Client status updated")
@pyqtSlot()
def selfcheck_selected(self):
@@ -233,7 +250,7 @@ class MainWindow(QtWidgets.QMainWindow):
for key, value in telems.items():
col = cols_dict.get(key, None)
if col is None:
logging.error("No column {} present!".format(key))
logger.error("No column {} present!".format(key))
continue
row_data = self.model.get_row_by_attr("client", client)
@@ -247,18 +264,18 @@ class MainWindow(QtWidgets.QMainWindow):
copter.client.remove()
if not self.server.config.table_remove_disconnected:
self.ui.copter_table.remove_client_data(copter)
logging.info("Client removed from table!")
logger.info("Client removed from table!")
@pyqtSlot()
@confirmation_required("This operation will takeoff selected copters with delay and start animation. Proceed?")
def send_start_time_selected(self):
time_now = server.time_now()
dt = self.ui.start_delay_spin.value()
logging.info('Wait {} seconds to start animation'.format(dt))
logger.info('Wait {} seconds to start animation'.format(dt))
if self.ui.music_checkbox.isChecked():
music_dt = self.ui.music_delay_spin.value()
asyncio.ensure_future(self.play_music_at_time(music_dt + time_now), loop=loop)
logging.info('Wait {} seconds to play music'.format(music_dt))
logger.info('Wait {} seconds to play music'.format(music_dt))
# self.selfcheck_selected()
for copter in filter(self.model.checks.all_checks, self.model.user_selected()):
server.send_starttime(copter.client, dt + time_now)
@@ -329,7 +346,7 @@ class MainWindow(QtWidgets.QMainWindow):
for num, file in enumerate(files):
filepath, filename = os.path.split(file)
logging.info("Preparing file for sending: {} {}".format(filepath, filename))
logger.info("Preparing file for sending: {} {}".format(filepath, filename))
if match_id:
name = os.path.splitext(filename)[0]
@@ -338,10 +355,10 @@ class MainWindow(QtWidgets.QMainWindow):
to_send = copters
if not to_send:
logging.warning(f"No copters to send file {filename} to")
logger.error(f"No copters to send file {filename} to")
continue
logging.info(f"Sending file {filename} to clients: {to_send}")
logger.info(f"Sending file {filename} to clients: {to_send}")
filename = client_filename.format(num, filename) or filename
for copter in to_send:
@@ -417,13 +434,13 @@ class MainWindow(QtWidgets.QMainWindow):
@pyqtSlot()
def send_launch(self):
self.send_directory_files("Select directory with calibrations", ('.yaml', ), match_id=False,
client_path='"/home/pi/catkin_ws/src/clever/clever/launch/') # TODO clever restart callback?
self.send_directory_files("Select directory with launch files", ('.launch', ), match_id=False,
client_path='/home/pi/catkin_ws/src/clever/clever/launch/') # TODO clever restart callback?
@pyqtSlot()
def send_fcu_parameters(self):
def request_callback(copter, value):
logging.info("Send parameters to {} success: {}".format(copter.client.copter_id, value))
logger.info("Send parameters to {} success: {}".format(copter.client.copter_id, value))
def callback(copter):
copter.client.get_response("load_params", request_callback)
@@ -445,7 +462,7 @@ class MainWindow(QtWidgets.QMainWindow):
config = cfg.ConfigManager()
config.load_only_config(path)
data = config.full_dict
logging.info(f"Loaded config from {path}")
logger.info(f"Loaded config from {path}")
copters = self.model.user_selected()
for copter in copters:
@@ -472,10 +489,10 @@ class MainWindow(QtWidgets.QMainWindow):
@pyqtSlot()
def play_music(self):
if self.player.mediaStatus() == QtMultimedia.QMediaPlayer.InvalidMedia:
logging.info("Can't play media")
logger.info("Can't play media")
return
if self.player.mediaStatus() == QtMultimedia.QMediaPlayer.NoMedia:
logging.info("No media file")
logger.info("No media file")
return
if self.player.state() == QtMultimedia.QMediaPlayer.StoppedState or \
@@ -489,24 +506,24 @@ class MainWindow(QtWidgets.QMainWindow):
@pyqtSlot()
def stop_music(self):
if self.player.mediaStatus() == QtMultimedia.QMediaPlayer.InvalidMedia:
logging.error("Can't stop media")
logger.error("Can't stop media")
return
if self.player.mediaStatus() == QtMultimedia.QMediaPlayer.NoMedia:
logging.error("No media file")
logger.error("No media file")
return
self.player.stop()
@asyncio.coroutine
def play_music_at_time(self, t):
if self.player.mediaStatus() == QtMultimedia.QMediaPlayer.InvalidMedia:
logging.error("Can't play media")
logger.error("Can't play media")
return
if self.player.mediaStatus() == QtMultimedia.QMediaPlayer.NoMedia:
logging.error("No media file")
logger.error("No media file")
return
self.player.stop()
yield from asyncio.sleep(t - time.time())
logging.info("Playing music")
logger.info("Playing music")
self.player.play()
@pyqtSlot()