lash 1.3.2__tar.gz → 1.3.2.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {lash-1.3.2 → lash-1.3.2.1}/PKG-INFO +1 -1
- {lash-1.3.2 → lash-1.3.2.1}/lash/core/plugin_manager.py +43 -42
- lash-1.3.2.1/lash/plugins/__init__.py +211 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/static/index.html +206 -73
- lash-1.3.2.1/lash/plugins/share/tests/test_page_zip.py +125 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/cli.py +5 -1
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/core.py +60 -16
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/helpers.py +19 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/tests/test_discovery.py +56 -1
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/tests/test_server.py +35 -1
- lash-1.3.2.1/lash/plugins/todo/tui.tcss +238 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash.egg-info/PKG-INFO +1 -1
- {lash-1.3.2 → lash-1.3.2.1}/lash.egg-info/SOURCES.txt +2 -0
- {lash-1.3.2 → lash-1.3.2.1}/pyproject.toml +2 -1
- {lash-1.3.2 → lash-1.3.2.1}/tests/core/test_downloader.py +88 -16
- {lash-1.3.2 → lash-1.3.2.1}/tests/core/test_plugin_list.py +38 -14
- lash-1.3.2.1/tests/core/test_plugin_registry.py +401 -0
- {lash-1.3.2 → lash-1.3.2.1}/tests/core/test_remover.py +74 -14
- lash-1.3.2/lash/plugins/__init__.py +0 -99
- lash-1.3.2/tests/core/test_plugin_registry.py +0 -213
- {lash-1.3.2 → lash-1.3.2.1}/LICENSE +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/README.md +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/__main__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/core/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/core/lazy_group.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/core/net.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/audio/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/audio/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/audio/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/audio/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/audio/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/audio/tests/test_audio.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/backup/tests/test_helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/crack/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/crack/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/crack/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/crack/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/crack/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/crack/tests/test_crack.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/device/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/device/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/device/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/device/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/device/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/device/tests/test_device.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/file/tests/test_helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/github/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/github/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/github/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/github/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/github/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/gnews/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/image/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/image/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/image/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/image/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/image/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/image/tests/test_image.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/tests/conftest.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/keylogger/tests/test_keylogger.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/macro/tests/test_shortcuts.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/monitor/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/monitor/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/monitor/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/monitor/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/monitor/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/monitor/tests/test_monitor.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/random/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/sched/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/tests/test_helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/share/tests/test_server.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/spider/tests/conftest.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/helpers.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/tests/test_core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/todo/tui.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/video/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/video/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/video/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/video/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/video/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/video/tests/test_video.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/wikip/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/wikip/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/wikip/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/wikip/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/wikip/tests/test_cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/yt/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/yt/cli.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/yt/core.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/yt/manifest.json +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash/plugins/yt/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash.egg-info/dependency_links.txt +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash.egg-info/entry_points.txt +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash.egg-info/requires.txt +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/lash.egg-info/top_level.txt +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/setup.cfg +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/tests/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/tests/core/__init__.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/tests/core/test_fixer.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/tests/core/test_lazy_group.py +0 -0
- {lash-1.3.2 → lash-1.3.2.1}/tests/test_lazy_group.py +0 -0
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import re
|
|
2
1
|
import shutil
|
|
3
2
|
import subprocess
|
|
4
3
|
import sys
|
|
@@ -10,10 +9,6 @@ from lash import plugins as plugin_registry
|
|
|
10
9
|
_console = Console()
|
|
11
10
|
|
|
12
11
|
|
|
13
|
-
def _package_name(requirement):
|
|
14
|
-
return re.split(r"[><=!]", requirement)[0].strip()
|
|
15
|
-
|
|
16
|
-
|
|
17
12
|
def _detect_installer(requires):
|
|
18
13
|
probe = subprocess.run(
|
|
19
14
|
[sys.executable, "-m", "pip", "--version"],
|
|
@@ -91,23 +86,27 @@ def make_download_command(*, plugins_dir=None, state_file=None): # noqa: C901
|
|
|
91
86
|
|
|
92
87
|
|
|
93
88
|
def _install_plugin(plugin_name, available, state_file): # noqa: C901
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
89
|
+
state = plugin_registry._load_state(state_file)
|
|
90
|
+
installed_cmds = state.get("installed_commands", {})
|
|
91
|
+
removed_cmds = set(state.get("removed_commands", []))
|
|
92
|
+
manifest = available[plugin_name]
|
|
93
|
+
is_core = manifest.get("core", False)
|
|
97
94
|
commands_to_install = {
|
|
98
95
|
cmd_name: cmd_info
|
|
99
|
-
for cmd_name, cmd_info in
|
|
100
|
-
if
|
|
96
|
+
for cmd_name, cmd_info in manifest["commands"].items()
|
|
97
|
+
if not plugin_registry.is_command_active(
|
|
98
|
+
cmd_name, cmd_info, is_core, removed_cmds)
|
|
101
99
|
}
|
|
102
100
|
if not commands_to_install:
|
|
103
101
|
click.echo(f"Plugin '{plugin_name}' already installed.")
|
|
104
102
|
return
|
|
105
103
|
|
|
106
|
-
requires =
|
|
104
|
+
requires = sorted(
|
|
107
105
|
{
|
|
108
106
|
req
|
|
109
107
|
for cmd_info in commands_to_install.values()
|
|
110
108
|
for req in cmd_info.get("requires", [])
|
|
109
|
+
if not plugin_registry.is_package_installed(req)
|
|
111
110
|
}
|
|
112
111
|
)
|
|
113
112
|
|
|
@@ -130,11 +129,17 @@ def _install_plugin(plugin_name, available, state_file): # noqa: C901
|
|
|
130
129
|
f"Dependency install failed:\n{result.stderr}"
|
|
131
130
|
)
|
|
132
131
|
|
|
132
|
+
# Record only deps lash installed: pre-existing ones are never
|
|
133
|
+
# uninstalled by `plugin remove`.
|
|
133
134
|
for cmd_name, cmd_info in commands_to_install.items():
|
|
135
|
+
previous = installed_cmds.get(cmd_name, {}).get("requires", [])
|
|
136
|
+
installed_now = [
|
|
137
|
+
req for req in cmd_info.get("requires", []) if req in requires
|
|
138
|
+
]
|
|
134
139
|
plugin_registry.mark_command_installed(
|
|
135
140
|
cmd_name,
|
|
136
141
|
plugin_name,
|
|
137
|
-
|
|
142
|
+
sorted(set(previous) | set(installed_now)),
|
|
138
143
|
state_file=state_file,
|
|
139
144
|
)
|
|
140
145
|
click.echo(f"Installed: {plugin_name}")
|
|
@@ -145,21 +150,16 @@ download = make_download_command()
|
|
|
145
150
|
|
|
146
151
|
def _list_installed_plugins(available, state_file):
|
|
147
152
|
state = plugin_registry._load_state(state_file)
|
|
148
|
-
installed_cmds = state.get("installed_commands", {})
|
|
149
153
|
removed_cmds = set(state.get("removed_commands", []))
|
|
150
|
-
installed = [
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
if
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
any_installed = any(
|
|
160
|
-
cmd in installed_cmds for cmd in manifest["commands"])
|
|
161
|
-
if any_installed:
|
|
162
|
-
installed.append(name)
|
|
154
|
+
installed = [
|
|
155
|
+
name
|
|
156
|
+
for name, manifest in available.items()
|
|
157
|
+
if any(
|
|
158
|
+
plugin_registry.is_command_active(
|
|
159
|
+
cmd_name, cmd_info, manifest.get("core", False), removed_cmds)
|
|
160
|
+
for cmd_name, cmd_info in manifest["commands"].items()
|
|
161
|
+
)
|
|
162
|
+
]
|
|
163
163
|
if installed:
|
|
164
164
|
click.echo(f"Installed: {', '.join(sorted(installed))}")
|
|
165
165
|
else:
|
|
@@ -206,27 +206,27 @@ def _collect_remove_commands(available, plugins, state_file):
|
|
|
206
206
|
_list_installed_plugins(available, state_file)
|
|
207
207
|
raise SystemExit(1)
|
|
208
208
|
manifest = available[plugin_name]
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
209
|
+
is_core = manifest.get("core", False)
|
|
210
|
+
commands_to_remove.update(
|
|
211
|
+
cmd_name
|
|
212
|
+
for cmd_name, cmd_info in manifest["commands"].items()
|
|
213
|
+
if cmd_name in installed_cmds
|
|
214
|
+
or plugin_registry.is_command_active(
|
|
215
|
+
cmd_name, cmd_info, is_core, removed_cmds)
|
|
216
|
+
)
|
|
217
217
|
return commands_to_remove
|
|
218
218
|
|
|
219
219
|
|
|
220
220
|
def _execute_remove(commands_to_remove, state_file, plugins_dir):
|
|
221
|
-
|
|
221
|
+
commands_to_remove = sorted(commands_to_remove)
|
|
222
|
+
orphaned = plugin_registry.remove_commands(
|
|
223
|
+
commands_to_remove, state_file=state_file, plugins_dir=plugins_dir
|
|
224
|
+
)
|
|
222
225
|
for cmd_name in commands_to_remove:
|
|
223
|
-
orphaned = plugin_registry.remove_command(
|
|
224
|
-
cmd_name, state_file=state_file, plugins_dir=plugins_dir
|
|
225
|
-
)
|
|
226
|
-
all_orphaned.update(orphaned)
|
|
227
226
|
click.echo(f" - {cmd_name}")
|
|
228
|
-
if
|
|
229
|
-
pkg_names =
|
|
227
|
+
if orphaned:
|
|
228
|
+
pkg_names = sorted(
|
|
229
|
+
{plugin_registry.requirement_name(r) for r in orphaned})
|
|
230
230
|
click.echo(
|
|
231
231
|
f"Uninstalling orphaned dependencies: {
|
|
232
232
|
', '.join(pkg_names)}")
|
|
@@ -369,7 +369,8 @@ def _collect_active_requires(available, installed_cmds, removed_cmds):
|
|
|
369
369
|
for cmd_name, cmd_info in manifest["commands"].items():
|
|
370
370
|
if cmd_name in removed_cmds:
|
|
371
371
|
continue
|
|
372
|
-
if
|
|
372
|
+
if cmd_name in installed_cmds or plugin_registry.is_command_active(
|
|
373
|
+
cmd_name, cmd_info, is_core, removed_cmds):
|
|
373
374
|
active_requires.update(cmd_info.get("requires", []))
|
|
374
375
|
return active_requires
|
|
375
376
|
|
|
@@ -0,0 +1,211 @@
|
|
|
1
|
+
import hashlib
|
|
2
|
+
import importlib.metadata
|
|
3
|
+
import json
|
|
4
|
+
import os
|
|
5
|
+
import pathlib
|
|
6
|
+
import re
|
|
7
|
+
import sys
|
|
8
|
+
import tomllib
|
|
9
|
+
from functools import cache
|
|
10
|
+
|
|
11
|
+
_DEFAULT_PLUGINS_DIR = pathlib.Path(__file__).parent
|
|
12
|
+
_PYPROJECT = pathlib.Path(__file__).parents[2] / "pyproject.toml"
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
def _env_state_file():
|
|
16
|
+
"""State file of the current Python environment (venv or global).
|
|
17
|
+
|
|
18
|
+
Each environment keeps its own state so plugins added or removed in one
|
|
19
|
+
venv don't leak into another one.
|
|
20
|
+
"""
|
|
21
|
+
prefix = os.path.normcase(os.path.realpath(sys.prefix))
|
|
22
|
+
env_id = hashlib.sha256(prefix.encode()).hexdigest()[:16]
|
|
23
|
+
return pathlib.Path.home() / ".lash" / "envs" / f"{env_id}.json"
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
_DEFAULT_STATE_FILE = _env_state_file()
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
def _load_state(state_file):
|
|
30
|
+
state_file = pathlib.Path(state_file or _DEFAULT_STATE_FILE)
|
|
31
|
+
if not state_file.exists():
|
|
32
|
+
return {"installed_commands": {}}
|
|
33
|
+
try:
|
|
34
|
+
return json.loads(state_file.read_text())
|
|
35
|
+
except (json.JSONDecodeError, AttributeError):
|
|
36
|
+
return {"installed_commands": {}}
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
def _save_state(state, state_file):
|
|
40
|
+
state_file = pathlib.Path(state_file or _DEFAULT_STATE_FILE)
|
|
41
|
+
state_file.parent.mkdir(parents=True, exist_ok=True)
|
|
42
|
+
state_file.write_text(json.dumps(state, indent=2))
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def _normalize(name):
|
|
46
|
+
return re.sub(r"[-_.]+", "-", name).lower()
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
def requirement_name(requirement):
|
|
50
|
+
"""'Pillow>=9.3.0' -> 'pillow'; 'markdown-it-py (>=2.2.0)' -> 'markdown-it-py'."""
|
|
51
|
+
name = re.split(r"[\s\[(<>=!~;@]", requirement.strip(), maxsplit=1)[0]
|
|
52
|
+
return _normalize(name)
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
def is_package_installed(requirement):
|
|
56
|
+
try:
|
|
57
|
+
importlib.metadata.distribution(requirement_name(requirement))
|
|
58
|
+
except importlib.metadata.PackageNotFoundError:
|
|
59
|
+
return False
|
|
60
|
+
return True
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
def requirements_satisfied(requires):
|
|
64
|
+
return all(is_package_installed(req) for req in requires)
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
def is_command_active(cmd_name, cmd_info, is_core, removed_cmds):
|
|
68
|
+
"""Core commands and commands whose deps are all present are active."""
|
|
69
|
+
if cmd_name in removed_cmds:
|
|
70
|
+
return False
|
|
71
|
+
return is_core or requirements_satisfied(cmd_info.get("requires", []))
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
def _is_extra(requirement):
|
|
75
|
+
return re.search(r";.*\bextra\s*==", requirement) is not None
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
def _lash_requirements():
|
|
79
|
+
try:
|
|
80
|
+
requires = importlib.metadata.requires("lash") or []
|
|
81
|
+
except importlib.metadata.PackageNotFoundError:
|
|
82
|
+
project = tomllib.loads(_PYPROJECT.read_text())["project"]
|
|
83
|
+
requires = project["dependencies"]
|
|
84
|
+
return [req for req in requires if not _is_extra(req)]
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
@cache
|
|
88
|
+
def protected_packages():
|
|
89
|
+
"""Lash and its base deps (transitively). Never uninstalled by plugins."""
|
|
90
|
+
protected = {"lash"}
|
|
91
|
+
pending = [requirement_name(req) for req in _lash_requirements()]
|
|
92
|
+
while pending:
|
|
93
|
+
name = pending.pop()
|
|
94
|
+
if name in protected:
|
|
95
|
+
continue
|
|
96
|
+
protected.add(name)
|
|
97
|
+
try:
|
|
98
|
+
requires = importlib.metadata.requires(name) or []
|
|
99
|
+
except importlib.metadata.PackageNotFoundError:
|
|
100
|
+
continue
|
|
101
|
+
pending.extend(
|
|
102
|
+
requirement_name(req) for req in requires if not _is_extra(req)
|
|
103
|
+
)
|
|
104
|
+
return frozenset(protected)
|
|
105
|
+
|
|
106
|
+
|
|
107
|
+
def get_available_plugins(*, plugins_dir=None):
|
|
108
|
+
plugins_dir = pathlib.Path(plugins_dir or _DEFAULT_PLUGINS_DIR)
|
|
109
|
+
plugins = {}
|
|
110
|
+
for entry in plugins_dir.iterdir():
|
|
111
|
+
if not entry.is_dir():
|
|
112
|
+
continue
|
|
113
|
+
manifest_file = entry / "manifest.json"
|
|
114
|
+
if not manifest_file.exists():
|
|
115
|
+
continue
|
|
116
|
+
manifest = json.loads(manifest_file.read_text())
|
|
117
|
+
plugins[manifest["name"]] = manifest
|
|
118
|
+
return plugins
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
def get_lazy_commands(*, plugins_dir=None, state_file=None):
|
|
122
|
+
state = _load_state(state_file)
|
|
123
|
+
removed_cmds = set(state.get("removed_commands", []))
|
|
124
|
+
available = get_available_plugins(plugins_dir=plugins_dir)
|
|
125
|
+
|
|
126
|
+
commands = {}
|
|
127
|
+
for manifest in available.values():
|
|
128
|
+
is_core = manifest.get("core", False)
|
|
129
|
+
for cmd_name, cmd_info in manifest["commands"].items():
|
|
130
|
+
if is_command_active(cmd_name, cmd_info, is_core, removed_cmds):
|
|
131
|
+
commands[cmd_name] = {
|
|
132
|
+
"module": cmd_info["module"],
|
|
133
|
+
"description": cmd_info["description"],
|
|
134
|
+
}
|
|
135
|
+
return commands
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
def mark_command_installed(
|
|
139
|
+
cmd_name,
|
|
140
|
+
plugin_name,
|
|
141
|
+
requires,
|
|
142
|
+
*,
|
|
143
|
+
state_file=None):
|
|
144
|
+
state = _load_state(state_file)
|
|
145
|
+
if "installed_commands" not in state:
|
|
146
|
+
state["installed_commands"] = {}
|
|
147
|
+
state["installed_commands"][cmd_name] = {
|
|
148
|
+
"plugin": plugin_name,
|
|
149
|
+
"requires": requires,
|
|
150
|
+
}
|
|
151
|
+
if "removed_commands" in state and cmd_name in state["removed_commands"]:
|
|
152
|
+
state["removed_commands"].remove(cmd_name)
|
|
153
|
+
_save_state(state, state_file)
|
|
154
|
+
|
|
155
|
+
|
|
156
|
+
def _still_needed(available, installed, removed_cmds):
|
|
157
|
+
needed = set(protected_packages())
|
|
158
|
+
for info in installed.values():
|
|
159
|
+
needed.update(requirement_name(req) for req in info["requires"])
|
|
160
|
+
for manifest in available.values():
|
|
161
|
+
is_core = manifest.get("core", False)
|
|
162
|
+
for cmd_name, cmd_info in manifest["commands"].items():
|
|
163
|
+
if is_command_active(cmd_name, cmd_info, is_core, removed_cmds):
|
|
164
|
+
needed.update(
|
|
165
|
+
requirement_name(req)
|
|
166
|
+
for req in cmd_info.get("requires", [])
|
|
167
|
+
)
|
|
168
|
+
return needed
|
|
169
|
+
|
|
170
|
+
|
|
171
|
+
def remove_commands(cmd_names, *, state_file=None, plugins_dir=None):
|
|
172
|
+
"""Mark commands as removed. Returns now-orphaned dep strings.
|
|
173
|
+
|
|
174
|
+
Only deps lash installed for the removed commands can be orphaned, and
|
|
175
|
+
never lash's own base deps (click, rich, ...). Orphans are computed after
|
|
176
|
+
the whole batch is removed, so deps shared inside the batch are freed too.
|
|
177
|
+
"""
|
|
178
|
+
state = _load_state(state_file)
|
|
179
|
+
installed = state.setdefault("installed_commands", {})
|
|
180
|
+
removed = state.setdefault("removed_commands", [])
|
|
181
|
+
available = get_available_plugins(plugins_dir=plugins_dir)
|
|
182
|
+
manifest_cmds = {
|
|
183
|
+
cmd for manifest in available.values() for cmd in manifest["commands"]
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
candidates = []
|
|
187
|
+
changed = False
|
|
188
|
+
for cmd_name in cmd_names:
|
|
189
|
+
if cmd_name not in installed and cmd_name not in manifest_cmds:
|
|
190
|
+
continue
|
|
191
|
+
changed = True
|
|
192
|
+
if cmd_name not in removed:
|
|
193
|
+
removed.append(cmd_name)
|
|
194
|
+
info = installed.pop(cmd_name, None)
|
|
195
|
+
if info:
|
|
196
|
+
candidates.extend(info["requires"])
|
|
197
|
+
if changed:
|
|
198
|
+
_save_state(state, state_file)
|
|
199
|
+
if not candidates:
|
|
200
|
+
return []
|
|
201
|
+
|
|
202
|
+
still_needed = _still_needed(available, installed, set(removed))
|
|
203
|
+
return sorted({
|
|
204
|
+
req for req in candidates
|
|
205
|
+
if requirement_name(req) not in still_needed
|
|
206
|
+
})
|
|
207
|
+
|
|
208
|
+
|
|
209
|
+
def remove_command(cmd_name, *, state_file=None, plugins_dir=None):
|
|
210
|
+
return remove_commands(
|
|
211
|
+
[cmd_name], state_file=state_file, plugins_dir=plugins_dir)
|