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

define link type of <link> element as enum and prefer match statement

Browse source 
since match statement checks exhaustiveness
This commit is contained in:
rhysd 2020-01-09 15:34:30 +09:00
parent 929512f4f5
commit 660511b8a0
1 changed files with 79 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
src/html.rs
View file

@ -82,8 +82,6 @@ pub fn walk_and_embed_assets(
match name.local.as_ref() { match name.local.as_ref() {
"link" => { "link" => {
let mut link_type: &str = "";
// Remove integrity attributes // Remove integrity attributes
let mut i = 0; let mut i = 0;
while i < attrs_mut.len() { while i < attrs_mut.len() {
@ -95,88 +93,102 @@ pub fn walk_and_embed_assets(
} }
} }
enum LinkType {
Icon,
Stylesheet,
Preload,
DnsPrefetch,
Unknown,
}
let mut link_type = LinkType::Unknown;
for attr in attrs_mut.iter_mut() { for attr in attrs_mut.iter_mut() {
if &attr.name.local == "rel" { if &attr.name.local == "rel" {
if is_icon(attr.value.as_ref()) { if is_icon(attr.value.as_ref()) {
link_type = "icon"; link_type = LinkType::Icon;
break; break;
} else if attr.value.as_ref() == "stylesheet" { } else if attr.value.as_ref() == "stylesheet" {
link_type = "stylesheet"; link_type = LinkType::Stylesheet;
break; break;
} }
} }
} }
let link_type = link_type;
if link_type == "icon" { match link_type {
for attr in attrs_mut.iter_mut() { LinkType::Icon => {
if &attr.name.local == "href" { for attr in attrs_mut.iter_mut() {
if opt_no_images { if &attr.name.local == "href" {
attr.value.clear(); if opt_no_images {
} else { attr.value.clear();
let href_full_url = } else {
resolve_url(&url, attr.value.as_ref()).unwrap_or_default(); let href_full_url = resolve_url(&url, attr.value.as_ref())
let (favicon_dataurl, _) = retrieve_asset( .unwrap_or_default();
cache, let (favicon_dataurl, _) = retrieve_asset(
client,
&href_full_url,
true,
"",
opt_silent,
)
.unwrap_or_default();
attr.value.clear();
attr.value.push_slice(favicon_dataurl.as_str());
}
}
}
} else if link_type == "stylesheet" {
for attr in attrs_mut.iter_mut() {
if &attr.name.local == "href" {
if opt_no_css {
attr.value.clear();
} else {
let href_full_url =
resolve_url(&url, &attr.value.as_ref()).unwrap_or_default();
let replacement_text = match retrieve_asset(
cache,
client,
&href_full_url,
false,
"text/css",
opt_silent,
) {
// On successful retrieval, traverse CSS
Ok((css_data, _)) => resolve_css_imports(
cache, cache,
client, client,
&css_data,
true,
&href_full_url, &href_full_url,
opt_no_images, true,
"",
opt_silent, opt_silent,
), )
.unwrap_or_default();
// If a network error occured, warn attr.value.clear();
Err(e) => { attr.value.push_slice(favicon_dataurl.as_str());
eprintln!("Warning: {}", e); }
// If failed to resolve, replace with absolute URL
href_full_url
}
};
attr.value.clear();
attr.value.push_slice(&replacement_text);
} }
} }
} }
} else { LinkType::Stylesheet => {
for attr in attrs_mut.iter_mut() { for attr in attrs_mut.iter_mut() {
if &attr.name.local == "href" { if &attr.name.local == "href" {
let href_full_url = if opt_no_css {
resolve_url(&url, attr.value.as_ref()).unwrap_or_default(); attr.value.clear();
attr.value.clear(); } else {
attr.value.push_slice(&href_full_url.as_str()); let href_full_url = resolve_url(&url, &attr.value.as_ref())
.unwrap_or_default();
let replacement_text = match retrieve_asset(
cache,
client,
&href_full_url,
false,
"text/css",
opt_silent,
) {
// On successful retrieval, traverse CSS
Ok((css_data, _)) => resolve_css_imports(
cache,
client,
&css_data,
true,
&href_full_url,
opt_no_images,
opt_silent,
),
// If a network error occured, warn
Err(e) => {
eprintln!("Warning: {}", e);
// If failed to resolve, replace with absolute URL
href_full_url
}
};
attr.value.clear();
attr.value.push_slice(&replacement_text);
}
}
}
}
LinkType::Unknown => {
for attr in attrs_mut.iter_mut() {
if &attr.name.local == "href" {
let href_full_url =
resolve_url(&url, attr.value.as_ref()).unwrap_or_default();
attr.value.clear();
attr.value.push_slice(&href_full_url.as_str());
}
} }
} }
} }