Search ability

[glocate.git] / main.go

diff --git a/main.go b/main.go
index c8615fdd85d4f2b76db67f755348feb0a9baf32c17bfdab0b72473fdb634dd58..affdffc8d95d0c7179d7cc9359c524cb8f963669053a888a9da1f6d8b3e237e5 100644 (file)
--- a/main.go
+++ b/main.go
@@ -4,6 +4,7 @@ import (
        "flag"
        "log"
        "os"
+       "path"
        "strings"
        "syscall"
 )
@@ -32,11 +33,11 @@ func dbCommit(dbPath string, tmp *os.File) {
 func main() {
        dbPath := flag.String("db", "glocate.db", "Path to database")
        doIndex := flag.Bool("index", false, "Perform indexing")
-       doUpdate := flag.Bool("update", false, "Feed zfs-diff and update the database")
-       strip := flag.String("strip", "", "Strip prefix from zfs-diff's paths")
+       doUpdate := flag.String("update", "", "Update database")
        showMachine := flag.Bool("machine", false, "Show machine friendly")
        showTree := flag.Bool("tree", false, "Show human-friendly tree")
        dryRun := flag.Bool("n", false, "Dry run, do not overwrite database")
+       rootPath := flag.String("root", "", "Search only that part of tree")
        flag.Parse()
        log.SetFlags(log.Ldate | log.Ltime | log.Lmicroseconds | log.Lshortfile)
 
@@ -49,8 +50,8 @@ func main() {
                return
        }
 
-       if *doUpdate {
-               tmp := updateWithDiff(*dbPath, *strip)
+       if *doUpdate != "" {
+               tmp := updateWithDiff(*dbPath, *doUpdate)
                tmp.Close()
                if !*dryRun {
                        dbCommit(*dbPath, tmp)
@@ -79,15 +80,42 @@ func main() {
        }()
 
        var root []string
+       if *rootPath != "" {
+               root = strings.Split("./"+*rootPath, "/")
+       }
+
+       var pat string
        if len(flag.Args()) > 0 {
-               root = strings.Split("./"+flag.Arg(0), "/")
+               pat = "*" + flag.Arg(0) + "*"
        }
 
        rootMet := false
+       var matched bool
+       var namePrev []string
+       var i int
        for ent := range entsReader {
                if hasPrefix(ent.name, root) {
-                       entsPrinter <- ent
                        rootMet = true
+                       if pat == "" {
+                               entsPrinter <- ent
+                               continue
+                       }
+                       for i = 0; i < len(ent.name); i++ {
+                               if i == len(namePrev) || ent.name[i] != namePrev[i] {
+                                       break
+                               }
+                       }
+                       for ; i < len(ent.name); i++ {
+                               matched, err = path.Match(pat,
+                                       strings.ToLower(strings.TrimSuffix(ent.name[i], "/")))
+                               if err != nil {
+                                       log.Fatalln(err)
+                               }
+                       }
+                       if matched {
+                               entsPrinter <- ent
+                       }
+                       namePrev = ent.name
                } else if rootMet {
                        break
                }