1 files changed, 28 insertions, 21 deletions

diff --git a/weed/shell/command_remote_uncache.go b/weed/shell/command_remote_uncache.go
index 0e5152f78..0d4e0cf7d 100644
--- a/weed/shell/command_remote_uncache.go
+++ b/weed/shell/command_remote_uncache.go
@@ -33,6 +33,8 @@ func (c *commandRemoteUncache) Help() string {
 	remote.uncache -dir=/xxx/some/sub/dir
 	remote.uncache -dir=/xxx/some/sub/dir -include=*.pdf
 	remote.uncache -dir=/xxx/some/sub/dir -exclude=*.txt
+	remote.uncache -minSize=1024000    # uncache files larger than 100K
+	remote.uncache -minAge=3600        # uncache files older than 1 hour
 
 `
 }
@@ -52,27 +54,30 @@ func (c *commandRemoteUncache) Do(args []string, commandEnv *CommandEnv, writer
 	if listErr != nil {
 		return listErr
 	}
-	if *dir == "" {
-		jsonPrintln(writer, mappings)
-		fmt.Fprintln(writer, "need to specify '-dir' option")
-		return nil
-	}
+	if *dir != "" {
+		var localMountedDir string
+		for k := range mappings.Mappings {
+			if strings.HasPrefix(*dir, k) {
+				localMountedDir = k
+			}
+		}
+		if localMountedDir == "" {
+			jsonPrintln(writer, mappings)
+			fmt.Fprintf(writer, "%s is not mounted\n", *dir)
+			return nil
+		}
 
-	var localMountedDir string
-	for k := range mappings.Mappings {
-		if strings.HasPrefix(*dir, k) {
-			localMountedDir = k
+		// pull content from remote
+		if err = c.uncacheContentData(commandEnv, writer, util.FullPath(*dir), fileFiler); err != nil {
+			return fmt.Errorf("uncache content data: %v", err)
 		}
-	}
-	if localMountedDir == "" {
-		jsonPrintln(writer, mappings)
-		fmt.Fprintf(writer, "%s is not mounted\n", *dir)
 		return nil
 	}
 
-	// pull content from remote
-	if err = c.uncacheContentData(commandEnv, writer, util.FullPath(*dir), fileFiler); err != nil {
-		return fmt.Errorf("cache content data: %v", err)
+	for key, _ := range mappings.Mappings {
+		if err := c.uncacheContentData(commandEnv, writer, util.FullPath(key), fileFiler); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -81,11 +86,12 @@ func (c *commandRemoteUncache) Do(args []string, commandEnv *CommandEnv, writer
 func (c *commandRemoteUncache) uncacheContentData(commandEnv *CommandEnv, writer io.Writer, dirToCache util.FullPath, fileFilter *FileFilter) error {
 
 	return recursivelyTraverseDirectory(commandEnv, dirToCache, func(dir util.FullPath, entry *filer_pb.Entry) bool {
+
 		if !mayHaveCachedToLocal(entry) {
 			return true // true means recursive traversal should continue
 		}
 
-		if fileFilter.matches(entry) {
+		if !fileFilter.matches(entry) {
 			return true
 		}
 
@@ -96,7 +102,7 @@ func (c *commandRemoteUncache) uncacheContentData(commandEnv *CommandEnv, writer
 		entry.RemoteEntry.LastLocalSyncTsNs = 0
 		entry.Chunks = nil
 
-		println(dir, entry.Name)
+		fmt.Fprintf(writer, "Uncache %+v ... ", dir.Child(entry.Name))
 
 		err := commandEnv.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {
 			_, updateErr := client.UpdateEntry(context.Background(), &filer_pb.UpdateEntryRequest{
@@ -109,6 +115,7 @@ func (c *commandRemoteUncache) uncacheContentData(commandEnv *CommandEnv, writer
 			fmt.Fprintf(writer, "uncache %+v: %v\n", dir.Child(entry.Name), err)
 			return false
 		}
+		fmt.Fprintf(writer, "Done\n")
 
 		return true
 	})
@@ -137,12 +144,12 @@ func newFileFilter(remoteMountCommand *flag.FlagSet) (ff *FileFilter) {
 func (ff *FileFilter) matches(entry *filer_pb.Entry) bool {
 	if *ff.include != "" {
 		if ok, _ := filepath.Match(*ff.include, entry.Name); !ok {
-			return true
+			return false
 		}
 	}
 	if *ff.exclude != "" {
 		if ok, _ := filepath.Match(*ff.exclude, entry.Name); ok {
-			return true
+			return false
 		}
 	}
 	if *ff.minSize != -1 {
@@ -165,5 +172,5 @@ func (ff *FileFilter) matches(entry *filer_pb.Entry) bool {
 			return false
 		}
 	}
-	return false
+	return true
 }