Merge branch 'dev' into ext-inst-pbar

This commit is contained in:
Jabasukuriputo Wang 2023-07-23 23:32:13 +08:00 committed by GitHub
commit f2a4073aea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 9 deletions

View file

@ -230,8 +230,11 @@ def run_extensions_installers(settings_file):
bar_format="{desc}: |{bar}|{percentage:3.0f}% [{n_fmt}/{total_fmt} {elapsed}<{remaining}]")
for dirname_extension in pbar_extensions:
pbar_extensions.set_description("Installing %s" % dirname_extension)
run_extension_installer(os.path.join(extensions_dir, dirname_extension))
startup_timer.record(dirname_extension)
path = os.path.join(extensions_dir, dirname_extension)
if os.path.isdir(path):
run_extension_installer(path)
startup_timer.record(dirname_extension)
re_requirement = re.compile(r"\s*([-_a-zA-Z0-9]+)\s*(?:==\s*([-+_.a-zA-Z0-9]+))?\s*")