OpenSource/vaultwarden
OpenSource/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-04 22:14:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #382 from BlackDex/iter-iconlist

Browse source 
Loop through the iconlist until an icon is found
This commit is contained in:
Daniel García 2019-02-04 18:54:15 +01:00 committed by GitHub
commit 06522c9ac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/api/icons.rs
View file

@ -137,19 +137,19 @@ struct IconList {
href: String, href: String,
} }
/// Returns a Result with a String which holds the preferend favicon location. /// Returns a Result/Tuple which holds a Vector IconList and a string which holds the cookies from the last response.
/// There will always be a result with a string which will contain https://example.com/favicon.ico /// There will always be a result with a string which will contain https://example.com/favicon.ico and an empty string for the cookies.
/// This does not mean that that location does exists, but it is the default location. /// This does not mean that that location does exists, but it is the default location browser use.
/// ///
/// # Argument /// # Argument
/// * `domain` - A string which holds the domain with extension. /// * `domain` - A string which holds the domain with extension.
/// ///
/// # Example /// # Example
/// ``` /// ```
/// favicon_location1 = get_icon_url("github.com"); /// let (mut iconlist, cookie_str) = get_icon_url("github.com")?;
/// favicon_location2 = get_icon_url("gitlab.com"); /// let (mut iconlist, cookie_str) = get_icon_url("gitlab.com")?;
/// ``` /// ```
fn get_icon_url(domain: &str) -> Result<(String, String), Error> { fn get_icon_url(domain: &str) -> Result<(Vec<IconList>, String), Error> {
// Default URL with secure and insecure schemes // Default URL with secure and insecure schemes
let ssldomain = format!("https://{}", domain); let ssldomain = format!("https://{}", domain);
let httpdomain = format!("http://{}", domain); let httpdomain = format!("http://{}", domain);
@ -200,7 +200,7 @@ fn get_icon_url(domain: &str) -> Result<(String, String), Error> {
iconlist.sort_by_key(|x| x.priority); iconlist.sort_by_key(|x| x.priority);
// There always is an icon in the list, so no need to check if it exists, and just return the first one // There always is an icon in the list, so no need to check if it exists, and just return the first one
Ok((iconlist.remove(0).href, cookie_str)) Ok((iconlist, cookie_str))
} }
fn get_page(url: &str) -> Result<Response, Error> { fn get_page(url: &str) -> Result<Response, Error> {
@ -265,7 +265,7 @@ fn get_icon_priority(href: &str, sizes: &str) -> u8 {
/// ///
/// # Arguments /// # Arguments
/// * `sizes` - The size of the icon if available as a <width>x<height> value like 32x32. /// * `sizes` - The size of the icon if available as a <width>x<height> value like 32x32.
/// ///
/// # Example /// # Example
/// ``` /// ```
/// let (width, height) = parse_sizes("64x64"); // (64, 64) /// let (width, height) = parse_sizes("64x64"); // (64, 64)
@ -292,13 +292,23 @@ fn parse_sizes(sizes: &str) -> (u16, u16) {
} }
fn download_icon(domain: &str) -> Result<Vec<u8>, Error> { fn download_icon(domain: &str) -> Result<Vec<u8>, Error> {
let (url, cookie_str) = get_icon_url(&domain)?; let (mut iconlist, cookie_str) = get_icon_url(&domain)?;
info!("Downloading icon for {} via {}...", domain, url);
let mut res = get_page_with_cookies(&url, &cookie_str)?;
let mut buffer = Vec::new(); let mut buffer = Vec::new();
res.copy_to(&mut buffer)?;
iconlist.truncate(5);
for icon in iconlist {
let url = icon.href;
info!("Downloading icon for {} via {}...", domain, url);
match get_page_with_cookies(&url, &cookie_str) {
Ok(mut res) => {
info!("Download finished for {}", url);
res.copy_to(&mut buffer)?;
break;
},
Err(_) => info!("Download failed for {}", url),
};
}
if buffer.is_empty() { if buffer.is_empty() {
err!("Empty response") err!("Empty response")