sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: UnicodeDecodeError when getting serial

Browse Source
This commit is contained in:
SarContDeli 2022-10-17 22:09:58 +08:00
parent c9530e7a5a
commit 7029375ca3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/emulator.py
View File

@ -118,7 +118,7 @@ class VirtualBoxEmulator:
serial = [] serial = []
for file in vbox: for file in vbox:
with open(file, 'r') as f: with open(file, 'r', encoding='utf-8', errors='ignore') as f:
for line in f.readlines(): for line in f.readlines():
# <Forwarding name="port2" proto="1" hostip="127.0.0.1" hostport="62026" guestport="5555"/> # <Forwarding name="port2" proto="1" hostip="127.0.0.1" hostport="62026" guestport="5555"/>
res = re.search('<*?hostport="(.*?)".*?guestport="5555"/>', line) res = re.search('<*?hostport="(.*?)".*?guestport="5555"/>', line)

2
deploy/install/emulator_windows.py
View File

@ -169,7 +169,7 @@ class Emulator:
str: serial such as `127.0.0.1:5555` str: serial such as `127.0.0.1:5555`
""" """
regex = re.compile('<*?hostport="(.*?)".*?guestport="5555"/>') regex = re.compile('<*?hostport="(.*?)".*?guestport="5555"/>')
with open(file, 'r') as f: with open(file, 'r', encoding='utf-8', errors='ignore') as f:
for line in f.readlines(): for line in f.readlines():
# <Forwarding name="port2" proto="1" hostip="127.0.0.1" hostport="62026" guestport="5555"/> # <Forwarding name="port2" proto="1" hostip="127.0.0.1" hostport="62026" guestport="5555"/>
res = regex.search(line) res = regex.search(line)

2
module/device/emulator.py
View File

@ -54,7 +54,7 @@ class EmulatorInstance(VirtualBoxEmulator):
serial = [] serial = []
for file in vbox: for file in vbox:
with open(file, 'r') as f: with open(file, 'r', encoding='utf-8', errors='ignore') as f:
for line in f.readlines(): for line in f.readlines():
# <Forwarding name="port2" proto="1" hostip="127.0.0.1" hostport="62026" guestport="5555"/> # <Forwarding name="port2" proto="1" hostip="127.0.0.1" hostport="62026" guestport="5555"/>
res = re.search('<*?hostport="(.*?)".*?guestport="5555"/>', line) res = re.search('<*?hostport="(.*?)".*?guestport="5555"/>', line)