github-mirrors/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-06-27 17:09:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle multiline log output without proper log file timestamp headers like produced by KnowIt errors

Browse source
This commit is contained in:
JayZed 2025-04-12 15:24:13 -04:00 • committed by GitHub
parent d6e7773a0f
commit e91b71c6ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
bazarr/api/system/logs.py
View file

@ -54,9 +54,13 @@ class SystemLogs(Resource):
include = include.casefold() include = include.casefold()
exclude = exclude.casefold() exclude = exclude.casefold()
# regular expression to identify the start of a log record (timestamp-based)
record_start_pattern = re.compile(r"^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}")
with io.open(get_log_file_path(), encoding='UTF-8') as file: with io.open(get_log_file_path(), encoding='UTF-8') as file:
raw_lines = file.read() raw_lines = file.read()
lines = raw_lines.split('|\n') lines = raw_lines.split('|\n')
multi_line_record = []
for line in lines: for line in lines:
if line == '': if line == '':
continue continue
@ -86,18 +90,34 @@ class SystemLogs(Resource):
skip = exclude in compare_line skip = exclude in compare_line
if skip: if skip:
continue continue
raw_message = line.split('|') # check if the line has a timestamp that matches the start of a new log record
raw_message_len = len(raw_message) if record_start_pattern.match(line):
if raw_message_len > 3: if multi_line_record:
log = dict() # finalize the multi line record and update the exception of the last entry
log["timestamp"] = raw_message[0] last_log = logs[-1]
log["type"] = raw_message[1].rstrip() last_log["exception"] += "\n" + "\n".join(multi_line_record)
log["message"] = raw_message[3] # reset for the next multi-line record
if raw_message_len > 4 and raw_message[4] != '\n': multi_line_record = []
log['exception'] = raw_message[4].strip('\'').replace(' ', '\u2003\u2003') raw_message = line.split('|')
else: raw_message_len = len(raw_message)
log['exception'] = None if raw_message_len > 3:
logs.append(log) log = dict()
log["timestamp"] = raw_message[0]
log["type"] = raw_message[1].rstrip()
log["message"] = raw_message[3]
if raw_message_len > 4 and raw_message[4] != '\n':
log['exception'] = raw_message[4].strip('\'').replace(' ', '\u2003\u2003')
else:
log['exception'] = None
logs.append(log)
else:
# accumulate lines that do not have new record header timestamps
multi_line_record.append(line.strip())
if multi_line_record:
# finalize the multi line record and update the exception of the last entry
last_log = logs[-1]
last_log["exception"] += "\n".join(multi_line_record)
logs.reverse() logs.reverse()
return marshal(logs, self.get_response_model, envelope='data') return marshal(logs, self.get_response_model, envelope='data')