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

Improve extraction of post-version information on Phoenix 4.0x and 4.0 BIOSes

Browse Source
This commit is contained in:
RichardG867
2021-12-17 19:12:19 -03:00
parent 4df4822c13
commit 3b798a6464
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
biostools/analyzers.py
View File

@@ -1612,7 +1612,7 @@ class PhoenixAnalyzer(Analyzer):
return self._trap_signon_nec
def _version_40rel(self, line, match):
'''Phoenix(MB)? ?BIOS ([0-9]\.[^\s]+ Release [0-9]\.[^\s]+)(?: (.+))?'''
'''Phoenix(MB)? ?BIOS ([0-9]\.[^\s]+ Release ([0-9]\.[0-9]+))(.+)?'''
# Extract version with release.
self.version = match.group(2)
@@ -1623,15 +1623,21 @@ class PhoenixAnalyzer(Analyzer):
self.version = prefix + ' ' + self.version
# Extract any additional information after the version
# as a sign-on, if one wasn't already found.
additional_info = match.group(3)
if additional_info and not self.signon:
self.signon = additional_info.rstrip()
# and modified version numbers as part of the sign-on.
additional_info = match.group(4)
version_num = match.group(3)
if version_num:
additional_info = version_num.rstrip() + additional_info.lstrip()
if additional_info:
if self.signon:
self.signon = additional_info + '\n' + self.signon
else:
self.signon = additional_info
return True
def _version_40x(self, line, match):
'''Phoenix(?:(MB)(?: BIOS)?| ?BIOS(?: (Developmental))?) Version +([0-9]\.[^\s.]+)(?:[\s\.](.+))?'''
'''Phoenix(?:(MB)(?: BIOS)?| ?BIOS(?: (Developmental))?) Version +([0-9]\.[0-9]+)(.+)?'''
# Extract version.
self.version = match.group(3)
@@ -1641,11 +1647,13 @@ class PhoenixAnalyzer(Analyzer):
if prefix:
self.version = prefix + ' ' + self.version
# Extract any additional information after the version
# as a sign-on, if one wasn't already found.
# Extract any additional information after the version.
additional_info = match.group(4)
if additional_info and not self.signon:
self.signon = additional_info.rstrip()
if additional_info:
if self.signon:
self.signon = additional_info + '\n' + self.signon
else:
self.signon = additional_info
return True