Merge pull request #61 from porglezomp/release/0.4.1

Release/0.4.1

Author: porglezomp

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "feedburst"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Caleb Jones <code@calebjones.net>"]
 repository = "https://github.com/porglezomp/feedburst"
 license = "GPL-3.0+"
@@ -25,7 +25,7 @@ chrono = "0.4"
 clap = "2.25"
 log = "0.3.8"
 pretty_env_logger = "0.1.1"
-app_dirs = "1.1.1"
+app_dirs = "1.2.1"
 regex = "0.2"
 
 [[bin]]

Cargo.toml

@@ -1,12 +1,12 @@
 use std::env;
-use std::path::{Path, PathBuf};
 use std::fs::{File, OpenOptions};
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use error::{Error, ParseError};
 use feed::FeedInfo;
-use platform;
 use parser;
+use platform;
 
 #[derive(Debug, Clone)]
 enum PathWrapper {
@@ -62,9 +62,12 @@ impl Args {
                 .write(true)
                 .read(true)
                 .open(path)
-                .map_err(|err| Error::Msg(format!("Cannot open file {:?}: {}", path, err)))?),
-            PathWrapper::ErrorIfMissing(ref path) => Ok(File::open(path)
-                .map_err(|err| Error::Msg(format!("Cannot open file {:?}: {}", path, err)))?),
+                .map_err(|err| {
+                    Error::Msg(format!("Cannot open file {}: {}", path.display(), err))
+                })?),
+            PathWrapper::ErrorIfMissing(ref path) => Ok(File::open(path).map_err(|err| {
+                Error::Msg(format!("Cannot open file {}: {}", path.display(), err))
+            })?),
         }
     }
 
