Update run.py

dvr/ffmpeg/run.py

@@ -13,24 +13,24 @@ def TryConnect(host, port):
         print("Error with unknown problem.")
     return False
     
-user = os.getenv("DVR_USER") or "admin"
+user = os.getenv("DVR_USER")
     
-pswd = os.getenv("DVR_PSWD") or "ecom2828"
+pswd = os.getenv("DVR_PSWD")
 
-name = os.getenv("DVR_NAME") or "rd"
+name = os.getenv("DVR_NAME")
 
-key = os.getenv("DVR_KEY") or "main_4"
+key = os.getenv("DVR_KEY")
 
-ch = os.getenv("ED_CH") or "0"
+ch = os.getenv("ED_CH")
 
 topic = "dvr/{0}/{1}".format(name, ch)
 
 while True:
     payload = { 'status': 0, 'host': "", 'name': "", 'ch': "", 'msg': "" }
     
-    host = os.getenv("MQTT_HOST") or "192.168.5.217"
+    host = os.getenv("MQTT_HOST")
 
-    port = os.getenv("MQTT_PORT") or "1883"
+    port = os.getenv("MQTT_PORT")
     
     print("Connect to MQTT")
     
@@ -39,18 +39,18 @@ while True:
 
         client.connect(host, int(port), 3600)
 
-        host = os.getenv("ED_HOST") or "192.168.5.208"
+        host = os.getenv("ED_HOST")
 
-        port = os.getenv("ED_PORT") or "554"
+        port = os.getenv("ED_PORT")
 
         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"
+            host = os.getenv("DVR_HOST")
 
-            port = os.getenv("DVR_PORT") or "80"
+            port = os.getenv("DVR_PORT")
             
             if TryConnect(host, port): # 測試連線到 DVR
                 payload['name'] = name
@@ -59,7 +59,10 @@ while True:
                 
                 rtsp_out = "{0}/{1}/{2}".format(rtsp_out, name, ch)
                 
-                rtsp_in = "rtsp://{0}:{1}@{2}".format(user, pswd, host)
+                if user == None or pswd == None:
+                    rtsp_in = "rtsp://{0}".format(host)
+                else:
+                    rtsp_in = "rtsp://{0}:{1}@{2}".format(user, pswd, host)
                 
                 rtsp_in = rtsp_in if port == "80" else "{0}:{1}".format(rtsp_in, port)