Improve parsing. (#786)

This commit is contained in:
Felix Fontein
2024-02-01 18:52:31 +01:00
committed by GitHub
parent c97ac2337f
commit 7b554082ea
3 changed files with 104 additions and 1 deletions
+2 -1
View File
@@ -66,6 +66,7 @@ DOCKER_PULL_PROGRESS_DONE = frozenset((
))
DOCKER_PULL_PROGRESS_WORKING = frozenset((
'Pulling fs layer',
'Waiting',
'Downloading',
'Verifying Checksum',
'Extracting',
@@ -130,7 +131,7 @@ _RE_PULL_PROGRESS = re.compile(
r'\s+'
r'(?P<status>%s)'
r'\s*'
r'(?:|\s\[[^]]+\]\s+\S+\s*)'
r'(?:|\s\[[^]]+\]\s+\S+\s*|\s+[0-9.kKmMgGbB]+/[0-9.kKmMgGbB]+\s*)'
r'$'
% '|'.join(re.escape(status) for status in sorted(DOCKER_PULL_PROGRESS_DONE | DOCKER_PULL_PROGRESS_WORKING))
)