clean up command verbs a bit

Author: scott-cotton

cmd/dupenron/main.go

@@ -120,7 +120,7 @@ func indexEnron(index *dupi.Indexer, fname string) error {
 		doc := &dupi.Doc{
 			Path:  fname, //"/" + rcd[0],
 			Dat:   msg,
-			Start: uint32(offset)}
+			Start: offset + uint32(ibody) + 2 + uint32(len(rcd[0]))}
 		doc.End = offset + uint32(len(doc.Dat))
 		offset = doc.End
 		index.Add(doc)

cmd/dupi/dupi.go

@@ -29,8 +29,8 @@ import (
 // TBD: write and use newIndex(), newExtract()
 // instead of init() ugliness
 var scMap = map[string]SubCmd{
-	"index":   index,
-	"extract": extract,
+	"index":   newIndexCmd(),
+	"extract": newExtractCmd(),
 	"blot":    newBlotCmd(),
 	"unblot":  newUnblotCmd()}
 
@@ -69,15 +69,16 @@ func splitArgs(args []string) ([]string, []string) {
 }
 
 func usage(w io.Writer) {
-	fmt.Fprintf(w, "usage: dupi [global opts] <cmd> <args>\n")
-	fmt.Fprintf(w, "commands are:\n")
+	fmt.Fprintf(w, "usage: dupi [global opts] <verb> <args>\n")
+	fmt.Fprintf(w, "verbs are:\n")
 	for k, v := range scMap {
 		fmt.Fprintf(w, "\t%-10s %30s\n", k, v.Usage())
 	}
 	fmt.Fprintf(w, "\nglobal options:\n")
 	gFlags.VisitAll(func(f *flag.Flag) {
 		fmt.Fprintf(w, "\t-%-16s default=%-16q %s\n", f.Name, f.DefValue, f.Usage)
 	})
+	fmt.Fprintf(w, "\nTo get help on a verb, try dupi <verb> -h.\n")
 }
 
 func usageFatal(w io.Writer) {

cmd/dupi/extract.go

@@ -30,13 +30,14 @@ type extractCmd struct {
 	json  *bool
 }
 
-var extract = &extractCmd{subCmd: subCmd{
-	name:  "extract",
-	usage: "extract [args]",
-	flags: flag.NewFlagSet("extract", flag.ExitOnError)}}
+func newExtractCmd() *extractCmd {
+	var extract = &extractCmd{subCmd: subCmd{
+		name:  "extract",
+		usage: "extract [args]",
+		flags: flag.NewFlagSet("extract", flag.ExitOnError)}}
 
-func init() {
 	extract.json = extract.flags.Bool("json", false, "output json")
+	return extract
 }
 
 func (x *extractCmd) Usage() string {

cmd/dupi/index.go

@@ -36,21 +36,18 @@ type indexCmd struct {
 	indexer *dupi.Indexer
 }
 
-var index = &indexCmd{
-	subCmd: subCmd{
-		name:  "index",
-		flags: flag.NewFlagSet("index", flag.ExitOnError)}}
-
-func init() {
-	index.shards = index.flags.Int("n", 4, "shards")
+func newIndexCmd() *indexCmd {
+	var index = &indexCmd{
+		subCmd: subCmd{
+			name:  "index",
+			flags: flag.NewFlagSet("index", flag.ExitOnError)}}
 	index.seqlen = index.flags.Int("t", 10, "similarity based seq len")
 	index.add = index.flags.Bool("a", false, "add to a given existing index")
 	index.verbose = index.flags.Bool("v", false, "verbose")
 	index.nshat = index.flags.Int("s", 4, "num shatterers")
+	return index
 }
 
-var _ SubCmd = index
-
 func (x *indexCmd) Usage() string {
 	return "paths"
 }

shatter.go

@@ -137,7 +137,6 @@ func (s *shatter) send(did uint32) {
 
 func (s *shatter) blot(docid, b uint32) {
 	n := uint32(len(s.d))
-
 	i := b % n
 	s.d[i] = append(s.d[i], post.Make(docid, b/n))
 }