mirror/86Box-bios-tools
1
0
Fork 0
mirror of https://github.com/86Box/bios-tools.git synced 2026-02-26 14:03:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve Softpaq extraction resiliency

Browse Source
This commit is contained in:
RichardG867
2022-05-16 23:27:04 -03:00
parent 8900f19bab
commit bd52617e05
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
biostools/extractors.py
View File

@@ -2577,8 +2577,18 @@ class VMExtractor(ArchiveExtractor):
# Run QEMU.
self._run_qemu(hdd=os.path.join(self._dep_dir, 'freedos.img'), floppy=image_path, floppy_snapshot=False, vvfat=dest_dir, monitor_cmd=monitor_cmd, monitor_flag_file=flag_path)
# Detect and recover from a Softpaq crash.
if match.group(5):
temp_image_path = os.path.join(dest_dir, 'image')
if os.path.exists(temp_image_path) and os.path.getsize(temp_image_path) > 0:
try:
os.remove(image_path)
except:
pass
image_path = temp_image_path
# Remove temporary files. (exename.tmp = FastPacket)
util.remove_all((bat_path, os.path.join(dest_dir, 'monflag.dat'), exe_path, exe_path[:-3] + 'tmp', os.path.join(dest_dir, exe_name[:-3].upper() + 'TMP'), flag_path))
util.remove_all((bat_path, exe_path, exe_path[:-3] + 'tmp', os.path.join(dest_dir, exe_name[:-3].upper() + 'TMP'), flag_path))
# Extract image as an archive.
ret = self._extract_archive(image_path, dest_dir, remove=False)