mirror of
https://github.com/watchexec/watchexec.git
synced 2024-09-29 22:51:33 +02:00
Cleanups/more logging
This commit is contained in:
parent
8923bc1e1c
commit
b6831c4d30
@ -100,7 +100,7 @@ fn main() {
|
|||||||
if !args.is_present("no-vcs-ignore") {
|
if !args.is_present("no-vcs-ignore") {
|
||||||
let gitignore_path = cwd.join(".gitignore");
|
let gitignore_path = cwd.join(".gitignore");
|
||||||
if gitignore_path.exists() {
|
if gitignore_path.exists() {
|
||||||
debug!("Found .gitignore file: {}", gitignore_path.to_str().unwrap());
|
debug!("Found .gitignore file: {:?}", gitignore_path);
|
||||||
|
|
||||||
gitignore_file = gitignore::parse(&gitignore_path).ok();
|
gitignore_file = gitignore::parse(&gitignore_path).ok();
|
||||||
}
|
}
|
||||||
|
@ -19,18 +19,6 @@ pub enum NotificationError {
|
|||||||
Io(io::Error)
|
Io(io::Error)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<io::Error> for NotificationError {
|
|
||||||
fn from(err: io::Error) -> NotificationError {
|
|
||||||
NotificationError::Io(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<PatternError> for NotificationError {
|
|
||||||
fn from(err: PatternError) -> NotificationError {
|
|
||||||
NotificationError::BadPattern(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl NotificationFilter {
|
impl NotificationFilter {
|
||||||
pub fn new(current_dir: &Path, ignore_file: Option<gitignore::PatternSet>) -> Result<NotificationFilter, io::Error> {
|
pub fn new(current_dir: &Path, ignore_file: Option<gitignore::PatternSet>) -> Result<NotificationFilter, io::Error> {
|
||||||
let canonicalized = try!(current_dir.canonicalize());
|
let canonicalized = try!(current_dir.canonicalize());
|
||||||
@ -43,18 +31,14 @@ impl NotificationFilter {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_extension(&mut self, extension: &str) -> Result<(), NotificationError> {
|
pub fn add_extension(&mut self, extensions: &str) -> Result<(), NotificationError> {
|
||||||
let mut pattern = String::new();
|
let patterns: Vec<String> = extensions
|
||||||
|
.split(",")
|
||||||
for ext in extension.split(",") {
|
.filter(|ext| !ext.is_empty())
|
||||||
pattern.clear();
|
.map(|ext| format!("*.{}", ext.replace(".", "")))
|
||||||
pattern.push_str("*");
|
.collect();
|
||||||
|
|
||||||
if !ext.starts_with(".") {
|
|
||||||
pattern.push_str(".");
|
|
||||||
}
|
|
||||||
pattern.push_str(ext);
|
|
||||||
|
|
||||||
|
for pattern in patterns {
|
||||||
try!(self.add_filter(&pattern));
|
try!(self.add_filter(&pattern));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -65,6 +49,8 @@ impl NotificationFilter {
|
|||||||
let compiled = try!(self.pattern_for(pattern));
|
let compiled = try!(self.pattern_for(pattern));
|
||||||
self.filters.push(compiled);
|
self.filters.push(compiled);
|
||||||
|
|
||||||
|
debug!("Adding filter: {}", pattern);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,6 +58,8 @@ impl NotificationFilter {
|
|||||||
let compiled = try!(self.pattern_for(pattern));
|
let compiled = try!(self.pattern_for(pattern));
|
||||||
self.ignores.push(compiled);
|
self.ignores.push(compiled);
|
||||||
|
|
||||||
|
debug!("Adding ignore: {}", pattern);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,3 +102,15 @@ impl NotificationFilter {
|
|||||||
self.filters.len() > 0
|
self.filters.len() > 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<io::Error> for NotificationError {
|
||||||
|
fn from(err: io::Error) -> NotificationError {
|
||||||
|
NotificationError::Io(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<PatternError> for NotificationError {
|
||||||
|
fn from(err: PatternError) -> NotificationError {
|
||||||
|
NotificationError::BadPattern(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user