From 964fe658edf4c1569a7485a43bf1cc82ea213bba Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Mon, 18 Apr 2022 14:23:39 -0300 Subject: [PATCH] Overhaul Compaq detector --- biostools/analyzers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/biostools/analyzers.py b/biostools/analyzers.py index 163f4d1..2e72abd 100644 --- a/biostools/analyzers.py +++ b/biostools/analyzers.py @@ -1319,8 +1319,11 @@ class CompaqAnalyzer(NoInfoAnalyzer): def __init__(self, *args, **kwargs): super().__init__('Compaq', *args, **kwargs) + self._copyright_pattern = re.compile(b'''Copyright COMPAQ Computer Corporation''') + self._error_pattern = re.compile(b'''Insert (?:DIAGNOSTIC diskette in Drive |COMPAQ DOS diskette)|You must load COMPAQ BASIC''') + def has_strings(self, file_data): - return b'Copyright COMPAQ Computer Corporation' in file_data and (b'Insert DIAGNOSTIC diskette in Drive ' in file_data or b'Insert COMPAQ DOS diskette' in file_data or b'You must load COMPAQ BASIC' in file_data) + return self._copyright_pattern.search(file_data) and self._error_pattern.search(file_data) class CopamAnalyzer(NoInfoAnalyzer):