Fixed formatting for call log window

This commit is contained in:
Cort Buffington 2018-11-29 14:05:36 -06:00
parent 4a00c4f799
commit e06e7fe087

View File

@ -229,11 +229,11 @@ def process_message(_message):
p = _message[1:].split(",") p = _message[1:].split(",")
if p[0] == 'GROUP VOICE': if p[0] == 'GROUP VOICE':
if p[1] == 'END': if p[1] == 'END':
log_message = '{}: {} {}: System: {}; Source: {} - {}; TS: {}; TGID: {}; Origin: {} - {}; Time: {}s'.format(_now, p[0], p[1], p[2], p[4], alias_string(int(p[4]), peer_ids), p[6], p[7], p[5], alias_string(int(p[5]), subscriber_ids), p[8]) log_message = '{}: {} {}: SYSTEM: {:15.15s} SRC: {:8.8s} {:20.20s} SUB: {:8.8s} {:25.25s} TS: {} TGID: {:>5s} {:12.12s} DURATION: {}s'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), SRC_ids), p[5], alias_short(int(p[5]), subscriber_ids), p[6], p[7], alias_tgid(int(p[7]), talkgroup_ids), p[8])
elif p[1] == 'START': elif p[1] == 'START':
log_message = '{}: {} {}: System: {}; Source: {} - {}; TS: {}; TGID: {}; Origin: {} - {}'.format(_now, p[0], p[1], p[2], p[4], alias_string(int(p[4]), peer_ids), p[6], p[7], p[5], alias_string(int(p[5]), subscriber_ids)) log_message = '{}: {} {}: SYSTEM: {:15.15s} SRC: {:8.8s} {:20.20s} SUB: {:8.8s} {:25.25s} TS: {} TGID: {:>5s} {:12.12s}'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), SRC_ids), p[5], alias_short(int(p[5]), subscriber_ids), p[6], p[7], alias_tgid(int(p[7]), talkgroup_ids))
elif p[1] == 'END WITHOUT MATCHING START': elif p[1] == 'END WITHOUT MATCHING START':
log_message = '{}: {} {} on HB System {}: Source: {} - {}; TS: {}; TGID: {}; Origin: {} - {}'.format(_now, p[0], p[1], p[2], p[4], alias_string(int(p[4]), peer_ids), p[6], p[7], p[5], alias_string(int(p[5]), subscriber_ids)) log_message = '{}: {} {}: SYSTEM: {:15.15s} SRC: {:8.8s} {:20.20s} SUB: {:8.8s} {:25.25s} TS: {} TGID: {:>5s} {:12.12s}'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), SRC_ids), p[5], alias_short(int(p[5]), subscriber_ids), p[6], p[7], alias_tgid(int(p[7]), talkgroup_ids))
else: else:
log_message = '{}: UNKNOWN GROUP VOICE LOG MESSAGE'.format(_now) log_message = '{}: UNKNOWN GROUP VOICE LOG MESSAGE'.format(_now)
else: else: