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

refactor: standardize meta plugin structure with base field

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-26 17:40:43 -03:00
parent 3fefb1c213
commit bedf000632
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/meta_plugin/system.rs
View File

@@ -291,8 +291,7 @@ impl MetaPlugin for UserMetaPlugin {
pub struct GidMetaPlugin { pub struct GidMetaPlugin {
meta_name: String, meta_name: String,
is_saved: bool, is_saved: bool,
outputs: std::collections::HashMap<String, serde_yaml::Value>, base: crate::meta_plugin::BaseMetaPlugin,
options: std::collections::HashMap<String, serde_yaml::Value>,
} }
impl GidMetaPlugin { impl GidMetaPlugin {
@@ -310,7 +309,7 @@ impl GidMetaPlugin {
// Start with default outputs // Start with default outputs
let mut final_outputs = std::collections::HashMap::new(); let mut final_outputs = std::collections::HashMap::new();
let default_outputs = Self::default().default_outputs(); let default_outputs = vec!["gid".to_string()];
for output_name in default_outputs { for output_name in default_outputs {
final_outputs.insert(output_name.clone(), serde_yaml::Value::String(output_name)); final_outputs.insert(output_name.clone(), serde_yaml::Value::String(output_name));
} }
@@ -320,11 +319,14 @@ impl GidMetaPlugin {
} }
} }
let mut base = crate::meta_plugin::BaseMetaPlugin::new();
base.outputs = final_outputs;
base.options = final_options;
GidMetaPlugin { GidMetaPlugin {
meta_name: "gid".to_string(), meta_name: "gid".to_string(),
is_saved: false, is_saved: false,
outputs: final_outputs, base,
options: final_options,
} }
} }
@@ -356,11 +358,11 @@ impl MetaPlugin for GidMetaPlugin {
} }
fn outputs(&self) -> &std::collections::HashMap<String, serde_yaml::Value> { fn outputs(&self) -> &std::collections::HashMap<String, serde_yaml::Value> {
&self.outputs self.base.outputs()
} }
fn outputs_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> { fn outputs_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> {
&mut self.outputs self.base.outputs_mut()
} }
fn default_outputs(&self) -> Vec<String> { fn default_outputs(&self) -> Vec<String> {
@@ -372,15 +374,11 @@ impl MetaPlugin for GidMetaPlugin {
} }
fn options(&self) -> &std::collections::HashMap<String, serde_yaml::Value> { fn options(&self) -> &std::collections::HashMap<String, serde_yaml::Value> {
&self.options self.base.options()
} }
fn options_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> { fn options_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> {
&mut self.options self.base.options_mut()
}
fn options_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> {
&mut self.options
} }
} }
@@ -388,8 +386,7 @@ impl MetaPlugin for GidMetaPlugin {
pub struct GroupMetaPlugin { pub struct GroupMetaPlugin {
meta_name: String, meta_name: String,
is_saved: bool, is_saved: bool,
outputs: std::collections::HashMap<String, serde_yaml::Value>, base: crate::meta_plugin::BaseMetaPlugin,
options: std::collections::HashMap<String, serde_yaml::Value>,
} }
impl GroupMetaPlugin { impl GroupMetaPlugin {
@@ -407,7 +404,7 @@ impl GroupMetaPlugin {
// Start with default outputs // Start with default outputs
let mut final_outputs = std::collections::HashMap::new(); let mut final_outputs = std::collections::HashMap::new();
let default_outputs = Self::default().default_outputs(); let default_outputs = vec!["group".to_string()];
for output_name in default_outputs { for output_name in default_outputs {
final_outputs.insert(output_name.clone(), serde_yaml::Value::String(output_name)); final_outputs.insert(output_name.clone(), serde_yaml::Value::String(output_name));
} }
@@ -417,11 +414,14 @@ impl GroupMetaPlugin {
} }
} }
let mut base = crate::meta_plugin::BaseMetaPlugin::new();
base.outputs = final_outputs;
base.options = final_options;
GroupMetaPlugin { GroupMetaPlugin {
meta_name: "group".to_string(), meta_name: "group".to_string(),
is_saved: false, is_saved: false,
outputs: final_outputs, base,
options: final_options,
} }
} }
@@ -456,11 +456,11 @@ impl MetaPlugin for GroupMetaPlugin {
} }
fn outputs(&self) -> &std::collections::HashMap<String, serde_yaml::Value> { fn outputs(&self) -> &std::collections::HashMap<String, serde_yaml::Value> {
&self.outputs self.base.outputs()
} }
fn outputs_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> { fn outputs_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> {
&mut self.outputs self.base.outputs_mut()
} }
fn default_outputs(&self) -> Vec<String> { fn default_outputs(&self) -> Vec<String> {
@@ -472,11 +472,11 @@ impl MetaPlugin for GroupMetaPlugin {
} }
fn options(&self) -> &std::collections::HashMap<String, serde_yaml::Value> { fn options(&self) -> &std::collections::HashMap<String, serde_yaml::Value> {
&self.options self.base.options()
} }
fn options_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> { fn options_mut(&mut self) -> &mut std::collections::HashMap<String, serde_yaml::Value> {
&mut self.options self.base.options_mut()
} }
} }