pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(layouts): do not override explicitly set layout if it exists (#1830)

Browse source
This commit is contained in:
Aram Drevekenin 2022-10-20 18:09:23 +02:00 • committed by GitHub
parent 27c875b568
commit ebc4222d6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
zellij-client/src/old_config_converter/convert_old_yaml_files.rs
View file

@ -270,9 +270,20 @@ fn convert_yaml(
let mut new_config_file = yaml_config_file.clone(); let mut new_config_file = yaml_config_file.clone();
new_config_file.set_extension("kdl"); new_config_file.set_extension("kdl");
let yaml_config_file_exists = yaml_config_file.exists(); let yaml_config_file_exists = yaml_config_file.exists();
let layout_was_explicitly_set = layout_files_to_convert let explicitly_set_layout_file = layout_files_to_convert
.iter() .iter()
.find(|(_l, was_explicitly_set)| *was_explicitly_set) .find(|(_l, was_explicitly_set)| *was_explicitly_set);
let layout_was_explicitly_set = explicitly_set_layout_file.is_some();
let explicitly_set_layout_files_kdl_equivalent_exists = explicitly_set_layout_file
.map(|(layout_file, _)| {
let mut layout_file = layout_file.clone();
layout_file.set_extension("kdl");
if layout_file.exists() {
Some(true)
} else {
None
}
})
.is_some(); .is_some();
let new_config_file_exists = new_config_file.exists(); let new_config_file_exists = new_config_file.exists();
let no_need_to_convert_config = let no_need_to_convert_config =
@ -307,6 +318,17 @@ fn convert_yaml(
new_config_file.as_path().as_os_str().to_string_lossy().to_string() new_config_file.as_path().as_os_str().to_string_lossy().to_string()
) )
); );
} else if layout_was_explicitly_set && explicitly_set_layout_files_kdl_equivalent_exists {
let explicitly_set_layout_file = explicitly_set_layout_file.unwrap().0.clone();
let mut explicitly_set_layout_file_kdl_equivalent = explicitly_set_layout_file.clone();
explicitly_set_layout_file_kdl_equivalent.set_extension("kdl");
return Err(
format!(
"Specified old YAML format layout (--layout {}) but a new KDL file exists in that location. To fix, point to it the new file instead: zellij --layout {}",
explicitly_set_layout_file.display(),
explicitly_set_layout_file_kdl_equivalent.display()
)
);
} }
if !layout_files_to_convert.is_empty() { if !layout_files_to_convert.is_empty() {
print_conversion_layouts_message(layout_files_to_convert.clone()); print_conversion_layouts_message(layout_files_to_convert.clone());