njaremko/podcast - Change IMRHIIAUQDSKU4D6YONK67D6GH7ZLLMMB5S2HRZT76SYNJ7M2RSQC

Add proper search functionality (mvp)

Created by jaremn on July 15, 2020

IMRHIIAUQDSKU4D6YONK67D6GH7ZLLMMB5S2HRZT76SYNJ7M2RSQC

Dependencies

In channels

main

Change contents

Insertion in CHANGELOG at line 1 [3.1]

[3.1]

[4.1]

0.15.0
- Proper podcast searching through iTunes API

Replacement in Cargo.toml at line 4 [6.62]
B:BD[5.80] → [2.1:20]
```
version = "0.14.0"
```
[5.80]
[7.1199]
```
version = "0.15.0"
```
Replacement in Cargo.toml at line 24 [6.62]
B:BD[8.15] → [4.84:97]
```
dirs = "2.0"
```
[8.15]
[9.220]
```
dirs = "3.0"
```
Replacement in Cargo.toml at line 27 [6.62]
B:BD[10.41] → [10.41:59]
```
futures = "0.3.1"
```
[10.41]
[10.59]
```
futures = "0.3"
```
Replacement in Cargo.toml at line 31 [6.62]
∅:D[10.154] → [4.113:163]
B:BD[5.184] → [4.113:163]
```
rss = {version = "1.8", features = ["from_url"] }
```
[10.154]
[11.96]
```
rss = {version = "1.9", features = ["from_url"] }
```
Replacement in src/arg_parser.rs at line 116 [13.3622]
∅:D[10.2680] → [12.1316:1349]
B:BD[12.1316] → [12.1316:1349]
```
    if resp.found().is_empty() {
```
[10.2680]
[12.1349]
```
    if resp.results.is_empty() {
```

Replacement in src/arg_parser.rs at line 124 [13.3622]

