open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(migrate): add warning if a nested parent directive is detected

Browse Source
This commit is contained in:
Federico Terzi 2021-05-29 18:40:30 +02:00
parent 7d115d588b
commit d724c5468a
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
espanso-migrate/src/convert.rs
View File

@ -30,8 +30,6 @@ pub fn convert(input_files: HashMap<String, Hash>) -> HashMap<String, ConvertedF
let sorted_input_files = sort_input_files(&input_files); let sorted_input_files = sort_input_files(&input_files);
let mut config_names_to_path = HashMap::new();
for input_path in sorted_input_files { for input_path in sorted_input_files {
let yaml = input_files let yaml = input_files
.get(&input_path) .get(&input_path)
@ -41,7 +39,12 @@ pub fn convert(input_files: HashMap<String, Hash>) -> HashMap<String, ConvertedF
let yaml_global_vars = yaml_get_vec(yaml, "global_vars"); let yaml_global_vars = yaml_get_vec(yaml, "global_vars");
let yaml_parent = yaml_get_string(yaml, "parent"); let yaml_parent = yaml_get_string(yaml, "parent");
let yaml_name = yaml_get_string(yaml, "name");
if let Some(parent) = yaml_parent {
if parent != "default" {
eprintln!("WARNING: nested 'parent' instructions are not currently supported by the migration tool");
}
}
let should_generate_match = yaml_matches.is_some() || yaml_global_vars.is_some(); let should_generate_match = yaml_matches.is_some() || yaml_global_vars.is_some();
let match_file_path_if_unlisted = if should_generate_match { let match_file_path_if_unlisted = if should_generate_match {
@ -56,10 +59,6 @@ pub fn convert(input_files: HashMap<String, Hash>) -> HashMap<String, ConvertedF
} }
let match_output_path = match_output_path.unwrap(); let match_output_path = match_output_path.unwrap();
if let Some(name) = yaml_name {
config_names_to_path.insert(name.to_string(), match_output_path.clone());
}
let output_yaml = output_files let output_yaml = output_files
.entry(match_output_path.clone()) .entry(match_output_path.clone())
.or_insert(ConvertedFile { .or_insert(ConvertedFile {
@ -152,8 +151,6 @@ pub fn convert(input_files: HashMap<String, Hash>) -> HashMap<String, ConvertedF
// TODO: warn if passive mode parameters are used // TODO: warn if passive mode parameters are used
// TODO: copy other config fields: https://github.com/federico-terzi/espanso/blob/master/src/config/mod.rs#L169
// Link any unlisted match file (the ones starting with the _ underscore, which are excluded by the // Link any unlisted match file (the ones starting with the _ underscore, which are excluded by the
// default.yml config) explicitly, if present. // default.yml config) explicitly, if present.
if let Some(match_file_path) = match_file_path_if_unlisted { if let Some(match_file_path) = match_file_path_if_unlisted {
@ -175,24 +172,8 @@ pub fn convert(input_files: HashMap<String, Hash>) -> HashMap<String, ConvertedF
content: output_yaml, content: output_yaml,
}); });
} }
// TODO: create config file
// TODO: execute the actual conversion
} }
// TODO: here resolve parent: name imports
// TODO: remove this prints
// for (file, content) in output_files {
// let mut out_str = String::new();
// {
// let mut emitter = YamlEmitter::new(&mut out_str);
// emitter.dump(&Yaml::Hash(content)).unwrap(); // dump the YAML object to a String
// }
// println!("\n------- {} ------------\n{}", file, out_str);
// }
output_files output_files
} }