fix: correct file_mime and file_encoding meta plugin flags for compatibility

Co-authored-by: aider (openai/andrew.openrouter.qwen.qwen3-coder) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-07-29 12:52:36 -03:00
parent 6bcabf4fb8
commit 8c820965e8

View File

@@ -61,11 +61,11 @@ lazy_static! {
if program.supported { Some(program) } else { None } if program.supported { Some(program) } else { None }
} }
MetaPluginType::FileMime => { MetaPluginType::FileMime => {
let program = MetaPluginProgram::new("file", vec!["--mime", "-"], "file_mime".to_string(), true); let program = MetaPluginProgram::new("file", vec!["--mime-type", "-"], "file_mime".to_string(), true);
if program.supported { Some(program) } else { None } if program.supported { Some(program) } else { None }
} }
MetaPluginType::FileEncoding => { MetaPluginType::FileEncoding => {
let program = MetaPluginProgram::new("file", vec!["-bI", "-"], "file_encoding".to_string(), true); let program = MetaPluginProgram::new("file", vec!["-b", "--mime-encoding", "-"], "file_encoding".to_string(), true);
if program.supported { Some(program) } else { None } if program.supported { Some(program) } else { None }
} }
MetaPluginType::LineCount => { MetaPluginType::LineCount => {
@@ -102,8 +102,8 @@ lazy_static! {
pub fn get_meta_plugin(meta_plugin_type: MetaPluginType) -> Box<dyn MetaPlugin> { pub fn get_meta_plugin(meta_plugin_type: MetaPluginType) -> Box<dyn MetaPlugin> {
match meta_plugin_type { match meta_plugin_type {
MetaPluginType::FileMagic => Box::new(MetaPluginProgram::new("file", vec!["-bE", "-"], "file_magic".to_string(), true)), MetaPluginType::FileMagic => Box::new(MetaPluginProgram::new("file", vec!["-bE", "-"], "file_magic".to_string(), true)),
MetaPluginType::FileMime => Box::new(MetaPluginProgram::new("file", vec!["--mime", "-"], "file_mime".to_string(), true)), MetaPluginType::FileMime => Box::new(MetaPluginProgram::new("file", vec!["--mime-type", "-"], "file_mime".to_string(), true)),
MetaPluginType::FileEncoding => Box::new(MetaPluginProgram::new("file", vec!["-bI", "-"], "file_encoding".to_string(), true)), MetaPluginType::FileEncoding => Box::new(MetaPluginProgram::new("file", vec!["-b", "--mime-encoding", "-"], "file_encoding".to_string(), true)),
MetaPluginType::LineCount => Box::new(MetaPluginProgram::new("wc", vec!["-l"], "line_count".to_string(), true)), MetaPluginType::LineCount => Box::new(MetaPluginProgram::new("wc", vec!["-l"], "line_count".to_string(), true)),
MetaPluginType::WordCount => Box::new(MetaPluginProgram::new("wc", vec!["-w"], "word_count".to_string(), true)), MetaPluginType::WordCount => Box::new(MetaPluginProgram::new("wc", vec!["-w"], "word_count".to_string(), true)),
MetaPluginType::Cwd => Box::new(CwdMetaPlugin::new()), MetaPluginType::Cwd => Box::new(CwdMetaPlugin::new()),