janek/mostr
1
0
Fork 1
Code Issues Pull requests Releases Activity

refactor(tasks): rename current_pos to pos_at

Browse source
This commit is contained in:
xeruf 2025-01-15 22:09:16 +01:00
parent 984e4f129d
commit 50503f7f66
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tasks.rs
View file

@ -1181,29 +1181,29 @@ impl TasksRelay {
time = time + 1; time = time + 1;
} }
} }
let current_pos = self.get_position_at(time); let pos_at = self.get_position_at(time);
if (time < Timestamp::now() || target.is_none()) && current_pos.1 == target { if (time < Timestamp::now() || target.is_none()) && pos_at.1 == target {
warn!( warn!(
"Already {} from {}", "Already {} from {}",
target.map_or("stopped time-tracking".to_string(), |id| format!( target.map_or("stopped time-tracking".to_string(), |id| format!(
"tracking \"{}\"", "tracking \"{}\"",
self.get_task_title(&id) self.get_task_title(&id)
)), )),
format_timestamp_relative(&current_pos.0), format_timestamp_relative(&pos_at.0),
); );
return None; return None;
} }
info!("{}", match target { info!("{}", match target {
None => format!( None => format!(
"Stopping time-tracking of \"{}\" at {}", "Stopping time-tracking of \"{}\" at {}",
current_pos.1.map_or("???".to_string(), |id| self.get_task_title(&id)), pos_at.1.map_or("???".to_string(), |id| self.get_task_title(&id)),
format_timestamp_relative(&time) format_timestamp_relative(&time)
), ),
Some(new_id) => format!( Some(new_id) => format!(
"Tracking \"{}\" from {}{}", "Tracking \"{}\" from {}{}",
self.get_task_title(&new_id), self.get_task_title(&new_id),
format_timestamp_relative(&time), format_timestamp_relative(&time),
current_pos.1.filter(|id| id != &new_id).map(|id| pos_at.1.filter(|id| id != &new_id).map(|id|
format!(" replacing \"{}\"", self.get_task_title(&id))) format!(" replacing \"{}\"", self.get_task_title(&id)))
.unwrap_or_default() .unwrap_or_default()
) )