Fixed problem with HTML escaping for Waybar.

Reported here too: Alexays/Waybar#2067
AndreasBackx · May 20, 2023 · f9e4a5d · f9e4a5d
1 parent 18cf2b7
commit f9e4a5d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.2.4] - 2023-05-20
+### Changed
+- Fixed Waybar output problem with HTML escaping.
 
 ## [0.2.3] - 2022-05-29
 ### Changed

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,12 +7,13 @@ homepage = "https://github.com/AndreasBackx/spotifatius"
 keywords = ["spotify", "waybar", "polybar"]
 license = "MIT"
 name = "spotifatius"
-version = "0.2.3"
+version = "0.2.4"
 
 [dependencies]
 anyhow = "1.0.41"
 clap = {version = "3.1.18", features = ["derive"]}
 futures = {version = "0.3", default-features = false}
+html-escape = "0.2.13"
 # Don't use prost's `prost-derive` because it's unused.
 prost = {version = "0.10.4", default-features = false, features = ["std"]}
 rspotify = {version = "0.11.0", features = [

diff --git a/src/commands/output.rs b/src/commands/output.rs
@@ -28,7 +28,11 @@ impl OutputFormatter {
     pub fn print(&self, output: Output) -> Result<()> {
         match self.output_type {
             OutputType::Waybar => {
-                let json = serde_json::to_string(&output)?;
+                let json = serde_json::to_string(&Output {
+                    text: html_escape::encode_text(&output.text.to_string())
+                        .into(),
+                    ..output
+                })?;
                 println!("{}", json);
             }
             OutputType::Polybar => {