colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sane-ip-reconnect: add type annotations to compound types

Browse Source
This commit is contained in:
Colin
2023-07-11 07:13:16 +00:00
parent 3bbc4aecbb
commit 79fca6c5e5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/additional/sane-scripts/src/sane-ip-reconnect
View File

@@ -19,7 +19,7 @@ def rm_color(stdout: str) -> str:
def rm_heading(stdout: str) -> str: def rm_heading(stdout: str) -> str:
return "\n".join(stdout.split("\n")[4:]) return "\n".join(stdout.split("\n")[4:])
def extract_columns(stdout: str) -> list: def extract_columns(stdout: str) -> list[tuple[str, str]]:
" split each line into two fields " " split each line into two fields "
lines = stdout.split("\n") lines = stdout.split("\n")
items = [] items = []
@@ -38,7 +38,7 @@ def extract_columns(stdout: str) -> list:
logger.debug(f"parsed iwctl output: {items!r}") logger.debug(f"parsed iwctl output: {items!r}")
return items return items
def iwctl(args: list, sudo: bool = False) -> str: def iwctl(args: list[str], sudo: bool = False) -> str:
cmd = [ "iwctl" ] + args cmd = [ "iwctl" ] + args
if sudo: if sudo:
cmd = [ "sudo" ] + cmd cmd = [ "sudo" ] + cmd
@@ -52,21 +52,21 @@ def scan() -> None:
iwctl(["station", "wlan0", "scan"], sudo=True) iwctl(["station", "wlan0", "scan"], sudo=True)
time.sleep(5) # give time for adapter to see networks time.sleep(5) # give time for adapter to see networks
def get_known() -> list: def get_known() -> list[str]:
stdout = iwctl(["known-networks", "list"]) stdout = iwctl(["known-networks", "list"])
stdout = rm_color(stdout) stdout = rm_color(stdout)
stdout = rm_heading(stdout) stdout = rm_heading(stdout)
logging.debug(f"iwctl known-networks list: got: {stdout}") logging.debug(f"iwctl known-networks list: got: {stdout}")
return [name for (name, date) in extract_columns(stdout)] return [name for (name, date) in extract_columns(stdout)]
def get_visible() -> list: def get_visible() -> list[tuple[str, int]]:
stdout = iwctl(["station", "wlan0", "get-networks", "rssi-dbms"]) stdout = iwctl(["station", "wlan0", "get-networks", "rssi-dbms"])
stdout = rm_color(stdout) stdout = rm_color(stdout)
stdout = rm_heading(stdout) stdout = rm_heading(stdout)
logging.debug(f"iwctl station wlan0 get-networks rssi-dbms: got: {stdout}") logging.debug(f"iwctl station wlan0 get-networks rssi-dbms: got: {stdout}")
return [(name, int(strength)) for (name, strength) in extract_columns(stdout)] return [(name, int(strength)) for (name, strength) in extract_columns(stdout)]
def choose_best(visible: list, known: list) -> str: def choose_best(visible: list[tuple[str, int]], known: list[str]) -> str:
candidates = [(name, strength) for (name, strength) in visible if name in known] candidates = [(name, strength) for (name, strength) in visible if name in known]
# the least-negative RSSI is the best # the least-negative RSSI is the best
return max(candidates, key=lambda c: c[1])[0] if candidates else None return max(candidates, key=lambda c: c[1])[0] if candidates else None