Mirror/monolith
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #80 from Alch-Emi/lazyload

Browse source 
Add support for lazy loaded images
This commit is contained in:
Sunshine 2019-12-24 17:11:21 -05:00 committed by GitHub
commit 295931041c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/html.rs
View file

@ -2,7 +2,7 @@ use html5ever::interface::QualName;
use html5ever::parse_document; use html5ever::parse_document;
use html5ever::rcdom::{Handle, NodeData, RcDom}; use html5ever::rcdom::{Handle, NodeData, RcDom};
use html5ever::serialize::{serialize, SerializeOpts}; use html5ever::serialize::{serialize, SerializeOpts};
use html5ever::tendril::{format_tendril, TendrilSink}; use html5ever::tendril::{format_tendril, Tendril, TendrilSink};
use html5ever::tree_builder::{Attribute, TreeSink}; use html5ever::tree_builder::{Attribute, TreeSink};
use html5ever::{local_name, namespace_url, ns}; use html5ever::{local_name, namespace_url, ns};
use http::retrieve_asset; use http::retrieve_asset;
@ -168,34 +168,49 @@ pub fn walk_and_embed_assets(
} }
} }
"img" => { "img" => {
for attr in attrs_mut.iter_mut() { // Find source tags
if &attr.name.local == "src" { let mut found_src: Option<Attribute> = None;
let value = attr.value.to_string(); let mut found_datasrc: Option<Attribute> = None;
let mut i = 0;
// Ignore images with empty source while i < attrs_mut.len() {
if value == str!() { let name = attrs_mut[i].name.local.as_ref();
continue; if name.eq_ignore_ascii_case("src") {
found_src = Some(attrs_mut.remove(i));
} else if name.eq_ignore_ascii_case("data-src") {
found_datasrc = Some(attrs_mut.remove(i));
} else {
i += 1;
}
} }
// If images are disabled, clear both sources
if opt_no_images { if opt_no_images {
attr.value.clear(); attrs_mut.push(Attribute {
attr.value.push_slice(TRANSPARENT_PIXEL); name: QualName::new(None, ns!(), local_name!("src")),
} else { value: Tendril::from_slice(TRANSPARENT_PIXEL),
let src_full_url: String = });
resolve_url(&url, &value).unwrap_or(str!()); } else if let Some((dataurl, _)) = (&found_datasrc)
let (img_dataurl, _) = retrieve_asset( .into_iter()
.chain(&found_src) // Give dataurl priority
.map(|attr| &attr.value)
.filter(|src| !src.is_empty()) // Ignore empty srcs
.next()
.and_then(|src| resolve_url(&url, src).ok()) // Make absolute
.and_then(|abs_src| // Download and convert to dataurl
retrieve_asset(
cache, cache,
client, client,
&src_full_url, &abs_src,
true, true,
"", "",
opt_silent, opt_silent,
) ).ok())
.unwrap_or((str!(), str!())); {
attr.value.clear(); // Add the new dataurl src attribute
attr.value.push_slice(img_dataurl.as_str()); attrs_mut.push(Attribute {
} name: QualName::new(None, ns!(), local_name!("src")),
} value: Tendril::from_slice(dataurl.as_ref()),
});
} }
} }
"source" => { "source" => {