Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/commands/graph_operations/derive_chunks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub fn derive_chunks_operation(
}

let summary_str = format!(
" {}: {} new derived block group(s)",
" {}: {} new derived sequence graph(s)",
new_sample_name, chunk_range_length,
);

Expand Down
2 changes: 1 addition & 1 deletion src/commands/graph_operations/derive_subgraph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub fn derive_subgraph_operation(
return Err(err.into());
}

let summary_str = format!(" {}: new derived block group", new_sample_name,);
let summary_str = format!(" {}: new derived sequence graph", new_sample_name,);

let _op = end_operation(
db_context,
Expand Down
2 changes: 1 addition & 1 deletion src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ pub enum Commands {
#[arg(short, long)]
sample: Option<String>,
},
/// Search for an exact sequence across all block groups
/// Search for an exact sequence across all sequence graphs
///
/// Each match is reported with a blocks column formatted as [hash:start-end, ...],
/// where hash is a 12-character node hash prefix from the original node the block
Expand Down
6 changes: 4 additions & 2 deletions src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub enum SequenceUpdateError {
NodeError(#[from] NodeError),
#[error("Path creation error: {0}")]
PathError(#[from] PathError),
#[error("Block group creation error: {0}")]
#[error("Sequence graph creation error: {0}")]
BlockGroupError(#[from] BlockGroupError),
#[error("Sample creation error: {0}")]
SampleError(#[from] SampleError),
Expand All @@ -48,7 +48,9 @@ pub enum SequenceUpdateError {
MissingCoordinates(String),
#[error("Unsupported region type for sequence update: {0}")]
UnsupportedRegionType(String),
#[error("Resolved path '{path_name}' was not found in target block group '{block_group_name}'")]
#[error(
"Resolved path '{path_name}' was not found in target sequence graph '{block_group_name}'"
)]
MissingResolvedPath {
path_name: String,
block_group_name: String,
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ fn call_cli() -> Result<(), Box<dyn std::error::Error>> {
}
Err(_) => {
eprintln!(
"No block group found with name {:?} and sample {:?} in collection {}",
"No sequence graph found with name {:?} and sample {:?} in collection {}",
name, sample_name, collection_name
);
}
Expand Down
15 changes: 9 additions & 6 deletions src/views/block_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ pub fn view_block_group(
) -> Result<(), Box<dyn Error>> {
let progress_bar = get_handler();
let bar = progress_bar.add(get_time_elapsed_bar());
let _ = progress_bar.println("Loading block group");
let _ = progress_bar.println("Loading sequence graph");

// Get the node object corresponding to the position given by the user
let origin = if let Some(position_str) = position {
Expand Down Expand Up @@ -218,7 +218,7 @@ pub fn view_block_group(

if block_group.is_err() {
panic!(
"No block group found with name {:?} and sample {:?} in collection {} ",
"No sequence graph found with name {:?} and sample {:?} in collection {} ",
name,
sample_name.clone(),
collection_name
Expand Down Expand Up @@ -250,7 +250,7 @@ pub fn view_block_group(
Ok(bg) => bg,
Err(err) => {
// TODO: Handle these with messages instead of panic'ing
panic!("Failed to load block group {bg_id}: {err}");
panic!("Failed to load sequence graph {bg_id}: {err}");
}
});

Expand Down Expand Up @@ -404,7 +404,7 @@ pub fn view_block_group(
Ok(highlighting_enabled) => {
if highlighting_enabled {
info!(
"Path highlighting enabled for block group {}",
"Path highlighting enabled for sequence graph {}",
block_group_id
);
} else {
Expand All @@ -416,7 +416,7 @@ pub fn view_block_group(
}
}
} else {
warn!("No block group selected for path highlighting");
warn!("No sequence graph selected for path highlighting");
}
}
_ => {
Expand Down Expand Up @@ -1118,7 +1118,10 @@ pub fn view_block_group(
Ok(bg) => bg,
Err(err) => {
// TODO: Handle these with messages instead of panic'ing
panic!("Failed to load block group {}: {err}", new_block_group_id);
panic!(
"Failed to load sequence graph {}: {err}",
new_block_group_id
);
}
};

Expand Down
Loading