mirror of
https://github.com/TheFunny/ArisuAutoSweeper
synced 2026-10-10 17:52:09 +00:00
fix: handle MuMu12 v4.0.4 default instance serial and improve instance naming
This commit is contained in:
@@ -299,12 +299,23 @@ class Emulator(EmulatorBase):
|
|||||||
for folder in self.list_folder('../vms', is_dir=True):
|
for folder in self.list_folder('../vms', is_dir=True):
|
||||||
for file in iter_folder(folder, ext='.nemu'):
|
for file in iter_folder(folder, ext='.nemu'):
|
||||||
serial = Emulator.vbox_file_to_serial(file)
|
serial = Emulator.vbox_file_to_serial(file)
|
||||||
|
name = os.path.basename(folder)
|
||||||
if serial:
|
if serial:
|
||||||
yield EmulatorInstance(
|
yield EmulatorInstance(
|
||||||
serial=serial,
|
serial=serial,
|
||||||
name=os.path.basename(folder),
|
name=name,
|
||||||
path=self.path,
|
path=self.path,
|
||||||
)
|
)
|
||||||
|
# Fix for MuMu12 v4.0.4, default instance of which has no forward record in vbox config
|
||||||
|
else:
|
||||||
|
instance = EmulatorInstance(
|
||||||
|
serial=serial,
|
||||||
|
name=name,
|
||||||
|
path=self.path,
|
||||||
|
)
|
||||||
|
if instance.MuMuPlayer12_id:
|
||||||
|
instance.serial = f'127.0.0.1:{16384 + 32 * instance.MuMuPlayer12_id}'
|
||||||
|
yield instance
|
||||||
elif self == Emulator.MEmuPlayer:
|
elif self == Emulator.MEmuPlayer:
|
||||||
# ./MemuHyperv VMs/{name}/{name}.memu
|
# ./MemuHyperv VMs/{name}/{name}.memu
|
||||||
for folder in self.list_folder('./MemuHyperv VMs', is_dir=True):
|
for folder in self.list_folder('./MemuHyperv VMs', is_dir=True):
|
||||||
|
|||||||
Reference in New Issue
Block a user