CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-31 01:09:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix another merge conflict

Browse Source
This commit is contained in:
Arthur
2019-03-22 02:31:17 +03:00
parent 57ed1aa394
commit 03026ca371
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Drone/client.py
View File

@@ -110,11 +110,7 @@ def form_message(str_command, dict_arguments):
def parse_message(msg):
try:
j_message = json.loads(msg)
<<<<<<< HEAD
except ValueError:
=======
except json.JSONDecodeError:
>>>>>>> 32c16bb2060a6cc7e46d6cea84d07a0c86094270
print("Json string not in correct format")
return None, None
@@ -257,21 +253,13 @@ try:
command, args = parse_message(message)
print("Command from server:", command, args)
if command == "writefile":
<<<<<<< HEAD
recive_file(list(args.values())[0])
=======
recive_file(list(args.values)[0]) #TODO repace
>>>>>>> 32c16bb2060a6cc7e46d6cea84d07a0c86094270
elif command == 'config_write':
write_to_config(args['section'], args['option'], args['value'])
elif command == 'config_reload':
load_config()
elif command == "starttime":
<<<<<<< HEAD
starttime = float(list(args.values())[0])
=======
starttime = float(list(args.values)[0]) #TODO repace
>>>>>>> 32c16bb2060a6cc7e46d6cea84d07a0c86094270
print("Starting on:", time.ctime(starttime))
dt = starttime - get_ntp_time(NTP_HOST, NTP_PORT)
print("Until start:", dt)