Transfer all work from chromebook

5 files changed, 42 insertions, 26 deletions

diff --git a/Cargo.toml b/Cargo.toml
index af9dd48..9d47ce4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "podcast"
-version = "0.2.5"
+version = "0.3.0"
 authors = ["njaremko <njaremko@gmail.com>"]
 description = "A command line podcast player"
 license = "GPL-3.0"
@@ -16,3 +16,4 @@ rss = {version = "0.7", features = ["from_url"] }
 serde = "1.0.10"
 serde_derive = "1.0.10"
 serde_json = "1.0.2"
+yaml-rust = "0.3.5"
diff --git a/src/actions.rs b/src/actions.rs
index 5c67c40..553ac37 100644
--- a/src/actions.rs
+++ b/src/actions.rs
@@ -9,20 +9,22 @@ use std::process::Command;
 use structs::*;
 use utils::*;
 
-pub fn list_episodes(state: &State, search: &str) {
+pub fn list_episodes(search: &str) {
     let re = Regex::new(search).unwrap();
-    for podcast in &state.subs {
-        if re.is_match(&podcast.title) {
-            println!("Episodes for {}:", &podcast.title);
-            match Podcast::from_url(&podcast.url) {
-                Ok(podcast) => {
-                    let episodes = podcast.episodes();
-                    for (index, episode) in episodes.iter().enumerate() {
-                        println!("({}) {}", episodes.len() - index, episode.title().unwrap());
-                    }
-                }
-                Err(err) => println!("{}", err),
+    let mut path = get_podcast_dir();
+    path.push(".rss");
+    DirBuilder::new().recursive(true).create(&path).unwrap();
+    for entry in fs::read_dir(&path).unwrap() {
+        let entry = entry.unwrap();
+        if re.is_match(&entry.file_name().into_string().unwrap()) {
+            let file = File::open(&entry.path()).unwrap();
+            let channel = Channel::read_from(BufReader::new(file)).unwrap();
+            let podcast = Podcast::from(channel);
+            let episodes = podcast.episodes();
+            for (num, ep) in episodes.iter().enumerate() {
+                println!("({}) {}", episodes.len()-num, ep.title().unwrap());
             }
+            return;
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 338c7b2..64f03ac 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -103,7 +103,7 @@ fn main() {
         Some("list") => {
             let list_matches = matches.subcommand_matches("list").unwrap();
             match list_matches.value_of("PODCAST") {
-                Some(regex) => list_episodes(&state, regex),
+                Some(regex) => list_episodes(regex),
                 None => list_subscriptions(&state),
             }
         }
diff --git a/src/structs.rs b/src/structs.rs
index 45191ea..2ea385e 100644
--- a/src/structs.rs
+++ b/src/structs.rs
@@ -61,14 +61,10 @@ pub struct State {
 
 impl State {
     pub fn new() -> Result<State, String> {
-        let mut path = get_podcast_dir();
-        if let Err(err) = DirBuilder::new().recursive(true).create(&path) {
-            return Err(format!(
-                "Couldn't create directory: {}\nReason: {}",
-                path.to_str().unwrap(),
-                err
-                ))
+        if let Err(err) = create_directories() {
+            return Err(format!("{}", err))
         }
+        let mut path = get_podcast_dir();
         path.push(".subscriptions");
         if path.exists() {
             let mut s = String::new();
@@ -76,7 +72,7 @@ impl State {
             match serde_json::from_str(&s) {
                 Ok(val) => {
                     let mut state: State = val;
-            // Check if a day has passed (86400 seconds)
+                    // Check if a day has passed (86400 seconds)
                     if state
                         .last_run_time
                             .signed_duration_since(Utc::now())
@@ -86,8 +82,10 @@ impl State {
                             }
                     state.last_run_time = Utc::now();
                     Ok(state)
-                },
-                Err(_) => Err(format!("Failed to parse .subscriptions ... I probably changed the schema ... sorry"))
+                }
+                Err(_) => Err(format!(
+                        "Failed to parse .subscriptions ... I probably changed the schema ... sorry"
+                        )),
             }
         } else {
             Ok(State {
@@ -122,7 +120,6 @@ impl State {
 
     pub fn save(&self) -> Result<(), io::Error> {
         let mut path = get_podcast_dir();
-        DirBuilder::new().recursive(true).create(&path).unwrap();
         path.push(".subscriptions.tmp");
         let serialized = serde_json::to_string(self)?;
         let mut file = File::create(&path)?;
diff --git a/src/utils.rs b/src/utils.rs
index 7d355b3..5444cb1 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -3,6 +3,8 @@ use std::env;
 use std::fs;
 use std::num::ParseIntError;
 use std::path::PathBuf;
+use std::fs::DirBuilder;
+use std::io;
 
 
 pub fn trim_extension(filename: &str) -> String {
@@ -26,6 +28,20 @@ pub fn find_extension(input: &str) -> Option<&str> {
     }
 }
 
+pub fn create_directories() -> io::Result<()> {
+    let mut path = get_podcast_dir();
+    path.push(".rss");
+    if let Err(err) = DirBuilder::new().recursive(true).create(&path) {
+        eprintln!(
+                    "Couldn't create directory: {}\nReason: {}",
+                    path.to_str().unwrap(),
+                    err
+                    );
+        return Err(err)
+    }
+    Ok(())
+}
+
 pub fn already_downloaded(dir: &str) -> HashSet<String> {
     let mut result = HashSet::new();
 
@@ -45,7 +61,7 @@ pub fn already_downloaded(dir: &str) -> HashSet<String> {
                         println!(
                             "OsString: {:?} couldn't be converted to String",
                             entry.file_name()
-                        );
+                            );
                     }
                 }
             }