asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: enforce numeric IDs for --info command

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-29 12:42:38 -03:00
parent 66f9b71258
commit 219c368c05
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/modes/info.rs
View File

@@ -20,41 +20,15 @@ pub fn mode_info(
cmd: &mut Command,
settings: &config::Settings,
ids: &mut Vec<i64>,
tags: &mut Vec<String>,
_tags: &mut Vec<String>,
conn: &mut rusqlite::Connection,
data_path: PathBuf,
) -> Result<()> {
// Check if any tags can be parsed as numbers and treat them as IDs for --info
let mut numeric_tags = Vec::new();
let mut non_numeric_tags = Vec::new();
for tag in tags.iter() {
if let Ok(num) = tag.parse::<i64>() {
numeric_tags.push(num);
} else {
non_numeric_tags.push(tag.clone());
}
}
// If we have numeric tags and no IDs, use them as IDs
if ids.is_empty() && !numeric_tags.is_empty() {
// For --info, we can only handle one ID
if numeric_tags.len() > 1 {
cmd.error(ErrorKind::InvalidValue, "More than one ID given, you must supply exactly one ID or atleast one tag when using --info").exit();
}
// Move the numeric tag to ids
ids.push(numeric_tags[0]);
// Clear the tags since we're now using an ID
tags.clear();
} else {
// Use the original logic
*tags = non_numeric_tags;
}
if !ids.is_empty() && !tags.is_empty() {
cmd.error(ErrorKind::InvalidValue, "Both ID and tags given, you must supply exactly one ID or atleast one tag when using --info").exit();
// For --info, we only use IDs, tags should be empty
if ids.is_empty() {
cmd.error(ErrorKind::InvalidValue, "No ID provided for --info").exit();
} else if ids.len() > 1 {
cmd.error(ErrorKind::InvalidValue, "More than one ID given, you must supply exactly one ID or atleast one tag when using --info").exit();
cmd.error(ErrorKind::InvalidValue, "More than one ID given, you must supply exactly one ID when using --info").exit();
}
let mut meta: std::collections::HashMap<String, String> = std::collections::HashMap::new();
@@ -67,8 +41,9 @@ pub fn mode_info(
}
let item_service = ItemService::new(data_path.clone());
// Use empty tags vector since --info only works with IDs
let item_with_meta = item_service
.find_item(conn, ids, tags, &meta)
.find_item(conn, ids, &Vec::new(), &meta)
.map_err(|e| anyhow!("Unable to find matching item in database: {}", e))?;
show_item(item_with_meta, settings, data_path)