fix: Correctly display internal compression plugins in status output
Co-authored-by: aider (openai/andrew/openrouter/sonoma-sky-alpha) <aider@aider.chat>
This commit is contained in:
@@ -71,32 +71,38 @@ pub fn generate_status_info(
|
|||||||
sorted_compression_types.sort_by_key(|ct| ct.to_string());
|
sorted_compression_types.sort_by_key(|ct| ct.to_string());
|
||||||
|
|
||||||
for compression_type in sorted_compression_types {
|
for compression_type in sorted_compression_types {
|
||||||
let compression_program: CompressionEngineProgram =
|
let (binary, compress, decompress, supported, is_internal) = {
|
||||||
match &COMPRESSION_PROGRAMS[compression_type.clone()] {
|
let is_internal = match compression_type {
|
||||||
Some(compression_program) => compression_program.clone(),
|
CompressionType::LZ4 if cfg!(feature = "lz4") => true,
|
||||||
None => CompressionEngineProgram {
|
CompressionType::GZip if cfg!(feature = "gzip") => true,
|
||||||
program: "".to_string(),
|
_ => false,
|
||||||
compress: Vec::new(),
|
|
||||||
decompress: Vec::new(),
|
|
||||||
supported: true,
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if is_internal {
|
||||||
|
("<INTERNAL>".to_string(), "".to_string(), "".to_string(), true)
|
||||||
|
} else {
|
||||||
|
match &COMPRESSION_PROGRAMS[compression_type.clone()] {
|
||||||
|
Some(program) => (
|
||||||
|
program.program.clone(),
|
||||||
|
program.compress.join(" "),
|
||||||
|
program.decompress.join(" "),
|
||||||
|
program.supported,
|
||||||
|
),
|
||||||
|
None => ("<UNSUPPORTED>".to_string(), "".to_string(), "".to_string(), false),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let _is_default = compression_type == default_type;
|
let _is_default = compression_type == default_type;
|
||||||
let is_enabled = enabled_compression_type.as_ref().map_or(false, |ct| *ct == compression_type);
|
let is_enabled = enabled_compression_type.as_ref().map_or(false, |ct| *ct == compression_type);
|
||||||
let binary = if compression_program.program.is_empty() {
|
|
||||||
"<INTERNAL>".to_string()
|
|
||||||
} else {
|
|
||||||
compression_program.program
|
|
||||||
};
|
|
||||||
|
|
||||||
compression_info.push(CompressionInfo {
|
compression_info.push(CompressionInfo {
|
||||||
compression_type: compression_type.to_string(),
|
compression_type: compression_type.to_string(),
|
||||||
found: compression_program.supported,
|
found: supported,
|
||||||
default: is_enabled, // Changed from is_default to is_enabled
|
default: is_enabled,
|
||||||
binary,
|
binary,
|
||||||
compress: compression_program.compress.join(" "),
|
compress,
|
||||||
decompress: compression_program.decompress.join(" "),
|
decompress,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user