Skip to content

fix(launch): allow 1x2 groups in perspecta URI parser #19

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
timcogan merged 1 commit into from
Feb 26, 2026
Merged

fix(launch): allow 1x2 groups in perspecta URI parser #19

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
44 changes: 40 additions & 4 deletions src/launch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ pub fn parse_perspecta_uri(uri: &str) -> Result<LaunchRequest, String> {
.collect::<Vec<_>>();

for (index, group) in groups.iter().enumerate() {
if group.len() != 1 && group.len() != 4 {
if !matches!(group.len(), 1 | 2 | 4) {
return Err(format!(
"Group {} has {} paths. Each group must contain exactly 1 or 4 DICOM paths.",
"Group {} has {} paths. Each group must contain exactly 1, 2, or 4 DICOM paths.",
index,
group.len()
));
Expand Down Expand Up @@ -264,9 +264,9 @@ pub fn parse_perspecta_uri(uri: &str) -> Result<LaunchRequest, String> {
};

for (index, group) in grouped_series_uids.iter().enumerate() {
if group.len() != 1 && group.len() != 4 {
if !matches!(group.len(), 1 | 2 | 4) {
return Err(format!(
"group_series group {} has {} series UIDs. Each group must contain exactly 1 or 4 series UIDs.",
"group_series group {} has {} series UIDs. Each group must contain exactly 1, 2, or 4 series UIDs.",
index,
group.len()
));
Expand Down Expand Up @@ -631,6 +631,25 @@ mod tests {
);
}

#[test]
fn parse_dicomweb_grouped_series_request_supports_two_up() {
let request = parse_perspecta_uri(
"perspecta://open?dicomweb=http%3A%2F%2Flocalhost%3A8042%2Fdicom-web&study=study_uid_alpha&group_series=series_a|series_b",
)
.expect("URI should parse");
assert_eq!(
request,
LaunchRequest::DicomWebGroups(DicomWebGroupedLaunchRequest {
base_url: "http://localhost:8042/dicom-web".to_string(),
study_uid: "study_uid_alpha".to_string(),
groups: vec![vec!["series_a".to_string(), "series_b".to_string()]],
open_group: 0,
username: None,
password: None,
})
);
}

#[test]
fn parse_dicomweb_grouped_series_requires_dicomweb_url() {
let error = parse_perspecta_uri(
Expand Down Expand Up @@ -681,6 +700,23 @@ mod tests {
);
}

#[test]
fn parse_grouped_local_request_supports_two_up() {
let request =
parse_perspecta_uri("perspecta://open?group=example-data%2Fa.dcm|example-data%2Fb.dcm")
.expect("URI should parse");
assert_eq!(
request,
LaunchRequest::LocalGroups {
groups: vec![vec![
PathBuf::from("example-data/a.dcm"),
PathBuf::from("example-data/b.dcm"),
]],
open_group: 0,
}
);
}

#[test]
fn parse_cli_falls_back_to_raw_paths() {
let args = vec![
Expand Down