dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-06-08 09:55:00 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

optimize code

Browse Source
This commit is contained in:
Shocker 2026-04-07 19:19:48 +03:00
parent 0d685026eb
commit 757b6fcacf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/icons.rs
View File

@ -534,9 +534,8 @@ async fn download_icon(domain: &str) -> Result<(Bytes, Option<&str>), Error> {
use data_url::DataUrl; use data_url::DataUrl;
for (i, icon) in icon_result.iconlist.iter().take(5).enumerate() { let mut icons = icon_result.iconlist.iter().take(5).peekable();
let is_last = i == icon_result.iconlist.iter().take(5).count() - 1; while let Some(icon) = icons.next() {
if icon.href.starts_with("data:image") { if icon.href.starts_with("data:image") {
let Ok(datauri) = DataUrl::process(&icon.href) else { let Ok(datauri) = DataUrl::process(&icon.href) else {
continue; continue;
@ -568,7 +567,7 @@ async fn download_icon(domain: &str) -> Result<(Bytes, Option<&str>), Error> {
// Make sure all icons are checked before returning error // Make sure all icons are checked before returning error
let res = match get_page_with_referer(&icon.href, &icon_result.referer).await { let res = match get_page_with_referer(&icon.href, &icon_result.referer).await {
Ok(r) => r, Ok(r) => r,
Err(e) if is_last => return Err(e.into()), Err(e) if icons.peek().is_none() => return Err(e.into()),
Err(e) if CustomHttpClientError::downcast_ref(&e).is_some() => return Err(e.into()), // If blacklisted stop immediately instead of checking the rest of the icons. see explanation and actual handling inside get_icon() Err(e) if CustomHttpClientError::downcast_ref(&e).is_some() => return Err(e.into()), // If blacklisted stop immediately instead of checking the rest of the icons. see explanation and actual handling inside get_icon()
Err(e) => { Err(e) => {
warn!("Unable to download icon: {e:?}"); warn!("Unable to download icon: {e:?}");