make filter clean input filenames
This commit is contained in:
parent
75b6c1152a
commit
5467d7a549
|
@ -27,7 +27,20 @@ func (f *Filter) Glob() string { return f.glob }
|
||||||
func (f *Filter) Pattern() string { return f.pattern }
|
func (f *Filter) Pattern() string { return f.pattern }
|
||||||
func (f *Filter) FileNames() []string { return f.filenames }
|
func (f *Filter) FileNames() []string { return f.filenames }
|
||||||
|
|
||||||
|
func (f *Filter) AddFileName(filename string) {
|
||||||
|
filename = filepath.Clean(filename)
|
||||||
|
f.filenames = append(f.filenames, filename)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *Filter) AddFileNames(filenames ...string) {
|
||||||
|
for _, filename := range filenames {
|
||||||
|
f.AddFileName(filename)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (f *Filter) Match(filename string, modified time.Time) bool {
|
func (f *Filter) Match(filename string, modified time.Time) bool {
|
||||||
|
// this might be unnessary but w/e
|
||||||
|
filename = filepath.Clean(filename)
|
||||||
// on or before/after, not both
|
// on or before/after, not both
|
||||||
if !f.on.IsZero() {
|
if !f.on.IsZero() {
|
||||||
if !same_day(f.on, modified) {
|
if !same_day(f.on, modified) {
|
||||||
|
@ -129,9 +142,10 @@ func New(on, before, after, glob, pattern, unglob, unpattern string, names ...st
|
||||||
f := &Filter{
|
f := &Filter{
|
||||||
glob: glob,
|
glob: glob,
|
||||||
unglob: unglob,
|
unglob: unglob,
|
||||||
filenames: append([]string{}, names...),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
f.AddFileNames(names...)
|
||||||
|
|
||||||
if on != "" {
|
if on != "" {
|
||||||
o, err := anytime.Parse(on, now)
|
o, err := anytime.Parse(on, now)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in a new issue