vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit da068a43c1fc4c349875d2cdab90a2c41af430c0
parent 9657463717048519dd3683d2f2add52fa2c91205
Author: BlackDex <black.dex@gmail.com>
Date:   Sun, 27 Jan 2019 16:03:18 +0100

Moved function call to get_icon_url to prevent error bubbeling

Diffstat:
Msrc/api/icons.rs | 12++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/icons.rs b/src/api/icons.rs @@ -55,10 +55,8 @@ fn get_icon(domain: &str) -> Vec<u8> { return icon; } - let url = get_icon_url(&domain).unwrap(); - // Get the icon, or fallback in case of error - match download_icon(&url) { + match download_icon(&domain) { Ok(icon) => { save_icon(&path, &icon); icon @@ -284,9 +282,11 @@ fn fix_href(href: &str, url: &str) -> String { } } -fn download_icon(url: &str) -> Result<Vec<u8>, Error> { - info!("Downloading icon for {}...", url); - let mut res = reqwest::get(url)?; +fn download_icon(domain: &str) -> Result<Vec<u8>, Error> { + let url = get_icon_url(&domain).unwrap(); + + info!("Downloading icon for {} via {}...",domain, url); + let mut res = reqwest::get(&url)?; res = res.error_for_status()?;