@@ -76,7 +79,13 @@ impl Args {
             .write(true)
             .create(true)
             .open(&path)
-            .map_err(|err| Error::Msg(format!("Error opening feed file {:?}: {}", path, err)))
+            .map_err(|err| {
+                Error::Msg(format!(
+                    "Error opening feed file {}: {}",
+                    path.display(),
+                    err
+                ))
+            })
     }
 
     pub fn open_url(&self, feed: &FeedInfo, url: &str) -> Result<(), Error> {
@@ -124,7 +133,10 @@ fn feed_path(root: Option<&PathBuf>, name: &str) -> Result<PathBuf, Error> {
         debug!("Using feed specified on the command line: {:?}", root);
         let root = Path::new(root);
         if !root.is_dir() {
-            Err(Error::Msg(format!("Error: {:?} is not a directory", root)))
+            Err(Error::Msg(format!(
+                "Error: {} is not a directory",
+                root.display()
+            )))
         } else {
             Ok(root.join(format!("{}.feed", name)))
         }

src/config.rs

@@ -1,5 +1,5 @@
-use std::{fmt, io};
 use reqwest;
+use std::{fmt, io};
 
 #[derive(Debug)]
 pub enum Error {

src/error.rs

@@ -1,11 +1,11 @@
-use std::collections::HashSet;
 use chrono::{DateTime, Utc, Weekday, MIN_DATE};
 use regex::Regex;
+use std::collections::HashSet;
 use std::io::{self, Read, Seek, Write};
 use std::path::PathBuf;
 
-use parser::parse_events;
 use error::{Error, ParseError, Span};
+use parser::parse_events;
 
 #[derive(Hash, Clone, Debug, PartialEq, Eq)]
 pub enum UpdateSpec {

src/feed.rs

@@ -13,15 +13,15 @@ use std::str::FromStr;
 
 use clap::{App, Arg};
 
-mod parser;
-mod parse_util;
-mod feed;
-mod error;
 mod config;
+mod error;
+mod feed;
+mod parse_util;
+mod parser;
 mod platform;
 
-use feed::Feed;
 use error::{Error, ParseError, Span};
+use feed::Feed;
 
 const APP_NAME: &str = env!("CARGO_PKG_NAME");
 
@@ -85,7 +85,11 @@ fn run() -> Result<(), Error> {
         file.read_to_string(&mut text)?;
 
         let make_error_message = |row: usize, span: Span, msg: &str| -> Error {
-            let mut message = format!("Line {}: Error parsing {:?}\n\n", row, args.config_path(),);
+            let mut message = format!(
+                "Line {}: Error parsing {}\n\n",
+                row,
+                args.config_path().display(),
+            );
             let line = text.lines().nth(row - 1).unwrap_or_default();
             message.push_str(&format!("{}\n", line));
             match span {
@@ -110,8 +114,8 @@ fn run() -> Result<(), Error> {
 
     if feeds.is_empty() {
         println!(
-            "You're not following any comics. Add some to your config file at {:?}",
-            args.config_path(),
+            "You're not following any comics. Add some to your config file at {}",
+            args.config_path().display(),
         );
         return Ok(());
     }
@@ -212,7 +216,7 @@ fn fetch_feed(args: &config::Args, mut feed: Feed) -> Result<Feed, Error> {
                     .filter(|x| {
                         let keep = feed_info.filter_title(&x.title);
                         if !keep {
-                            println!("skipping by title: {}", x.title);
+                            debug!("skipping by title: {}", x.title);
                         }
                         keep
                     })
@@ -231,7 +235,7 @@ fn fetch_feed(args: &config::Args, mut feed: Feed) -> Result<Feed, Error> {
                         let title = title.as_ref().map(|x| &x[..]).unwrap_or("");
                         let keep = feed_info.filter_title(&title);
                         if !keep {
-                            println!("skipping by title: {:?}", x.title);
+                            debug!("skipping by title: {:?}", x.title);
                         }
                         keep
                     })
@@ -256,7 +260,8 @@ fn read_feed(args: &config::Args, feed: &mut Feed) -> Result<(), Error> {
     }
     let plural_feeds = if items.len() == 1 { "comic" } else { "comics" };
     println!("{} ({} {})", feed.info.name, items.len(), plural_feeds);
-    if feed.info
+    if feed
+        .info
         .update_policies
         .contains(&feed::UpdateSpec::OpenAll)
     {

src/main.rs

@@ -129,15 +129,17 @@ fn parse_policy<'a>(buf: &Buffer<'a>) -> Result<(Buffer<'a>, UpdateSpec), ParseE
     } else if buf.starts_with_no_case("every") {
         let buf = buf.token_no_case("every")?.space()?;
         let (buf, count) = parse_number(&buf)?;
-        let buf = buf.space()?
+        let buf = buf
+            .space()?
             .first_token_of_no_case(&["days", "day"])?
             .0
             .space_or_end()?;
         Ok((buf, UpdateSpec::Every(count)))
     } else if buf.starts_with_no_case("overlap") {
         let buf = buf.token_no_case("overlap")?.space()?;
         let (buf, count) = parse_number(&buf)?;
-        let buf = buf.space()?
+        let buf = buf
+            .space()?
             .first_token_of_no_case(&["comics", "comic"])?
             .0
             .space_or_end()?;
@@ -167,19 +169,22 @@ fn parse_policy<'a>(buf: &Buffer<'a>) -> Result<(Buffer<'a>, UpdateSpec), ParseE
             ),
         ))
     } else if buf.starts_with_no_case("open") {
-        let buf = buf.token_no_case("open")?
+        let buf = buf
+            .token_no_case("open")?
             .space()?
             .token_no_case("all")?
             .space_or_end()?;
         Ok((buf, UpdateSpec::OpenAll))
-    } else if buf.text
+    } else if buf
+        .text
         .chars()
         .next()
         .map(|x| x.is_digit(10))
         .unwrap_or_default()
     {
         let (buf, count) = parse_number(&buf)?;
-        let buf = buf.trim_left()
+        let buf = buf
+            .trim_left()
             .token_no_case("new")?
             .space()?
             .first_token_of_no_case(&["comics", "comic"])?
@@ -204,7 +209,8 @@ fn parse_policy<'a>(buf: &Buffer<'a>) -> Result<(Buffer<'a>, UpdateSpec), ParseE
 
 fn parse_number<'a>(buf: &Buffer<'a>) -> ParseResult<'a, usize> {
     let buf = buf.trim_left();
-    let end = buf.text
+    let end = buf
+        .text
         .find(|c: char| !c.is_digit(10))
         .unwrap_or_else(|| buf.text.len());
     if end == 0 {
@@ -291,18 +297,16 @@ mod test {
 "#;
         assert_eq!(
             parse_config(buf),
-            Ok(vec![
-                FeedInfo {
-                    name: "Questionable Content".into(),
-                    url: "http://questionablecontent.net/QCRSS.xml".into(),
-                    update_policies: HashSet::from_iter(vec![
-                        UpdateSpec::On(Weekday::Sat),
-                        UpdateSpec::Every(10),
-                    ]),
-                    root: None,
-                    command: None,
-                },
-            ])
+            Ok(vec![FeedInfo {
+                name: "Questionable Content".into(),
+                url: "http://questionablecontent.net/QCRSS.xml".into(),
+                update_policies: HashSet::from_iter(vec![
+                    UpdateSpec::On(Weekday::Sat),
+                    UpdateSpec::Every(10),
+                ]),
+                root: None,
+                command: None,
+            }])
         );
     }
 
@@ -532,20 +536,18 @@ read 2017-07-18T23:41:58.130248+00:00
 ";
         assert_eq!(
             parse_config(pattern_text),
-            Ok(vec![
-                FeedInfo {
-                    name: "El Goonish Shive".into(),
-                    url: "http://www.egscomics.com/rss.php".into(),
-                    update_policies: HashSet::from_iter(vec![
-                        UpdateSpec::Filter(FilterType::IgnoreTitle, "EGS:NP".into()),
-                        UpdateSpec::Filter(FilterType::KeepTitle, "\\d{4}-\\d{2}-\\d{2}".into()),
-                        UpdateSpec::Filter(FilterType::KeepUrl, ".".into()),
-                        UpdateSpec::Filter(FilterType::IgnoreUrl, "egsnp".into()),
-                    ]),
-                    root: None,
-                    command: None,
-                },
-            ])
+            Ok(vec![FeedInfo {
+                name: "El Goonish Shive".into(),
+                url: "http://www.egscomics.com/rss.php".into(),
+                update_policies: HashSet::from_iter(vec![
+                    UpdateSpec::Filter(FilterType::IgnoreTitle, "EGS:NP".into()),
+                    UpdateSpec::Filter(FilterType::KeepTitle, "\\d{4}-\\d{2}-\\d{2}".into()),
+                    UpdateSpec::Filter(FilterType::KeepUrl, ".".into()),
+                    UpdateSpec::Filter(FilterType::IgnoreUrl, "egsnp".into()),
+                ]),
+                root: None,
+                command: None,
+            }])
         );
     }
 }

src/parser.rs

@@ -1,5 +1,5 @@
-use std::path::PathBuf;
 use std::env;
+use std::path::PathBuf;
 
 use error::Error;
 

src/platform/unix.rs

@@ -1,5 +1,5 @@
-use std::path::{Path, PathBuf};
 use std::ffi::OsStr;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::{env, fs};
 
@@ -14,8 +14,8 @@ fn app_data_dir() -> Result<PathBuf, Error> {
 }
 
 pub fn data_path(path: &str) -> Result<PathBuf, Error> {
-    let path = app_data_dir()?.join(path).parent().unwrap().into();
-    fs::create_dir_all(&path).map_err(|err| {
+    let path = app_data_dir()?.join(path);
+    fs::create_dir_all(path.parent().unwrap()).map_err(|err| {
         Error::Msg(format!(
             "Error creating feeds directory {:?}: {}",
             path, err