B:BD[12.1490] → [12.1490:1597]

        for (i, r) in resp.found().iter().enumerate() {
            writeln!(&mut lock, "({}) {}", i, r)?;

[12.1490]

[13.7522]

        for (i, r) in resp.results.iter().enumerate() {
            writeln!(&mut lock, "({}) {}", i, r.collection_name.clone().unwrap_or_else(|| "".to_string()))?;

Replacement in src/arg_parser.rs at line 142 [13.3622]
B:BD[12.2045] → [12.2045:2077]
```
    if n > resp.found().len() {
```
[12.2045]
[12.2077]
```
    if n > resp.results.len() {
```

Replacement in src/arg_parser.rs at line 147 [13.3622]

B:BD[12.2133] → [10.2681:2747]

∅:D[10.2747] → [12.2193:2321]

B:BD[12.2193] → [12.2193:2321]

B:BD[12.2321] → [10.2748:2797]

    let rss_resp = search::retrieve_rss(&resp.found()[n]).await?;
    if let Some(err) = rss_resp.error() {
        eprintln!("{}", err);
        return Ok(());
    }
    match rss_resp.url() {
        Some(r) => sub(state, config, r).await?,

[12.2133]

[12.2364]

    let rss_resp = &resp.results[n];
    match &rss_resp.feed_url {
        Some(r) => sub(state, config, &r).await?,

Replacement in src/main.rs at line 42 [6.1346]
B:BD[11.2900] → [2.23:55]
```
const VERSION: &str = "0.14.0";
```
[11.2900]
[14.2182]
```
const VERSION: &str = "0.15.0";
```

Insertion in src/search.rs at line 4 [15.1]

[15.100]

[15.116]


#[derive(Debug, Serialize, Deserialize)]
pub struct ArtistSearchResponse {
    #[serde(rename = "resultCount")]
    pub result_count: usize,
    pub results: Vec<ArtistSearchResult>,
}

Insertion in src/search.rs at line 12 [15.1]

[15.117]

#[derive(Debug, Serialize, Deserialize)]
pub struct ArtistSearchResult {
    #[serde(rename = "wrapperType")]
    pub wrapper_type: Option<String>,
    #[serde(rename = "artistType")]
    pub artist_type: Option<String>,
    #[serde(rename = "artistName")]
    pub artist_name: Option<String>,
    #[serde(rename = "artistLinkUrl")]
    pub artist_link_url: Option<String>,
    #[serde(rename = "artistId")]
    pub artist_id: Option<i64>,
    #[serde(rename = "primaryGenreName")]
    pub primary_genre_name: Option<String>,
    #[serde(rename = "primaryGenreId")]
    pub primary_genre_id: Option<i64>,
}

Replacement in src/search.rs at line 33 [15.1]

B:BD[15.176] → [15.176:249]

pub struct Response {
    error: Option<String>,
    found: Vec<String>,

[15.176]

[15.249]

pub struct PodcastSearchResult {
    #[serde(rename = "wrapperType")]
    wrapper_type: Option<WrapperType>,
    kind: Option<Kind>,
    #[serde(rename = "artistId")]
    artist_id: Option<i64>,
    #[serde(rename = "collectionId")]
    collection_id: Option<i64>,
    #[serde(rename = "trackId")]
    track_id: Option<i64>,
    #[serde(rename = "artistName")]
    artist_name: Option<String>,
    #[serde(rename = "collectionName")]
    pub collection_name: Option<String>,
    #[serde(rename = "trackName")]
    track_name: Option<String>,
    #[serde(rename = "collectionCensoredName")]
    collection_censored_name: Option<String>,
    #[serde(rename = "trackCensoredName")]
    track_censored_name: Option<String>,
    #[serde(rename = "artistViewUrl")]
    artist_view_url: Option<String>,
    #[serde(rename = "collectionViewUrl")]
    collection_view_url: Option<String>,
    #[serde(rename = "feedUrl")]
    pub feed_url: Option<String>,
    #[serde(rename = "trackViewUrl")]
    track_view_url: Option<String>,
    #[serde(rename = "artworkUrl30")]
    artwork_url30: Option<String>,
    #[serde(rename = "artworkUrl60")]
    artwork_url60: Option<String>,
    #[serde(rename = "artworkUrl100")]
    artwork_url100: Option<String>,
    #[serde(rename = "collectionPrice")]
    collection_price: Option<f64>,
    #[serde(rename = "trackPrice")]
    track_price: Option<f64>,
    #[serde(rename = "trackRentalPrice")]
    track_rental_price: Option<f64>,
    #[serde(rename = "collectionHdPrice")]
    collection_hd_price: Option<f64>,
    #[serde(rename = "trackHdPrice")]
    track_hd_price: Option<f64>,
    #[serde(rename = "trackHdRentalPrice")]
    track_hd_rental_price: Option<f64>,
    #[serde(rename = "releaseDate")]
    release_date: Option<String>,
    #[serde(rename = "collectionExplicitness")]
    collection_explicitness: Option<Explicitness>,
    #[serde(rename = "trackExplicitness")]
    track_explicitness: Option<Explicitness>,
    #[serde(rename = "trackCount")]
    track_count: Option<i64>,
    country: Option<Country>,
    currency: Option<Currency>,
    #[serde(rename = "primaryGenreName")]
    primary_genre_name: Option<String>,
    #[serde(rename = "contentAdvisoryRating")]
    content_advisory_rating: Option<ContentAdvisoryRating>,
    #[serde(rename = "artworkUrl600")]
    artwork_url600: Option<String>,
    #[serde(rename = "genreIds")]
    genre_ids: Option<Vec<String>>,
    genres: Option<Vec<String>>,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum Explicitness {
    #[serde(rename = "cleaned")]
    Cleaned,
    #[serde(rename = "explicit")]
    Explicit,
    #[serde(rename = "notExplicit")]
    NotExplicit,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum ContentAdvisoryRating {
    Clean,
    Explicit,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum Country {
    #[serde(rename = "USA")]
    Usa,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum Currency {
    #[serde(rename = "USD")]
    Usd,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum Kind {
    #[serde(rename = "podcast")]
    Podcast,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum WrapperType {
    #[serde(rename = "track")]
    Track,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct TrackSearchResponse {
    #[serde(rename = "resultCount")]
    pub result_count: usize,
    pub results: Vec<PodcastSearchResult>

Replacement in src/search.rs at line 149 [15.1]

B:BD[15.252] → [15.252:333]

impl Response {
    pub fn error(&self) -> &Option<String> {
        &self.error

[15.252]

[15.333]

impl TrackSearchResponse {
    pub fn result_count(&self) -> usize {
        self.result_count

Replacement in src/search.rs at line 154 [15.1]

B:BD[15.340] → [15.340:399]

    pub fn found(&self) -> &[String] {
        &self.found

[15.340]

[15.399]

    pub fn results(&self) -> &[PodcastSearchResult] {
        &self.results

Replacement in src/search.rs at line 175 [15.1]

B:BD[15.708] → [15.708:752]

const BASE: &str = "https://podcastapi.ca";

[15.708]

[15.752]

const BASE: &str = "https://itunes.apple.com/search?media=podcast&term=";

Replacement in src/search.rs at line 177 [15.1]

B:BD[15.753] → [10.6383:6459]

∅:D[10.6459] → [16.678:756]

B:BD[15.823] → [16.678:756]

∅:D[16.756] → [15.903:958]

B:BD[15.903] → [15.903:958]

B:BD[15.958] → [10.6460:6525]

pub async fn search_for_podcast(podcast: &str) -> Result<Response, Error> {
    let encoded = utf8_percent_encode(podcast, NON_ALPHANUMERIC).to_string();
    let url = BASE.to_string() + "/query/" + &encoded;
    let r = reqwest::get(&url).await?.json::<Response>().await?;

[15.753]

[15.1048]

pub async fn search_for_podcast(podcast: &str) -> Result<TrackSearchResponse, Error> {
    let encoded: String = podcast.chars().map(|c| {
        if c == ' ' {
            return '+';
        }
        return c;
    }).collect();
    let url =  format!("https://itunes.apple.com/search?media=podcast&entity=podcast&term={}", encoded);
    let r = reqwest::get(&url).await?.json::<TrackSearchResponse>().await?;

Replacement in src/search.rs at line 189 [15.1]

B:BD[15.1061] → [10.6526:6612]

pub async fn search_for_episode(podcast: &str, ep: &str) -> Result<Response, Error> {

[15.1061]

[16.757]

pub async fn search_for_episode(podcast: &str, ep: &str) -> Result<TrackSearchResponse, Error> {

Replacement in src/search.rs at line 193 [15.1]

B:BD[15.1398] → [10.6613:6678]

    let r = reqwest::get(&url).await?.json::<Response>().await?;

[15.1398]

[15.1488]

    let r = reqwest::get(&url).await?.json::<TrackSearchResponse>().await?;

Replacement in src/search.rs at line 197 [15.1]

B:BD[15.1501] → [10.6679:6752]

pub async fn retrieve_rss(podcast: &str) -> Result<RssResponse, Error> {

[15.1501]

[16.920]

pub async fn retrieve_rss(podcast: &str) -> Result<TrackSearchResponse, Error> {

Replacement in src/search.rs at line 199 [15.1]

∅:D[16.998] → [15.1648:1701]

B:BD[15.1648] → [15.1648:1701]

B:BD[15.1701] → [10.6753:6821]

    let url = BASE.to_string() + "/rss/" + &encoded;
    let r = reqwest::get(&url).await?.json::<RssResponse>().await?;

[16.998]

[15.1794]

    let url =  format!("https://itunes.apple.com/lookup?id={}&entity=podcast", encoded);
    let r = reqwest::get(&url).await?.json::<TrackSearchResponse>().await?;

Replacement in src/structs.rs at line 254 [6.234]
B:BD[6.1307] → [6.1307:1309]
```
}
```
[17.6274]
```
}
```

Add proper search functionality (mvp)

Dependencies

In channels

Change contents

Insertion in CHANGELOG at line 1 [3.1]

Replacement in Cargo.toml at line 4 [6.62]

Replacement in Cargo.toml at line 24 [6.62]

Replacement in Cargo.toml at line 27 [6.62]

Replacement in Cargo.toml at line 31 [6.62]

Replacement in src/arg_parser.rs at line 116 [13.3622]