yves
/
rclone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filter: warn the user if he use --include and --exclude together fixes #1764 

Signed-off-by: Ernest Borowski <er.borowski@gmail.com>
s3-about
Ernest Borowski 2017-11-20 23:33:54 +01:00 committed by Nick Craig-Wood
parent 006b296c34
commit 934df67aef
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/content/filtering.md
View File

@ -167,6 +167,9 @@ type.
* `--filter`
* `--filter-from`
**Important** You should not use `--include*` together with `--exclude*`.
It may produce different results than you expected. In that case try to use: `--filter*`.
Note that all the options of the same type are processed together in
the order above, regardless of what order they were placed on the
command line.

8
fs/filter.go
View File

@ -156,6 +156,7 @@ func NewFilter() (f *Filter, err error) {
MaxSize: int64(maxSize),
}
addImplicitExclude := false
foundExcludeRule := false
if includeRule != nil {
for _, rule := range *includeRule {
@ -183,6 +184,7 @@ func NewFilter() (f *Filter, err error) {
if err != nil {
return nil, err
}
foundExcludeRule = true
}
}
if excludeFrom != nil {
@ -193,8 +195,14 @@ func NewFilter() (f *Filter, err error) {
if err != nil {
return nil, err
}
foundExcludeRule = true
}
}
if addImplicitExclude && foundExcludeRule {
Infof(nil, "Using --filter is recommended instead of both --include and --exclude as the order they are parsed in is indeterminate")
}
if filterRule != nil {
for _, rule := range *filterRule {
err = f.AddRule(rule)