feat: select devices to target with --device-type and --device-path arguments
#142
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timrogers
requested changes
May 9, 2025
Owner
timrogers
left a comment
timrogers
left a comment
There was a problem hiding this comment.
Loving the direction on this so far! I have a few suggestions.
Contributor
Author
|
Thanks for the review! 😄
If these changes look good, I'll fix timrogers/litra-autotoggle#48 and convert it back to a PR once it's updated accordingly. CLI Testing Output |
Contributor
Author
|
Hey @timrogers, just a friendly bump here :) |
Owner
|
Thanks for the reminder on this! I've been very busy recently but should get to it in the next couple of days. |
timrogers
changed the title
--all-devices and --device-type cli flags--device-type and --device-path arguments
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for --all-devices and --device-type CLI flags to allow targeting multiple devices or specific device types, expanding the functionality beyond single device targeting by serial number.
Key changes:
- Added device filtering by type (
LitraGlow,LitraBeam,LitraBeamLX) and device path - Modified all command handlers to support targeting multiple devices when no specific filter is provided
- Enhanced MCP server integration with new device targeting options
Reviewed Changes
Copilot reviewed 5 out of 7 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| src/main.rs | Core CLI implementation with new device filtering logic and multi-device command handling |
| src/lib.rs | Added DeviceType parsing, device path methods, and enhanced serial number handling |
| src/mcp.rs | Updated MCP server tools to support new device targeting parameters |
| Cargo.toml | Added schemars dependency for MCP schema generation |
| README.md | Updated documentation to reflect new device targeting options |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Comment on lines
+437
to
+462
| if use_all { | ||
| // Get all devices | ||
| let devices = get_all_supported_devices(&context, None, None, None)?; | ||
| if devices.is_empty() { | ||
| return Err(CliError::DeviceNotFound); | ||
| } | ||
|
|
||
| for device_handle in devices { | ||
| // Ignore errors for individual devices when targeting all | ||
| let _ = callback(&device_handle); | ||
| } | ||
| Ok(()) | ||
| } else { | ||
| // Filtering by one of the options | ||
| let devices = get_all_supported_devices(&context, serial_number, device_path, device_type)?; | ||
| if devices.is_empty() { | ||
| return Err(CliError::DeviceNotFound); | ||
| } | ||
|
|
||
| // Apply to all matched devices | ||
| for device_handle in devices { | ||
| // Ignore errors for individual devices | ||
| let _ = callback(&device_handle); | ||
| } | ||
| Ok(()) | ||
| } |
There was a problem hiding this comment.
The logic in both branches of the if-else statement is nearly identical (lines 439-448 and 451-461). This duplicated code should be extracted into a helper function or refactored to eliminate the repetition.
Suggested change
| if use_all { | |
| // Get all devices | |
| let devices = get_all_supported_devices(&context, None, None, None)?; | |
| if devices.is_empty() { | |
| return Err(CliError::DeviceNotFound); | |
| } | |
| for device_handle in devices { | |
| // Ignore errors for individual devices when targeting all | |
| let _ = callback(&device_handle); | |
| } | |
| Ok(()) | |
| } else { | |
| // Filtering by one of the options | |
| let devices = get_all_supported_devices(&context, serial_number, device_path, device_type)?; | |
| if devices.is_empty() { | |
| return Err(CliError::DeviceNotFound); | |
| } | |
| // Apply to all matched devices | |
| for device_handle in devices { | |
| // Ignore errors for individual devices | |
| let _ = callback(&device_handle); | |
| } | |
| Ok(()) | |
| } | |
| let (sn, dp, dt) = if use_all { | |
| (None, None, None) | |
| } else { | |
| (serial_number, device_path, device_type) | |
| }; | |
| let devices = get_all_supported_devices(&context, sn, dp, dt)?; | |
| if devices.is_empty() { | |
| return Err(CliError::DeviceNotFound); | |
| } | |
| for device_handle in devices { | |
| // Ignore errors for individual devices | |
| let _ = callback(&device_handle); | |
| } | |
| Ok(()) |
src/lib.rs
Outdated
Comment on lines
110
to
114
| let s_lower = s.to_lowercase().replace(" ", ""); | ||
| match s_lower.as_str() { | ||
| "litra_glow" | "glow" => Ok(DeviceType::LitraGlow), | ||
| "litra_beam" | "beam" => Ok(DeviceType::LitraBeam), | ||
| "litra_beam_lx" | "beam_lx" => Ok(DeviceType::LitraBeamLX), |
There was a problem hiding this comment.
The string matching patterns use underscores (e.g., 'litra_beam_lx') but the help text and documentation mention 'LitraBeamLX' without underscores. Consider supporting both formats or clarifying the expected input format in documentation.
Suggested change
| let s_lower = s.to_lowercase().replace(" ", ""); | |
| match s_lower.as_str() { | |
| "litra_glow" | "glow" => Ok(DeviceType::LitraGlow), | |
| "litra_beam" | "beam" => Ok(DeviceType::LitraBeam), | |
| "litra_beam_lx" | "beam_lx" => Ok(DeviceType::LitraBeamLX), | |
| // Normalize: lowercase, remove spaces and underscores | |
| let s_norm = s.to_lowercase().replace([' ', '_'], ""); | |
| match s_norm.as_str() { | |
| "litraglow" | "glow" => Ok(DeviceType::LitraGlow), | |
| "litrabeam" | "beam" => Ok(DeviceType::LitraBeam), | |
| "litrabeamlx" | "beamlx" => Ok(DeviceType::LitraBeamLX), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Compiled on linux (via WSL) and Windows and tested on Windows with a Litra Beam LX and a Litra Glow. All commands worked as expected.
Fixes #133
CLI Testing Output