Commit 2629ee40 authored by James Coyle's avatar James Coyle

merging

parents 73bbb518 c778c917
Pipeline #1240 failed with stages
in 2 seconds
......@@ -126,7 +126,10 @@ def bridge_info(id):
def storjshare_json():
result_data = storjstatus_common.subprocess_result(['storjshare', 'status', '--json'])
return json.loads(result_data[0].decode('utf-8')) #result_json
if result_data[0].decode('utf-8') != '':
return json.loads(result_data[0].decode('utf-8')) #result_json
else:
return []
def config_json():
......@@ -167,6 +170,7 @@ def config_json():
def load_settings():
<<<<<<< HEAD
if storjstatus_common.get_os_type() == "win":
return load_settings_win()
elif storjstatus_common.get_os_type() == "linux":
......@@ -188,6 +192,8 @@ def load_settings_win():
def load_settings_linux():
=======
>>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
global APIKEY
global APISECRET
global SERVERGUID
......
<<<<<<< HEAD
__version__ = '0.3.0'
=======
__version__ = '0.2.7'
>>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment