From 9411c4e47500e271d8fb88143c86e6dcb2d89684 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期一, 28 二月 2022 10:43:41 +0800
Subject: [PATCH] Merge commit 'f79b30a55db543bd1c7dd494a8c896df8841aa28' into addFeature
---
src/Server.py | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/Server.py b/src/Server.py
index f0e8ca2..b2e41a4 100644
--- a/src/Server.py
+++ b/src/Server.py
@@ -35,9 +35,9 @@
def _on_sys_command(self, req: pb.RequestCommand, resp: pb.ResponseCommand):
if pb.SubCommand.POWER_ON_SUB_COMMAND == req.sub_command:
print('power on message received')
- self._device_manager.get_device(req.device_id)
+ self._device_manager.get_device(req.device_id,save_folder)
elif pb.SubCommand.POWER_OFF_SUB_COMMAND == req.sub_command:
- device = self._device_manager.get_device(req.device_id)
+ device = self._device_manager.get_device(req.device_id,save_folder)
device['power_on'] = False
print('power off message received')
return
@@ -63,7 +63,7 @@
def run_rabbitmq(self, host: str, user: str, password: str, queue: str) -> None:
self._message_queue_thread = MessageQueueThread(
- host, user, password, queue, self._device_manager)
+ host, user, password, queue, self._device_manager, save_folder)
self._message_queue_thread.start()
def run_all(self):
@@ -71,7 +71,7 @@
self.run(debug=False, host="0.0.0.0", port=self.port)
def send_controll_message(self, device_id, msg):
- device = self._device_manager.get_device(device_id)
+ device = self._device_manager.get_device(device_id,save_folder)
if device is None:
channel = device.controll_channel
channel.basic_publish(
@@ -91,5 +91,25 @@
if __name__ == "__main__":
+ def help():
+ print("Usage: Server.py [MQhost] [MQuser] [MQpassword] [QUEUEname] [WEBport] [SAVEfolder]")
+ print("EXAMPLE: Server.py localhost chai password123 aerial_rpc 5000 ./Images")
+ exit(1)
+
+ if len(sys.argv) != 7:
+ help()
+ try:
+ MQhost = str(sys.argv[1])
+ MQuser = str(sys.argv[2])
+ MQpassword = str(sys.argv[3])
+ QUEUEname = str(sys.argv[4])
+ WEBport = int(sys.argv[5])
+ SAVEfolder = str(sys.argv[6])
+ global save_folder
+ save_folder = SAVEfolder
+
+ except Exception as e:
+ print(e)
+ help()
server = MyServer(host="localhost", user='chai', password='password123', queue='aerial_rpc', port=5000)
server.run_all()
--
Gitblit v1.9.1