refactor: remove KEEP_META_* environment variable parsing
Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
@@ -23,17 +23,8 @@ pub fn mode_get(
|
|||||||
cmd.error(clap::error::ErrorKind::InvalidValue, "More than one ID given, you must supply exactly one ID or at least one tag when using --get").exit();
|
cmd.error(clap::error::ErrorKind::InvalidValue, "More than one ID given, you must supply exactly one ID or at least one tag when using --get").exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut meta: std::collections::HashMap<String, String> = std::collections::HashMap::new();
|
|
||||||
// Collect metadata from environment variables
|
|
||||||
for (key, value) in std::env::vars() {
|
|
||||||
if key.starts_with("KEEP_META_") && key != "KEEP_META_PLUGINS" {
|
|
||||||
let meta_name = key.strip_prefix("KEEP_META_").unwrap();
|
|
||||||
meta.insert(meta_name.to_string(), value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let item_service = ItemService::new(data_path.clone());
|
let item_service = ItemService::new(data_path.clone());
|
||||||
let item_with_meta = item_service.find_item(conn, ids, tags, &meta)
|
let item_with_meta = item_service.find_item(conn, ids, tags, &std::collections::HashMap::new())
|
||||||
.map_err(|e| anyhow!("Unable to find matching item in database: {}", e))?;
|
.map_err(|e| anyhow!("Unable to find matching item in database: {}", e))?;
|
||||||
|
|
||||||
let item_id = item_with_meta.item.id.unwrap();
|
let item_id = item_with_meta.item.id.unwrap();
|
||||||
|
|||||||
@@ -31,19 +31,10 @@ pub fn mode_info(
|
|||||||
cmd.error(ErrorKind::InvalidValue, "More than one ID given, you must supply exactly one ID 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();
|
|
||||||
// Collect metadata from environment variables
|
|
||||||
for (key, value) in std::env::vars() {
|
|
||||||
if key.starts_with("KEEP_META_") && key != "KEEP_META_PLUGINS" {
|
|
||||||
let meta_name = key.strip_prefix("KEEP_META_").unwrap();
|
|
||||||
meta.insert(meta_name.to_string(), value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let item_service = ItemService::new(data_path.clone());
|
let item_service = ItemService::new(data_path.clone());
|
||||||
// Use empty tags vector since --info only works with IDs
|
// Use empty tags vector since --info only works with IDs
|
||||||
let item_with_meta = item_service
|
let item_with_meta = item_service
|
||||||
.find_item(conn, ids, &Vec::new(), &meta)
|
.find_item(conn, ids, &Vec::new(), &std::collections::HashMap::new())
|
||||||
.map_err(|e| anyhow!("Unable to find matching item in database: {}", e))?;
|
.map_err(|e| anyhow!("Unable to find matching item in database: {}", e))?;
|
||||||
|
|
||||||
show_item(item_with_meta, settings, data_path)
|
show_item(item_with_meta, settings, data_path)
|
||||||
|
|||||||
@@ -44,17 +44,8 @@ pub fn mode_list(
|
|||||||
.exit();
|
.exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut meta: std::collections::HashMap<String, String> = std::collections::HashMap::new();
|
|
||||||
// Collect metadata from environment variables
|
|
||||||
for (key, value) in std::env::vars() {
|
|
||||||
if key.starts_with("KEEP_META_") && key != "KEEP_META_PLUGINS" {
|
|
||||||
let meta_name = key.strip_prefix("KEEP_META_").unwrap();
|
|
||||||
meta.insert(meta_name.to_string(), value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let item_service = ItemService::new(data_path.clone());
|
let item_service = ItemService::new(data_path.clone());
|
||||||
let items_with_meta = item_service.list_items(conn, tags, &meta)?;
|
let items_with_meta = item_service.list_items(conn, tags, &std::collections::HashMap::new())?;
|
||||||
|
|
||||||
let output_format = crate::modes::common::settings_output_format(settings);
|
let output_format = crate::modes::common::settings_output_format(settings);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user