ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-06 10:23:06 +03:00
Code Issues Projects Releases Wiki Activity

Made sure to handle non-utf8 locales

Browse Source
This commit is contained in:
A_D 2020-12-02 15:57:42 +02:00
parent 52d39dc5fd
commit 977e62188a
No known key found for this signature in database
GPG Key ID: 4BE9EB7DF45076C4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EDMC.py
View File

@ -173,7 +173,11 @@ sys.path: {sys.path}'''
if args.j: if args.j:
logger.debug('Import and collate from JSON dump') logger.debug('Import and collate from JSON dump')
# Import and collate from JSON dump # Import and collate from JSON dump
try:
data = json.load(open(args.j)) data = json.load(open(args.j))
except UnicodeDecodeError:
data = json.load(open(args.j, encoding='utf-8'))
config.set('querytime', int(getmtime(args.j))) config.set('querytime', int(getmtime(args.j)))
else: else:
@ -188,7 +192,7 @@ sys.path: {sys.path}'''
logfile = join(logdir, logfiles[-1]) logfile = join(logdir, logfiles[-1])
logger.debug(f'Using logfile "{logfile}"') logger.debug(f'Using logfile "{logfile}"')
with open(logfile, 'r') as loghandle: with open(logfile, 'r', encoding='utf-8') as loghandle:
for line in loghandle: for line in loghandle:
try: try:
monitor.parse_entry(line) monitor.parse_entry(line)