Fix crashes on using depends

This commit is contained in:
Dheepak Krishnamurthy 2021-02-13 16:32:47 -07:00
parent 38e4341815
commit da22c85282
3 changed files with 8 additions and 5 deletions

View file

@ -169,7 +169,7 @@ impl TTApp {
help_popup: Help::new(), help_popup: Help::new(),
contexts: vec![], contexts: vec![],
}; };
for c in app.config.default_filter.chars() { for c in app.config.filter.chars() {
app.filter.insert(c, 1); app.filter.insert(c, 1);
} }
app.get_context()?; app.get_context()?;

View file

@ -63,7 +63,7 @@ impl TaskWarriorBool for str {
pub struct Config { pub struct Config {
pub enabled: bool, pub enabled: bool,
pub color: HashMap<String, TColor>, pub color: HashMap<String, TColor>,
pub default_filter: String, pub filter: String,
pub obfuscate: bool, pub obfuscate: bool,
pub print_empty_columns: bool, pub print_empty_columns: bool,
pub rule_precedence_color: Vec<String>, pub rule_precedence_color: Vec<String>,
@ -87,7 +87,7 @@ impl Config {
obfuscate: bool_collection.get("obfuscate").cloned().unwrap_or(false), obfuscate: bool_collection.get("obfuscate").cloned().unwrap_or(false),
print_empty_columns: bool_collection.get("print_empty_columns").cloned().unwrap_or(false), print_empty_columns: bool_collection.get("print_empty_columns").cloned().unwrap_or(false),
color: Self::get_color_collection()?, color: Self::get_color_collection()?,
default_filter: Self::get_default_filter(), filter: Self::get_filter(),
rule_precedence_color: Self::get_rule_precedence_color(), rule_precedence_color: Self::get_rule_precedence_color(),
uda_task_report_show_info: Self::get_uda_task_report_show_info(), uda_task_report_show_info: Self::get_uda_task_report_show_info(),
uda_task_report_looping: Self::get_uda_task_report_looping(), uda_task_report_looping: Self::get_uda_task_report_looping(),
@ -312,7 +312,7 @@ impl Config {
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }
fn get_default_filter() -> String { fn get_filter() -> String {
Self::get_config("report.next.filter") Self::get_config("report.next.filter")
} }

View file

@ -218,7 +218,10 @@ impl TaskReportTable {
} else { } else {
let mut dt = vec![]; let mut dt = vec![];
for u in v { for u in v {
dt.push(tasks.iter().find(|t| t.uuid() == u).unwrap().id().unwrap()); match tasks.iter().find(|t| t.uuid() == u) {
Some(t) => dt.push(t.id().unwrap()),
None => (),
}
} }
join(dt.iter().map(|i| i.to_string()), " ") join(dt.iter().map(|i| i.to_string()), " ")
} }