Update run.py

dvr/ffmpeg/run.py

@@ -23,9 +23,9 @@ key = os.getenv("DVR_KEY") or "main_4"
 
 topic = "dvr/{0}/{1}".format(name, key)
 
-payload = { 'status': 0, 'rtsp': "", 'msg': "" }
-
 while True:
+    payload = { 'status': 0, 'host': "", 'name': "", 'ch': "", 'msg': "" }
+    
     host = os.getenv("MQTT_HOST") or "192.168.5.217"
 
     port = os.getenv("MQTT_PORT") or "1883"
@@ -45,7 +45,7 @@ while True:
         
         if TryConnect(host, port): # 測試連線到 EasyDarwin
             payload['host'] = host
-            
+
             rtsp_out = "rtsp://{0}:{1}".format(host, port)
 
             host = os.getenv("DVR_HOST") or "192.168.5.198"
@@ -53,6 +53,10 @@ while True:
             port = os.getenv("DVR_PORT") or "80"
             
             if TryConnect(host, port): # 測試連線到 DVR
+                payload['name'] = name
+                
+                payload['ch'] = ch
+                
                 rtsp_out = "{0}/{1}/{2}".format(rtsp_out, name, ch)
                 
                 rtsp_in = "rtsp://{0}:{1}@{2}".format(user, pswd, host)
@@ -74,18 +78,14 @@ while True:
                 try:
                     payload['status'] = 1
                     
-                    payload['rtsp'] = rtsp_out
-                    
                     payload['msg'] = "Ready to Transfer."
-                    
+
                     client.publish(topic, json.dumps(payload), 1)
                     
                     p.communicate()
-                    
+
                     payload['status'] = 0
                     
-                    payload['rtsp'] = ""
-                    
                     payload['msg'] = "Popen is closed."
                     
                     client.publish(topic, json.dumps(payload), 1)
@@ -98,16 +98,12 @@ while True:
             else:
                 payload['status'] = 0
                 
-                payload['rtsp'] = ""
-                
                 payload['msg'] =  "Connect to DVR is refused."
 
                 client.publish(topic, json.dumps(payload), 1)
         else:
             payload['status'] = 0
             
-            payload['rtsp'] = ""
-            
             payload['msg'] =  "Connect to EasyDarwin is refused."
 
             client.publish(topic, json.dumps(payload), 1)