Skip to content

Commit 27ce3cc

Browse files
committed
meta: Fix doctor command.
1 parent 5027b15 commit 27ce3cc

File tree

1 file changed

+40
-26
lines changed

1 file changed

+40
-26
lines changed

meta/plugins/doctor-cmd.py

+40-26
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import re
66

77

8-
def isVersionAtLeastOrEqual(actualVersion: tuple[int, ...], expectedVersion: tuple[int, ...]) -> bool:
8+
def isVersionAtLeastOrEqual(
9+
actualVersion: tuple[int, ...], expectedVersion: tuple[int, ...]
10+
) -> bool:
911
if len(actualVersion) < len(expectedVersion):
1012
return False
1113

@@ -25,7 +27,9 @@ def getVersionFromOutput(output: str, versionRegex: str) -> tuple[int, ...]:
2527
return ()
2628

2729

28-
def checkVersion(cmd: str, versionExpected: tuple[int, ...], versionCommand: str, versionRegex: str) -> tuple[bool, tuple[int, ...]]:
30+
def checkVersion(
31+
cmd: str, versionExpected: tuple[int, ...], versionCommand: str, versionRegex: str
32+
) -> tuple[bool, tuple[int, ...]]:
2933
try:
3034
result = subprocess.check_output([cmd, versionCommand]).decode("utf-8")
3135
actualVersion = getVersionFromOutput(result, versionRegex)
@@ -34,27 +38,35 @@ def checkVersion(cmd: str, versionExpected: tuple[int, ...], versionCommand: str
3438
return False, ()
3539

3640

37-
def commandIsAvailable(cmd: str, versionExpected: tuple[int, ...] = (0, 0, 0), versionCommand: str = "--version", versionRegex: str = r"\d+(\.\d+)+") -> bool:
41+
def commandIsAvailable(
42+
cmd: str,
43+
versionExpected: tuple[int, ...] = (0, 0, 0),
44+
versionCommand: str = "--version",
45+
versionRegex: str = r"\d+(\.\d+)+",
46+
) -> bool:
3847
print(f"Checking if {cmd} is available... ", end="")
3948
result = True
4049

4150
try:
4251
cmd = shell.latest(cmd)
4352
path = shell.which(cmd) or cmd
4453
versionMatch, version = checkVersion(
45-
cmd, versionExpected, versionCommand, versionRegex)
54+
cmd, versionExpected, versionCommand, versionRegex
55+
)
4656
if not versionMatch:
4757
if versionExpected == (0, 0, 0):
4858
print(f"{vt100.RED}not found{vt100.RESET}")
4959
else:
5060
print(f"{vt100.RED}too old{vt100.RESET}")
5161
print(
52-
f"Expected: {'.'.join(map(str, versionExpected))}\nActual: {'.'.join(map(str, version))}")
62+
f"Expected: {'.'.join(map(str, versionExpected))}\nActual: {'.'.join(map(str, version))}"
63+
)
5364
result = False
5465
else:
5566
print(f"{vt100.GREEN}ok{vt100.RESET}")
5667
print(
57-
f"{vt100.BRIGHT_BLACK}Command: {cmd}\nLocation: {path}\nVersion: {'.'.join(map(str, version))}{vt100.RESET}\n")
68+
f"{vt100.BRIGHT_BLACK}Command: {cmd}\nLocation: {path}\nVersion: {'.'.join(map(str, version))}{vt100.RESET}\n"
69+
)
5870
except Exception as e:
5971
print(f" {e}")
6072
print(f"{vt100.RED}Error: {cmd} is not available{vt100.RESET}")
@@ -74,7 +86,8 @@ def moduleIsAvailable(module: str) -> bool:
7486
if hasattr(mod, "__version__"):
7587
version = mod.__version__
7688
print(
77-
f"{vt100.BRIGHT_BLACK}Module: {module}\nVersion: {version}\nLocation: {path}{vt100.RESET}\n")
89+
f"{vt100.BRIGHT_BLACK}Module: {module}\nVersion: {version}\nLocation: {path}{vt100.RESET}\n"
90+
)
7891

7992
return True
8093
except Exception as e:
@@ -86,25 +99,26 @@ def moduleIsAvailable(module: str) -> bool:
8699
def doctorCmd(args: Args):
87100
everythingIsOk = True
88101

89-
everythingIsOk = everythingIsOk and moduleIsAvailable("requests")
90-
everythingIsOk = everythingIsOk and moduleIsAvailable("graphviz")
91-
everythingIsOk = everythingIsOk and moduleIsAvailable("magic")
92-
everythingIsOk = everythingIsOk and moduleIsAvailable("cutekit")
93-
everythingIsOk = everythingIsOk and moduleIsAvailable("chatty")
94-
everythingIsOk = everythingIsOk and commandIsAvailable(
95-
"qemu-system-x86_64")
96-
everythingIsOk = everythingIsOk and commandIsAvailable(
97-
"clang", versionExpected=(15,))
98-
everythingIsOk = everythingIsOk and commandIsAvailable(
99-
"clang++", versionExpected=(15,))
100-
everythingIsOk = everythingIsOk and commandIsAvailable(
101-
"ld.lld", versionExpected=(15,))
102-
everythingIsOk = everythingIsOk and commandIsAvailable("nasm")
103-
everythingIsOk = everythingIsOk and commandIsAvailable("ninja")
104-
everythingIsOk = everythingIsOk and commandIsAvailable(
105-
"cutekit", versionCommand="version")
106-
everythingIsOk = everythingIsOk and commandIsAvailable("chatty")
107-
everythingIsOk = everythingIsOk and commandIsAvailable("pkg-config")
102+
everythingIsOk = everythingIsOk & moduleIsAvailable("requests")
103+
everythingIsOk = everythingIsOk & moduleIsAvailable("graphviz")
104+
everythingIsOk = everythingIsOk & moduleIsAvailable("magic")
105+
everythingIsOk = everythingIsOk & moduleIsAvailable("cutekit")
106+
everythingIsOk = everythingIsOk & moduleIsAvailable("chatty")
107+
everythingIsOk = everythingIsOk & commandIsAvailable("qemu-system-x86_64")
108+
everythingIsOk = everythingIsOk & commandIsAvailable("clang", versionExpected=(15,))
109+
everythingIsOk = everythingIsOk & commandIsAvailable(
110+
"clang++", versionExpected=(15,)
111+
)
112+
everythingIsOk = everythingIsOk & commandIsAvailable(
113+
"ld.lld", versionExpected=(15,)
114+
)
115+
everythingIsOk = everythingIsOk & commandIsAvailable("nasm")
116+
everythingIsOk = everythingIsOk & commandIsAvailable("ninja")
117+
everythingIsOk = everythingIsOk & commandIsAvailable(
118+
"cutekit", versionCommand="version"
119+
)
120+
everythingIsOk = everythingIsOk & commandIsAvailable("chatty")
121+
everythingIsOk = everythingIsOk & commandIsAvailable("pkg-config")
108122

109123

110124
append(Cmd(None, "doctor", "Check if all required commands are available", doctorCmd))

0 commit comments

Comments
 (0)