wayfinderak/ASB_submission_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try utf-16 if utf-8 fails

Browse Source
This commit is contained in:
Dustin Pianalto 2018-05-09 15:21:30 -08:00
parent 1c3e207f5d
commit 44080aa77a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exts/imports/process_files.py
View File

@ -51,10 +51,10 @@ def process_file(in_file, file_type) -> ConfigParser:
keep_blocks = bot_config['keep_blocks'][file_type] keep_blocks = bot_config['keep_blocks'][file_type]
lines = in_file.readlines() lines = in_file.readlines()
try: try:
data = [line.decode('utf-8') for line in lines] data = [line.decode(encoding='utf-8') for line in lines]
except UnicodeDecodeError: except UnicodeDecodeError:
try: try:
data = [line.decode('utf-16') for line in lines] data = [line.decode(encoding='utf-16') for line in lines]
except UnicodeDecodeError: except UnicodeDecodeError:
return 0 return 0
clean_data = list() clean_data = list()

2
exts/uploader.py
View File

@ -25,7 +25,7 @@ class Uploader:
unzipped = process_files.load_zip(file) unzipped = process_files.load_zip(file)
game_ini, dinos_data, mods = process_files.process_files(unzipped) game_ini, dinos_data, mods = process_files.process_files(unzipped)
if not game_ini and not dinos_data and not mods: if not game_ini and not dinos_data and not mods:
await msg.edit(content='There was an encoding error with one of the files provided' await msg.edit(content='There was an encoding error with one of the files provided '
'and they cannot be processed') 'and they cannot be processed')
return return
if dinos_data == dict(): if dinos_data == dict():