kristoferssolo/traxor
1
0
Fork 0
mirror of https://github.com/kristoferssolo/traxor.git synced 2025-10-21 20:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(move): DRY

Browse Source
This commit is contained in:
Kristofers Solo 2025-07-09 19:15:46 +03:00
parent 805b65067b
commit eea85700e1
Signed by: kristoferssolo
GPG Key ID: 8687F2D3EEE6F0ED
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/app/mod.rs
View File

@ -169,18 +169,8 @@ impl<'a> App<'a> {
} }
pub fn prepare_move_action(&mut self) { pub fn prepare_move_action(&mut self) {
if let Selected::Current(current_id) = self.selected(true) { if let Some(download_dir) = self.get_current_downlaod_dir() {
if let Some(torrent) = self self.set_input_from_path(&download_dir);
.torrents
.torrents
.iter()
.find(|t| t.id == Some(current_id))
{
if let Some(download_dir) = &torrent.download_dir {
self.input = download_dir.clone();
self.cursor_position = self.input.len();
}
}
} }
self.input_mode = true; self.input_mode = true;
} }
@ -202,14 +192,14 @@ impl<'a> App<'a> {
let selected_id = self let selected_id = self
.state .state
.selected() .selected()
.and_then(|idx| torrents.get(idx).and_then(|torrent| torrent.id)); .and_then(|idx| torrents.get(idx).and_then(|t| t.id));
if let Some(id) = selected_id { if let Some(id) = selected_id {
return Selected::Current(id); return Selected::Current(id);
} }
} }
let selected_torrents = torrents let selected_torrents = torrents
.iter() .iter()
.filter_map(|torrent| torrent.id.filter(|id| self.torrents.selected.contains(id))) .filter_map(|t| t.id.filter(|id| self.torrents.selected.contains(id)))
.collect(); .collect();
Selected::List(selected_torrents) Selected::List(selected_torrents)
} }
@ -236,6 +226,32 @@ impl<'a> App<'a> {
self.cursor_position = self.input.len(); self.cursor_position = self.input.len();
} }
} }
fn get_current_downlaod_dir(&self) -> Option<String> {
match self.selected(true) {
Selected::Current(current_id) => self
.torrents
.torrents
.iter()
.find(|&t| t.id == Some(current_id))
.and_then(|t| t.download_dir.clone()),
_ => None,
}
}
fn set_input_from_path(&mut self, download_dir: &str) {
let mut path_buf = PathBuf::from(download_dir);
if path_buf.is_dir() && !download_dir.ends_with('/') {
path_buf.push("/");
}
self.update_cursor(path_buf);
}
fn update_cursor(&mut self, path: PathBuf) {
self.input = path.to_string_lossy().to_string();
self.cursor_position = self.input.len();
}
} }
fn split_path_components(path: PathBuf) -> (PathBuf, String) { fn split_path_components(path: PathBuf) -> (PathBuf, String) {