extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-06-25 22:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

new option: --exclude-if-present

Browse Source
This commit is contained in:
Iakov Davydov 2017-11-16 15:37:00 +01:00 committed by Nick Craig-Wood
parent cef2e3bf83
commit 37aaa19f3a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/filter.go
View File

@ -23,6 +23,7 @@ var (
filterFrom = StringArrayP("filter-from", "", nil, "Read filtering patterns from a file") filterFrom = StringArrayP("filter-from", "", nil, "Read filtering patterns from a file")
excludeRule = StringArrayP("exclude", "", nil, "Exclude files matching pattern") excludeRule = StringArrayP("exclude", "", nil, "Exclude files matching pattern")
excludeFrom = StringArrayP("exclude-from", "", nil, "Read exclude patterns from file") excludeFrom = StringArrayP("exclude-from", "", nil, "Read exclude patterns from file")
excludeFile = StringP("exclude-if-present", "", "", "Exclude directories if filename is present")
includeRule = StringArrayP("include", "", nil, "Include files matching pattern") includeRule = StringArrayP("include", "", nil, "Include files matching pattern")
includeFrom = StringArrayP("include-from", "", nil, "Read include patterns from file") includeFrom = StringArrayP("include-from", "", nil, "Read include patterns from file")
filesFrom = StringArrayP("files-from", "", nil, "Read list of source-file names from file") filesFrom = StringArrayP("files-from", "", nil, "Read list of source-file names from file")
@ -105,6 +106,7 @@ type Filter struct {
ModTimeTo time.Time ModTimeTo time.Time
fileRules rules fileRules rules
dirRules rules dirRules rules
ExcludeFile string
files FilesMap // files if filesFrom files FilesMap // files if filesFrom
dirs FilesMap // dirs from filesFrom dirs FilesMap // dirs from filesFrom
} }
@ -221,6 +223,7 @@ func NewFilter() (f *Filter, err error) {
} }
} }
} }
f.ExcludeFile = *excludeFile
if addImplicitExclude { if addImplicitExclude {
err = f.Add(false, "/**") err = f.Add(false, "/**")
if err != nil { if err != nil {
@ -372,7 +375,8 @@ func (f *Filter) InActive() bool {
f.MinSize < 0 && f.MinSize < 0 &&
f.MaxSize < 0 && f.MaxSize < 0 &&
f.fileRules.len() == 0 && f.fileRules.len() == 0 &&
f.dirRules.len() == 0) f.dirRules.len() == 0 &&
len(f.ExcludeFile) == 0)
} }
// includeRemote returns whether this remote passes the filter rules. // includeRemote returns whether this remote passes the filter rules.