JosephFerano/kanban-tui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP Refactoring methods: Fix borrow checker issues

Browse Source
This commit is contained in:
Joseph Ferano 2023-06-15 12:06:50 +07:00
parent 940e07d72c
commit 02ad7c3da6
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app.rs
View File

@ -195,15 +195,13 @@ impl<'a> State<'a> {
/// We have conditions to ensure this doesn't panic but we still unwrap() /// We have conditions to ensure this doesn't panic but we still unwrap()
pub fn move_task_up(&mut self) -> bool { pub fn move_task_up(&mut self) -> bool {
let column = self.get_selected_column_mut(); let column = self.get_selected_column_mut();
if column.selected_task_idx > 0 { let task_idx = column.selected_task_idx;
column if task_idx > 0 {
.tasks column.tasks.swap(task_idx, task_idx - 1);
.swap(column.selected_task_idx, column.selected_task_idx - 1);
column.selected_task_idx -= 1; column.selected_task_idx -= 1;
let col_id = column.id;
let task1_id = self.get_selected_task().unwrap().id; let task1_id = self.get_selected_task().unwrap().id;
let task2_id = self.get_next_task().unwrap().id; let task2_id = self.get_next_task().unwrap().id;
let col_id = column.id;
let task_idx = column.selected_task_idx;
self.db_conn.swap_task_order(task1_id, task2_id); self.db_conn.swap_task_order(task1_id, task2_id);
self.db_conn.set_selected_task_for_column(task_idx, col_id); self.db_conn.set_selected_task_for_column(task_idx, col_id);
true true
@ -223,9 +221,9 @@ impl<'a> State<'a> {
let task_idx = column.selected_task_idx; let task_idx = column.selected_task_idx;
column.tasks.swap(task_idx, task_idx + 1); column.tasks.swap(task_idx, task_idx + 1);
column.selected_task_idx += 1; column.selected_task_idx += 1;
let col_id = column.id;
let task1_id = self.get_selected_task().unwrap().id; let task1_id = self.get_selected_task().unwrap().id;
let task2_id = self.get_previous_task().unwrap().id; let task2_id = self.get_previous_task().unwrap().id;
let col_id = column.id;
self.db_conn.swap_task_order(task1_id, task2_id); self.db_conn.swap_task_order(task1_id, task2_id);
self.db_conn.set_selected_task_for_column(task_idx, col_id); self.db_conn.set_selected_task_for_column(task_idx, col_id);
true true
@ -277,13 +275,12 @@ impl<'a> State<'a> {
} }
pub fn add_new_task(&mut self, title: String, description: String) { pub fn add_new_task(&mut self, title: String, description: String) {
let column = self.get_selected_column_mut(); let col_id = self.get_selected_column().id;
let selected_task_idx = column.selected_task_idx; let task = self.db_conn.insert_new_task(title, description, col_id);
let task = self.db_conn.insert_new_task(title, description, column.id);
column.tasks.push(task);
self.select_last_task(); self.select_last_task();
self.db_conn let selected_task_idx = self.get_selected_column().selected_task_idx;
.set_selected_task_for_column(selected_task_idx, column.id); self.db_conn.set_selected_task_for_column(selected_task_idx, col_id);
self.get_selected_column_mut().tasks.push(task);
} }
pub fn edit_task(&mut self, title: String, description: String) { pub fn edit_task(&mut self, title: String, description: String) {
@ -302,15 +299,16 @@ impl<'a> State<'a> {
/// ///
/// We have conditions to ensure this doesn't panic but we still unwrap() /// We have conditions to ensure this doesn't panic but we still unwrap()
pub fn delete_task(&mut self) { pub fn delete_task(&mut self) {
let column = self.get_selected_column_mut(); let column = self.get_selected_column();
if column.tasks.is_empty() { if column.tasks.is_empty() {
return return
} }
let task_id = self.get_selected_task().unwrap().id; let task_id = self.get_selected_task().unwrap().id;
let column = self.get_selected_column_mut();
let task_idx = column.selected_task_idx;
let col_id = column.id;
column.tasks.remove(column.selected_task_idx); column.tasks.remove(column.selected_task_idx);
self.select_next_task(); self.select_next_task();
let task_idx = column.selected_task_idx;
let col_id = self.get_selected_column().id;
self.db_conn.delete_task(task_id); self.db_conn.delete_task(task_id);
self.db_conn.set_selected_task_for_column(task_idx, col_id); self.db_conn.set_selected_task_for_column(task_idx, col_id);
} }