ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix USE_DASHBOARD issue

This commit is contained in:
KF7EEL 2021-12-09 13:58:17 -08:00
parent e05b826fd4
commit e8c2f9ee25
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
data_gateway.py
View File

@ -529,7 +529,7 @@ def aprs_send(packet):
logger.info('Packet sent to APRS-IS.') logger.info('Packet sent to APRS-IS.')
def dashboard_loc_write(call, lat, lon, time, comment, dmr_id): def dashboard_loc_write(call, lat, lon, time, comment, dmr_id):
if CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True: if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True: if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True:
send_dash_loc(CONFIG, call, lat, lon, time, comment, dmr_id) send_dash_loc(CONFIG, call, lat, lon, time, comment, dmr_id)
else: else:
@ -560,7 +560,7 @@ def dashboard_loc_write(call, lat, lon, time, comment, dmr_id):
pass pass
def dashboard_bb_write(call, dmr_id, time, bulletin, system_name): def dashboard_bb_write(call, dmr_id, time, bulletin, system_name):
if CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True: if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True: if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True:
send_bb(CONFIG, call, dmr_id, bulletin, system_name) send_bb(CONFIG, call, dmr_id, bulletin, system_name)
else: else:
@ -616,7 +616,7 @@ def mailbox_write(call, dmr_id, time, message, recipient):
pass pass
def mailbox_delete(dmr_id): def mailbox_delete(dmr_id):
if CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True: if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
mail_file = ast.literal_eval(os.popen('cat ' + the_mailbox_file).read()) mail_file = ast.literal_eval(os.popen('cat ' + the_mailbox_file).read())
call = str(get_alias((dmr_id), subscriber_ids)) call = str(get_alias((dmr_id), subscriber_ids))
new_data = [] new_data = []
@ -632,7 +632,7 @@ def mailbox_delete(dmr_id):
def sos_write(dmr_id, time, message): def sos_write(dmr_id, time, message):
if CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True: if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read()) user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
print(user_settings) print(user_settings)
try: try:
@ -861,11 +861,11 @@ def process_sms(_rf_src, sms, call_type, system_name):
## logger.info(error_exception) ## logger.info(error_exception)
## logger.info(str(traceback.extract_tb(error_exception.__traceback__))) ## logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
elif '*SOS' in sms or '@NOTICE' in sms: ## elif '*SOS' in sms or '@NOTICE' in sms:
sos_write(int_id(_rf_src), time(), sms) ## sos_write(int_id(_rf_src), time(), sms)
elif '*REM SOS' == sms: ## elif '*REM SOS' == sms:
os.remove(emergency_sos_file) ## os.remove(emergency_sos_file)
logger.info('Removing SOS or Notice') ## logger.info('Removing SOS or Notice')
elif '@' in parse_sms[0][0:1] and 'M-' in parse_sms[1][0:2]: elif '@' in parse_sms[0][0:1] and 'M-' in parse_sms[1][0:2]:
message = re.sub('^@|.* M-|','',sms) message = re.sub('^@|.* M-|','',sms)
@ -1907,30 +1907,30 @@ if __name__ == '__main__':
with open(user_settings_file, 'w') as user_dict_file: with open(user_settings_file, 'w') as user_dict_file:
user_dict_file.write("{1: [{'call': 'N0CALL'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]}") user_dict_file.write("{1: [{'call': 'N0CALL'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]}")
user_dict_file.close() user_dict_file.close()
if CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True: ## if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
# Check to see if dashboard files exist ## # Check to see if dashboard files exist
if Path(loc_file).is_file(): ## if Path(loc_file).is_file():
pass ## pass
else: ## else:
Path(loc_file).touch() ## Path(loc_file).touch()
with open(loc_file, 'w') as user_loc_file: ## with open(loc_file, 'w') as user_loc_file:
user_loc_file.write("[]") ## user_loc_file.write("[]")
user_loc_file.close() ## user_loc_file.close()
if Path(bb_file).is_file(): ## if Path(bb_file).is_file():
pass ## pass
else: ## else:
Path(bb_file).touch() ## Path(bb_file).touch()
with open(bb_file, 'w') as user_bb_file: ## with open(bb_file, 'w') as user_bb_file:
user_bb_file.write("[]") ## user_bb_file.write("[]")
user_bb_file.close() ## user_bb_file.close()
##
if Path(sms_file).is_file(): ## if Path(sms_file).is_file():
pass ## pass
else: ## else:
Path(sms_file).touch() ## Path(sms_file).touch()
with open(sms_file, 'w') as user_sms_file: ## with open(sms_file, 'w') as user_sms_file:
user_sms_file.write("[]") ## user_sms_file.write("[]")
user_sms_file.close() ## user_sms_file.close()
## try: ## try:
## Path('/tmp/.hblink_data_que_' + str(CONFIG['DATA_CONFIG']['APRS_LOGIN_CALL']).upper() + '/').mkdir(parents=True, exist_ok=True) ## Path('/tmp/.hblink_data_que_' + str(CONFIG['DATA_CONFIG']['APRS_LOGIN_CALL']).upper() + '/').mkdir(parents=True, exist_ok=True)
## logger.info('Created que directory') ## logger.info('Created que directory')