Skip to content

Commit a3587fd

Browse files
committed
Migrate hook call sites from removed load_or_install() to install()
Per maintainer feedback on PR #26: restore the intentional removal of ``Binary.load_or_install`` upstream by moving the hook scripts and plugin tests to call ``install()`` directly. ``install()`` already short-circuits when the binary is already valid, so functional behaviour is preserved.
1 parent 6f56b84 commit a3587fd

16 files changed

Lines changed: 18 additions & 18 deletions

File tree

abx_plugins/plugins/apt/on_BinaryRequest__13_apt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def main(
8080
err=True,
8181
)
8282

83-
binary = binary.load_or_install()
83+
binary = binary.install()
8484
except Exception as e:
8585
click.echo(f"apt install failed: {e}", err=True)
8686
sys.exit(1)

abx_plugins/plugins/bash/on_BinaryRequest__14_bash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def main(
7979
sys.exit(1)
8080

8181
try:
82-
binary = binary.load_or_install()
82+
binary = binary.install()
8383
except Exception as e:
8484
click.echo(f"bash install failed: {e}", err=True)
8585
sys.exit(1)

abx_plugins/plugins/brew/on_BinaryRequest__12_brew.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def main(
7676
err=True,
7777
)
7878

79-
binary = binary.load_or_install()
79+
binary = binary.install()
8080
except Exception as e:
8181
click.echo(f"brew install failed: {e}", err=True)
8282
sys.exit(1)

abx_plugins/plugins/cargo/on_BinaryRequest__12_cargo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def main(
7676
err=True,
7777
)
7878

79-
binary = binary.load_or_install()
79+
binary = binary.install()
8080
except Exception as e:
8181
click.echo(f"cargo install failed: {e}", err=True)
8282
sys.exit(1)

abx_plugins/plugins/chromewebstore/on_BinaryRequest__90_chromewebstore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def main(
7272
"min_version": min_version or extra_kwargs.get("min_version") or None,
7373
"overrides": json.loads(overrides) if overrides else {},
7474
},
75-
).load_or_install()
75+
).install()
7676

7777
if not binary.abspath:
7878
click.echo(f"{name} not resolved as Chrome Web Store extension", err=True)

abx_plugins/plugins/defuddle/tests/test_defuddle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def get_defuddle_binary_path() -> str | None:
6262
name="defuddle",
6363
binproviders=[NpmProvider(), EnvProvider()],
6464
overrides={"npm": {"install_args": ["defuddle"]}},
65-
).load_or_install()
65+
).install()
6666
if binary and binary.abspath:
6767
_defuddle_binary_path = str(binary.abspath)
6868
return _defuddle_binary_path

abx_plugins/plugins/forumdl/tests/test_forumdl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def get_forumdl_binary_path() -> str | None:
7474
],
7575
},
7676
},
77-
).load_or_install()
77+
).install()
7878
if binary and binary.abspath:
7979
_forumdl_binary_path = str(binary.abspath)
8080
return _forumdl_binary_path

abx_plugins/plugins/gallerydl/tests/test_gallerydl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def get_gallerydl_binary_path() -> str | None:
5555
binary = Binary(
5656
name="gallery-dl",
5757
binproviders=[PipProvider(), EnvProvider()],
58-
).load_or_install()
58+
).install()
5959
if binary and binary.abspath:
6060
_gallerydl_binary_path = str(binary.abspath)
6161
return _gallerydl_binary_path

abx_plugins/plugins/liteparse/tests/test_liteparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def get_liteparse_binary_path() -> str | None:
5151
name="lit",
5252
binproviders=[NpmProvider(), EnvProvider()],
5353
overrides={"npm": {"install_args": ["@llamaindex/liteparse"]}},
54-
).load_or_install()
54+
).install()
5555
if binary and binary.abspath:
5656
_liteparse_binary_path = str(binary.abspath)
5757
return _liteparse_binary_path

abx_plugins/plugins/mercury/tests/test_mercury.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def get_mercury_binary_path() -> str | None:
6262
name="postlight-parser",
6363
binproviders=[NpmProvider(), EnvProvider()],
6464
overrides={"npm": {"install_args": ["@postlight/parser"]}},
65-
).load_or_install()
65+
).install()
6666
if binary and binary.abspath:
6767
_mercury_binary_path = str(binary.abspath)
6868
return _mercury_binary_path

0 commit comments

Comments
 (0)