Skip to content

Accept PC-assisted Hardware snapshots during robot discovery #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
temiroff merged 1 commit into from
Aug 11, 2026
Merged

Accept PC-assisted Hardware snapshots during robot discovery #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions editor-server/device_installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,8 +1887,11 @@ def adopt_legacy_hardware_services(
legacy_private="$legacy/.blacknode-hardware"
marker="__BLACKNODE_HARDWARE_ADOPTION__="

valid_target_checkout() {
[[ -d "$1/.git" && -f "$1/pyproject.toml" ]] \
valid_target_package() {
[[ -f "$1/pyproject.toml" \
&& -f "$1/blacknode_robot/__init__.py" \
&& -f "$1/configure.sh" \
&& -f "$1/install-service.sh" ]] \
&& grep -Eq '^[[:space:]]*name[[:space:]]*=[[:space:]]*["'"'"']blacknode-robot["'"'"'][[:space:]]*$' \
"$1/pyproject.toml"
}
Expand All @@ -1899,7 +1902,7 @@ def adopt_legacy_hardware_services(
"$1/pyproject.toml"
}

valid_target_checkout "$target" || {
valid_target_package "$target" || {
echo "The organized Hardware package is missing or invalid: $target" >&2
exit 4
}
Expand Down Expand Up @@ -2068,7 +2071,10 @@ def configure_hardware_services(
service_instance=""
legacy="$HOME/blacknode-hardware"
fi
[[ -d "$target/.git" && -f "$target/pyproject.toml" ]] \
[[ -f "$target/pyproject.toml" \
&& -f "$target/blacknode_robot/__init__.py" \
&& -f "$target/configure.sh" \
&& -f "$target/install-service.sh" ]] \
&& grep -Eq '^[[:space:]]*name[[:space:]]*=[[:space:]]*["'"'"']blacknode-(robot|hardware)["'"'"'][[:space:]]*$' \
"$target/pyproject.toml" || {
echo "The organized Hardware package is missing or invalid: $target" >&2
Expand Down
7 changes: 6 additions & 1 deletion tests/test_editor_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,8 +1411,11 @@ def fake_run(_connection, command, **kwargs):
self.assertNotIn("ssh-password", uploaded[0])
self.assertIn('target="$HOME/Blacknode/devices/default/hardware"', uploaded[0])
self.assertIn('legacy="$HOME/blacknode-hardware"', uploaded[0])
self.assertIn("valid_target_checkout", uploaded[0])
self.assertIn("valid_target_package", uploaded[0])
self.assertIn("valid_legacy_checkout", uploaded[0])
self.assertIn('"$1/blacknode_robot/__init__.py"', uploaded[0])
target_validation = uploaded[0].split("valid_legacy_checkout()", 1)[0]
self.assertNotIn('"$1/.git"', target_validation)
self.assertIn("blacknode-robot", uploaded[0])
self.assertIn("blacknode-hardware", uploaded[0])
self.assertIn('cp -a -- "$legacy_private" "$temporary_private"', uploaded[0])
Expand Down Expand Up @@ -1489,6 +1492,8 @@ def fake_run(_connection, command, **kwargs):
'target="$HOME/Blacknode/devices/$instance/hardware"',
uploaded[0],
)
self.assertIn('"$target/blacknode_robot/__init__.py"', uploaded[0])
self.assertNotIn('[[ -d "$target/.git"', uploaded[0])
self.assertIn(
'[[ "$directory" == "$legacy" ]] || continue',
uploaded[0],
Expand Down