njaremko/podcast - Change JPN37V6Q35ZAW7A2DTGX2WJ3IJ66BAGHXHWXOGHQRHGFAOETFQ7AC

Better error handling

Created by Nathan on August 1, 2017

JPN37V6Q35ZAW7A2DTGX2WJ3IJ66BAGHXHWXOGHQRHGFAOETFQ7AC

Dependencies

In channels

main

Change contents

Replacement in Cargo.toml at line 3 [4.62]
B:BD[4.90] → [5.1:19]
```
version = "0.3.0"
```
[4.90]
[4.108]
```
version = "0.3.1"
```

Insertion in Cargo.toml at line 7 [4.62]

[6.67]

[2.1]

readme = "README.md"
keywords = ["audio", "cli", "podcast", "music"]

Replacement in src/actions.rs at line 107 [8.163]

B:BD[7.502] → [7.502:575]

∅:D[7.575] → [9.22:219]

B:BD[10.1242] → [9.22:219]

            let podcast = Podcast::from_url(&subscription.url).unwrap();
            match parse_download_episodes(e_search) {
                Ok(episodes_to_download) => podcast.download_specific(episodes_to_download),
                Err(err) => eprintln!("{}", err),

[7.502]

[9.219]

            match Podcast::from_title(&subscription.title) {
                Ok(podcast) => {
                    match parse_download_episodes(e_search) {
                        Ok(episodes_to_download) => {
                            if let Err(err) = podcast.download_specific(episodes_to_download) {
                                eprintln!("Error: {}", err);
                            }
                        }
                        Err(err) => eprintln!("Error: {}", err),
                    }
                }
                Err(err) => eprintln!("Error: {}", err),

Deletion in src/actions.rs at line 120 [8.163]
B:BD[9.233] → [9.233:253]
```
            return;
```

Replacement in src/actions.rs at line 130 [8.163]

B:BD[7.664] → [7.664:737]

∅:D[7.737] → [11.348:395]

∅:D[10.1370] → [11.348:395]

B:BD[11.348] → [11.348:395]

B:BD[11.395] → [12.299:391]

B:BD[12.391] → [9.254:292]

            let podcast = Podcast::from_url(&subscription.url).unwrap();
            let episodes = podcast.episodes();
            if let Err(err) = episodes[episodes.len() - ep_num].download(podcast.title()) {
                eprintln!("{}", err);

[7.664]

[11.549]

            match Podcast::from_title(&subscription.title) {
                Ok(podcast) => {
                    let episodes = podcast.episodes();
                    if let Err(err) = episodes[episodes.len() - ep_num].download(podcast.title()) {
                        eprintln!("{}", err);
                    }
                }
                Err(err) => eprintln!("Error: {}", err),

Replacement in src/actions.rs at line 148 [8.163]

B:BD[7.826] → [7.826:899]

∅:D[7.899] → [11.854:886]

∅:D[10.1498] → [11.854:886]

B:BD[11.854] → [11.854:886]

            let podcast = Podcast::from_url(&subscription.url).unwrap();
            podcast.download();

[7.826]

[11.886]

            match Podcast::from_title(&subscription.title) {
                Ok(podcast) => {
                    if let Err(err) = podcast.download() {
                        eprintln!("{}", err);
                    }
                }
                Err(err) => eprintln!("Error: {}", err),
            }

Replacement in src/actions.rs at line 163 [8.163]

B:BD[13.149] → [14.95:156]

    let mut path = get_podcast_dir();
    path.push(".rss");

[13.149]

[15.1018]

    let mut path = get_xml_dir();

Replacement in src/actions.rs at line 203 [8.163]
B:BD[16.241] → [16.241:265]
```
        launch_vlc(url)
```
[16.241]
[8.869]
```
        launch_vlc(&url)
```
Replacement in src/structs.rs at line 9 [4.234]
∅:D[10.1697] → [8.3209:3243]
B:BD[8.3209] → [8.3209:3243]
```
use std::io::{self, Read, Write};
```
[10.1697]
[8.3243]
```
use std::io::{self, BufReader, Read, Write};
```
Insertion in src/structs.rs at line 165 [4.234]
[8.4906]
[8.4906]
```
    #[allow(dead_code)]
```

Insertion in src/structs.rs at line 170 [4.234]

[8.5090]

        }
    }
    pub fn from_title(title: &str) -> Result<Podcast, String> {
        let mut path = get_xml_dir();
        let mut filename = String::from(title);
        filename.push_str(".xml");
        path.push(filename);
        match File::open(&path) {
            Ok(file) => {
                match Channel::read_from(BufReader::new(file)) {
                    Ok(podcast) => return Ok(Podcast::from(podcast)),
                    Err(err) => return Err(format!("Error: {}", err)),
                }
            }
            Err(err) => return Err(format!("Error: {}", err)),

Replacement in src/structs.rs at line 200 [4.234]
B:BD[8.5163] → [8.5163:5192]
```
    pub fn download(&self) {
```
[4.820]
[8.5192]
```
    pub fn download(&self) -> Result<(), io::Error> {
```

Replacement in src/structs.rs at line 204 [4.234]

B:BD[8.5334] → [8.5334:5393]

        let downloaded = already_downloaded(self.title());

[8.5334]

[8.5393]

        let downloaded = already_downloaded(self.title())?;

Insertion in src/structs.rs at line 217 [4.234]
[3.1370]
[17.349]
```
        Ok(())
```

Replacement in src/structs.rs at line 220 [4.234]

B:BD[17.356] → [17.356:423]

    pub fn download_specific(&self, episode_numbers: Vec<usize>) {

[17.356]

[17.423]

    pub fn download_specific(&self, episode_numbers: Vec<usize>) -> Result<(), io::Error> {

Replacement in src/structs.rs at line 224 [4.234]

B:BD[17.499] → [17.499:558]

        let downloaded = already_downloaded(self.title());

[17.499]

[17.558]

        let downloaded = already_downloaded(self.title())?;

Insertion in src/structs.rs at line 238 [4.234]
[3.1441]
[4.1114]
```
        Ok(())
```
Deletion in src/utils.rs at line 3 [8.7061]
B:BD[8.7145] → [3.1443:1468]
∅:D[3.1468] → [18.336:349]
B:BD[8.7145] → [18.336:349]
```
use std::fs::DirBuilder;
use std::fs;
```
Insertion in src/utils.rs at line 5 [8.7061]
[19.3467]
[8.7145]
```
use std::fs::{self, DirBuilder};
use std::io;
```

Replacement in src/utils.rs at line 8 [8.7061]

B:BD[8.7147] → [19.3468:3518]

pub fn trim_extension(filename: &str) -> String {

[8.7146]

[19.3518]

pub fn trim_extension(filename: &str) -> Option<String> {

Replacement in src/utils.rs at line 10 [8.7061]

B:BD[19.3557] → [19.3557:3633]

    let index = name.rfind('.').unwrap();
    String::from(&name[0..index])

[19.3557]

[19.3633]

    match name.rfind('.') {
        Some(index) => Some(String::from(&name[0..index])),
        None => None,
    }

Replacement in src/utils.rs at line 44 [8.7061]

B:BD[8.7245] → [19.3984:4042]

pub fn already_downloaded(dir: &str) -> HashSet<String> {

[8.7245]

[19.4042]

pub fn already_downloaded(dir: &str) -> Result<HashSet<String>, io::Error> {

Replacement in src/utils.rs at line 50 [8.7061]

B:BD[8.7304] → [8.7304:7509]

B:BD[8.7509] → [9.324:509]

∅:D[9.509] → [8.7594:7616]

∅:D[17.1252] → [8.7594:7616]

B:BD[8.7594] → [8.7594:7616]

B:BD[8.7616] → [17.1253:1443]

B:BD[17.1443] → [3.1672:1699]

∅:D[17.1470] → [8.7739:7779]

∅:D[5.1666] → [8.7739:7779]

∅:D[3.1699] → [8.7739:7779]

B:BD[8.7739] → [8.7739:7779]

    if let Ok(entries) = fs::read_dir(path) {
        for entry in entries {
            if let Ok(entry) = entry {
                match entry.file_name().into_string() {
                    Ok(val) => {
                        let name = String::from(val);
                        let index = name.find('.').unwrap();
                        result.insert(String::from(&name[0..index]));
                    }
                    Err(_) => {
                        println!(
                            "OsString: {:?} couldn't be converted to String",
                            entry.file_name()
                        );
                    }
                }

[8.7304]

[8.7779]

    let entries = fs::read_dir(path)?;
    for entry in entries {
        let entry = entry?;
        match entry.file_name().into_string() {
            Ok(val) => {
                let name = String::from(val);
                let index = name.find('.').unwrap();
                result.insert(String::from(&name[0..index]));
            }
            Err(_) => {
                println!(
                    "OsString: {:?} couldn't be converted to String",
                    entry.file_name()
                );

Replacement in src/utils.rs at line 67 [8.7061]
B:BD[8.7809] → [8.7809:7820]
```
    result
```
[8.7809]
[8.7820]
```
    Ok(result)
```

Replacement in src/utils.rs at line 74 [8.7061]

B:BD[10.2220] → [10.2220:2273]

            let mut path = env::home_dir().unwrap();

[10.2220]

[10.2273]

            let mut path = env::home_dir().expect("Couldn't find your home directory");

Replacement in src/utils.rs at line 82 [8.7061]

B:BD[10.2379] → [10.2379:2552]

∅:D[10.2552] → [20.717:823]

B:BD[20.717] → [20.717:823]

B:BD[20.823] → [10.2553:2594]

∅:D[10.2594] → [20.823:856]

B:BD[20.823] → [20.823:856]

    match env::var_os("PODCAST") {
        Some(val) => {
            let mut path = PathBuf::from(val);
            path.push(".subscriptions");
            path
        }
        None => {
            let mut path = env::home_dir().unwrap();
            path.push("Podcasts");
            path.push(".subscriptions");
            path
        }
    }

[10.2379]

[8.7942]

    let mut path = get_podcast_dir();
    path.push(".subscriptions");
    path
}
pub fn get_xml_dir() -> PathBuf {
    let mut path = get_podcast_dir();
    path.push(".rss");
    path

Better error handling

Dependencies

In channels

Change contents

Replacement in Cargo.toml at line 3 [4.62]

Insertion in Cargo.toml at line 7 [4.62]

Replacement in src/actions.rs at line 107 [8.163]

Deletion in src/actions.rs at line 120 [8.163]

Replacement in src/actions.rs at line 130 [8.163]

Replacement in src/actions.rs at line 148 [8.163]

Replacement in src/actions.rs at line 163 [8.163]

Replacement in src/actions.rs at line 203 [8.163]

Replacement in src/structs.rs at line 9 [4.234]

Insertion in src/structs.rs at line 165 [4.234]

Insertion in src/structs.rs at line 170 [4.234]

Replacement in src/structs.rs at line 200 [4.234]

Replacement in src/structs.rs at line 204 [4.234]

Insertion in src/structs.rs at line 217 [4.234]

Replacement in src/structs.rs at line 220 [4.234]

Replacement in src/structs.rs at line 224 [4.234]

Insertion in src/structs.rs at line 238 [4.234]

Deletion in src/utils.rs at line 3 [8.7061]

Insertion in src/utils.rs at line 5 [8.7061]