diff --git a/src/downloads.rs b/src/downloads.rs index 7dc8c65..cbddb32 100644 --- a/src/downloads.rs +++ b/src/downloads.rs @@ -60,7 +60,9 @@ pub fn download_list( fn download_file(mut ep_data: EpData, dest: PathBuf, mut max_retries: usize) -> DownloadMsg { let agent_builder = ureq::builder() .timeout_connect(Duration::from_secs(10)) - .timeout_read(Duration::from_secs(120)); + .timeout_read(Duration::from_secs(120)) + .redirects(10); + #[cfg(feature = "native_tls")] let tls_connector = std::sync::Arc::new(native_tls::TlsConnector::new().unwrap()); #[cfg(feature = "native_tls")] diff --git a/src/types.rs b/src/types.rs index e382694..892dbda 100644 --- a/src/types.rs +++ b/src/types.rs @@ -416,7 +416,8 @@ impl LockVec { /// *not* the sense of the word here. pub fn filter_map(&self, mut f: F) -> Vec where F: FnMut(&T) -> Option { - let (map, order, _) = self.borrow(); + let (map, order, _unused) = self.borrow(); + drop(_unused); return order .iter() .filter_map(|id| f(map.get(id).expect("Index error in LockVec"))) diff --git a/src/ui/menu.rs b/src/ui/menu.rs index 59b5e0f..b2c1b8a 100644 --- a/src/ui/menu.rs +++ b/src/ui/menu.rs @@ -68,7 +68,8 @@ impl Menu { self.selected = self.start_row; } - let (map, _, order) = self.items.borrow(); + let (map, _unused, order) = self.items.borrow(); + drop(_unused); if !order.is_empty() { // update selected item if list has gotten shorter let current_selected = self.get_menu_idx(self.selected); @@ -284,7 +285,8 @@ impl Menu { /// currently selected podcast. pub fn get_episodes(&self) -> LockVec { let index = self.get_menu_idx(self.selected); - let (borrowed_map, _, borrowed_order) = self.items.borrow(); + let (borrowed_map, _unused, borrowed_order) = self.items.borrow(); + drop(_unused); let pod_id = borrowed_order .get(index) .expect("Could not retrieve podcast."); @@ -353,7 +355,8 @@ impl Menu { fn change_item_selections(&mut self, indexes: Vec, selection: Option) -> bool { let mut changed = false; { - let (mut borrowed_map, borrowed_order, _) = self.items.borrow(); + let (mut borrowed_map, borrowed_order, _unused) = self.items.borrow(); + drop(_unused); for idx in indexes { if let Some(ep_id) = borrowed_order.get(idx) { if let Entry::Occupied(mut ep) = borrowed_map.entry(*ep_id) {