toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'patreon_rss_fix' into 'master'

Browse Source 
p-data/utils/url_cleaner: Keep query pairs in URLs

Closes #139

See merge request World/podcasts!111
This commit is contained in:
Jordan Petridis 2019-06-09 01:54:56 +00:00
commit d5945f6ac6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
podcasts-data/src/utils.rs
View File

@ -122,7 +122,7 @@ pub fn url_cleaner(s: &str) -> String {
// https://rust-lang-nursery.github.io/rust-cookbook/net.html // https://rust-lang-nursery.github.io/rust-cookbook/net.html
// #remove-fragment-identifiers-and-query-pairs-from-a-url // #remove-fragment-identifiers-and-query-pairs-from-a-url
match Url::parse(s) { match Url::parse(s) {
Ok(parsed) => parsed[..Position::AfterPath].to_owned(), Ok(parsed) => parsed[..Position::AfterQuery].to_owned(),
_ => s.trim().to_owned(), _ => s.trim().to_owned(),
} }
} }
@ -290,8 +290,8 @@ mod tests {
#[test] #[test]
fn test_url_cleaner() -> Result<(), Error> { fn test_url_cleaner() -> Result<(), Error> {
let good_url = "http://traffic.megaphone.fm/FL8608731318.mp3"; let good_url = "http://traffic.megaphone.fm/FL8608731318.mp3?updated=1484685184";
let bad_url = "http://traffic.megaphone.fm/FL8608731318.mp3?updated=1484685184"; let bad_url = "http://traffic.megaphone.fm/FL8608731318.mp3?updated=1484685184#foobar";
assert_eq!(url_cleaner(bad_url), good_url); assert_eq!(url_cleaner(bad_url), good_url);
assert_eq!(url_cleaner(good_url), good_url); assert_eq!(url_cleaner(good_url), good_url);