diff options
| -rw-r--r-- | doIncoming.go | 17 | ||||
| -rw-r--r-- | doWalk.go | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/doIncoming.go b/doIncoming.go index 9f2202d..1859d86 100644 --- a/doIncoming.go +++ b/doIncoming.go @@ -14,20 +14,20 @@ import ( func doIncoming() (string, error) { os.Chdir(me.mirrorsDir) - for p := range me.pb.IterAll() { - log.Info(p.Package, p.Filename) - } - var counter int + var incount int + var newcount int err := filepath.Walk("pool", func(path string, info os.FileInfo, err error) error { if err != nil { return err } if !info.IsDir() && strings.HasSuffix(info.Name(), ".deb") { + counter += 1 found := me.pb.FindByFilename(path) if found == nil { log.Printf("new file %s\n", path) + newcount += 1 return nil } if strings.HasPrefix(path, "pool/main/incoming") { @@ -59,13 +59,15 @@ func doIncoming() (string, error) { } os.Rename(path, newfilename) log.Printf("%s moved incoming oldname %s newname: %s\n", found.Package, path, newfilename) - counter += 1 + incount += 1 if counter > 100 { me.sh.GoodExit("file moved") } return nil } - log.Info("already processed", path) + if argv.Verbose { + log.Info("already processed", path) + } // Get control info // cmd := exec.Command("dpkg-deb", "-I", path) @@ -79,5 +81,6 @@ func doIncoming() (string, error) { return nil }) - return "scanned incoming", err + s := log.Sprintf("scaned %d files. (%d) in incoming. (%d) new files", counter, incount, newcount) + return s, err } @@ -71,7 +71,7 @@ func doWalk() (string, error) { log.Printf("Searching for Sugarman WORKED: VAR='%-30s' VAL='%s'\n", varname, varvalue) } } else { - log.Printf("Searching for Sugarman FAILED: VAR='%-30s' VAL='%s' err=%v\n", varname, varvalue, err) + log.Printf("Searching for Sugarman (unknwon var): VAR='%-30s' VAL='%s' err=%v\n", varname, varvalue, err) } // todo: add to protomap } |