diff --git a/Cargo.lock b/Cargo.lock index 59b8f42..a43c1d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,12 +23,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" -[[package]] -name = "base64" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25655df2c3cdd83c5e5b293b88acd880332b2ddadd7c30ac43144fdc0033da9" - [[package]] name = "bitflags" version = "2.13.1" @@ -408,7 +402,6 @@ name = "icon-color-tool" version = "0.1.0" dependencies = [ "anyhow", - "base64", "gtk4", "regex", "serde", diff --git a/Cargo.toml b/Cargo.toml index 24d2182..99982a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,4 +10,3 @@ regex = "1" serde = { version = "1", features = ["derive"] } toml = "0.8" walkdir = "2" -base64 = "0.23.0" diff --git a/src/composite_icon.rs b/src/composite_icon.rs index 00be610..5731ccd 100644 --- a/src/composite_icon.rs +++ b/src/composite_icon.rs @@ -25,15 +25,27 @@ impl CompositeIcon { pub fn render(&self) -> String { if let Some(emblem) = &self.emblem { - use base64::prelude::*; - let bg_b64 = BASE64_STANDARD.encode(&self.bg.content); - let emblem_b64 = BASE64_STANDARD.encode(&emblem.content); + fn strip_xml(svg: &str) -> &str { + if let Some(idx) = svg.find(" - - + +{} + + +{} + "#, - bg_b64, self.emblem_x, self.emblem_y, self.emblem_size, self.emblem_size, emblem_b64 + bg_svg, self.emblem_x, self.emblem_y, self.emblem_size, self.emblem_size, emblem_svg ) } else { self.bg.content.clone()