Skip to content

Fix for not following enough redirect links (#62) #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dougli1sqrd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for not following enough redirect links (#62) #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/downloads.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
3 changes: 2 additions & 1 deletion src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,8 @@ impl<T: Clone + Menuable> LockVec<T> {
/// *not* the sense of the word here.
pub fn filter_map<B, F>(&self, mut f: F) -> Vec<B>
where F: FnMut(&T) -> Option<B> {
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")))
Expand Down
9 changes: 6 additions & 3 deletions src/ui/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ impl<T: Clone + Menuable> Menu<T> {
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);
Expand Down Expand Up @@ -284,7 +285,8 @@ impl Menu<Podcast> {
/// currently selected podcast.
pub fn get_episodes(&self) -> LockVec<Episode> {
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.");
Expand Down Expand Up @@ -353,7 +355,8 @@ impl Menu<NewEpisode> {
fn change_item_selections(&mut self, indexes: Vec<usize>, selection: Option<bool>) -> 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) {
Expand Down