Skip to content

Commit 708fedc

clearloop clearloop

authored

Merge pull request clearloop#11 from hulufei/master

Improve `pick` command to display more html entities properly

2 parents b5d0ea5 + faf2169 commit 708fedcCopy full SHA for 708fedc

File tree

2 files changed

+7

-18

lines changed

Cargo.toml
src
- helper.rs

2 files changed

+7

-18

lines changed

`‎Cargo.toml`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,12 @@ serde_derive = "1.0.104"`
`31`	`31`	`serde_json = "1.0.44"`
`32`	`32`	`pyo3 = "0.8.5"`
`33`	`33`	`toml = "0.5.5"`
	`34`	`+escaper = "0.1.0"`
`34`	`35`
`35`	`36`	`[dependencies.diesel]`
`36`	`37`	`version = "1.4.3"`
`37`	`38`	`features = ["sqlite"]`
`38`	`39`
`39`	`40`	`[dependencies.reqwest]`
`40`	`41`	`version = "0.10.3"`
`41`		`-features = ["blocking", "gzip", "json"]`
	`42`	`+features = ["blocking", "gzip", "json"]`

`‎src/helper.rs`

Lines changed: 5 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ mod filter {`
`94`	`94`	`mod html {`
`95`	`95`	`// use crate::Error;`
`96`	`96`	`use colored::Colorize;`
	`97`	`+ use escaper::decode_html;`
`97`	`98`	`pub enum Token {`
`98`	`99`	`Plain(String),`
`99`	`100`	`Bold(String),`
`@@ -109,15 +110,7 @@ mod html {`
`109`	`110`	`impl HTML for String {`
`110`	`111`	`fn ser(&self) -> Vec<Token> {`
`111`	`112`	`// empty tags`
`112`		`- let mut tks = self.to_string();`
`113`		`-`
`114`		`- // converting symbols`
`115`		`- tks = tks`
`116`		`- .replace(r#"&"#, "&")`
`117`		`- .replace(r#"""#, "\"")`
`118`		`- .replace(r#" "#, " ")`
`119`		`- .replace(r#"'"#, "'");`
`120`		`-`
	`113`	`+ let tks = self.to_string();`
`121`	`114`	`let res: Vec<Token>;`
`122`	`115`	`// styled`
`123`	`116`	`{`
`@@ -180,14 +173,9 @@ mod html {`
`180`	`173`	`}`
`181`	`174`
`182`	`175`	`// post replace`
`183`		`- let mut tks = tks.join("");`
`184`		`- tks = tks`
`185`		`- .replace(r#"<"#, "<")`
`186`		`- .replace(r#">"#, ">")`
`187`		`- .replace(r#"≥"#, ">=")`
`188`		`- .replace(r#"≤"#, "<=");`
`189`		`-`
`190`		`- tks`
	`176`	`+ let tks = tks.join("");`
	`177`	`+`
	`178`	`+ decode_html(&tks).unwrap_or(tks)`
`191`	`179`	`}`
`192`	`180`	`}`
`193`	`181`	`}`

0 commit comments

Comments

(0)