0.4.2: ignore logos with search / menu in ancestor tree

Cargo.lock

@@ -1638,7 +1638,7 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
 
 [[package]]
 name = "site_icons"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "byteorder",
  "clap",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "site_icons"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Sam Denty <sam@samdenty.com>"]
 edition = "2018"
 license = "GPL-3.0"

src/icons.rs

@@ -187,25 +187,44 @@ impl Icons {
           "img[alt*=logo], svg[alt*=logo]",
           "img[class*=logo], svg[class*=logo]",
         ))
-        .map(|elem_ref| {
+        .filter_map(|elem_ref| {
-          let elem = elem_ref.value();
+          let mut ancestors = elem_ref
-          let mut weight = 0;
-
-          // if in the header
-          if elem_ref
             .ancestors()
             .map(ElementRef::wrap)
             .flatten()
-            .any(|element| element.value().name() == "header")
+            .map(|elem_ref| elem_ref.value());
-          {
+
+          let skip_classnames = regex!("menu|search");
+          let should_skip = ancestors.any(|ancestor| {
+            ancestor
+              .attr("class")
+              .map(|attr| skip_classnames.is_match(&attr.to_lowercase()))
+              .or_else(|| {
+                ancestor
+                  .attr("id")
+                  .map(|attr| skip_classnames.is_match(&attr.to_lowercase()))
+              })
+              .unwrap_or(false)
+          });
+
+          if should_skip {
+            return None;
+          }
+
+          let mut weight = 0;
+
+          // if in the header
+          if ancestors.any(|element| element.name() == "header") {
             weight += 2;
           }
 
-          let mentions_logo = |attr_name| {
+          let mut mentions_logo = |attr_name| {
-            elem
+            ancestors.any(|ancestor| {
-              .attr(attr_name)
+              ancestor
-              .map(|attr| regex!("logo([^s]|$)").is_match(&attr.to_lowercase()))
+                .attr(attr_name)
-              .unwrap_or(false)
+                .map(|attr| regex!("logo([^s]|$)").is_match(&attr.to_lowercase()))
+                .unwrap_or(false)
+            })
           };
           if mentions_logo("class") || mentions_logo("id") {
             weight += 3;
@@ -217,7 +236,7 @@ impl Icons {
             weight += 1;
           }
 
-          (elem_ref, weight)
+          Some((elem_ref, weight))
         })
         .collect();