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 16:14:35 -08:00
parent 0f38caf97a
commit 9a27f58f67
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exts/imports/process_files.py
View File

@ -49,9 +49,9 @@ def process_file(in_file, file_type, encoding) -> ConfigParser:
bot_config = json.load(f) bot_config = json.load(f)
ignore_strings = bot_config['ignore_strings'][file_type] ignore_strings = bot_config['ignore_strings'][file_type]
keep_blocks = bot_config['keep_blocks'][file_type] keep_blocks = bot_config['keep_blocks'][file_type]
# data = in_file.readlines() data = in_file.readlines()
# data = [line.decode() for line in in_file] # data = [line.decode() for line in in_file]
data = [line.decode(encoding=encoding) for line in in_file] # data = [line.decode(encoding=encoding) for line in in_file]
clean_data = list() clean_data = list()
if ignore_strings: if ignore_strings:
@ -98,7 +98,10 @@ def process_files(z) -> (ConfigParser, ConfigParser, list):
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
print(e) print(e)
try: try:
with open(f'{path}{filename}', encoding='utf-16-le') as file: with open(f'{path}{filename}', 'w+b') as file:
contents = file.read()
file.write(contents.decode('utf-16-le').encode('utf-8'))
with open(f'{path}{filename}', encoding='utf-8') as file:
game_config = process_file(file, 'game.ini', 'utf-16-le') game_config = process_file(file, 'game.ini', 'utf-16-le')
mods = check_for_mods(file) mods = check_for_mods(file)
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
@ -112,7 +115,10 @@ def process_files(z) -> (ConfigParser, ConfigParser, list):
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
print(e) print(e)
try: try:
with open(f'{path}{filename}', encoding='utf-16-le') as file: with open(f'{path}{filename}', 'w+b') as file:
contents = file.read()
file.write(contents.decode('utf-16-le').encode('utf-8'))
with open(f'{path}{filename}', encoding='utf-8') as file:
dino_data[filename] = process_file(file, 'dino.ini', 'utf-16-le') dino_data[filename] = process_file(file, 'dino.ini', 'utf-16-le')
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
print(e) print(e)