improve addblock

util/addblock/addblock.go

@@ -6,13 +6,13 @@ package main
 
 import (
 	"encoding/binary"
-	"flag"
 	"fmt"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	_ "github.com/conformal/btcdb/sqlite3"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
+	"github.com/conformal/go-flags"
 	"github.com/conformal/seelog"
 	"io"
 	"os"
@@ -23,6 +23,14 @@ import (
 
 type ShaHash btcwire.ShaHash
 
+type config struct {
+	DataDir  string `short:"b" long:"datadir" description:"Directory to store data"`
+	DbType   string `long:"dbtype" description:"Database backend"`
+	TestNet3 bool   `long:"testnet" description:"Use the test network"`
+	Progress bool   `short:"p" description:"show progress"`
+	InFile   string `short:"i" long:"infile" description:"File containing the block(s)" required:"true"`
+}
+
 var log seelog.LoggerInterface
 
 const (
@@ -42,25 +50,21 @@ type blkQueue struct {
 }
 
 func main() {
-	var err error
+	cfg := config{
-	var dbType string
+		DbType:  "leveldb",
-	var datadir string
+		DataDir: filepath.Join(btcdHomeDir(), "data"),
-	var infile string
+	}
-	var progress int
+	parser := flags.NewParser(&cfg, flags.Default)
-	flag.StringVar(&dbType, "dbtype", "", "Database backend to use for the Block Chain")
+	_, err := parser.Parse()
-	flag.StringVar(&datadir, "datadir", "", "Directory to store data")
+	if err != nil {
-	flag.StringVar(&infile, "i", "", "infile")
+		if e, ok := err.(*flags.Error); !ok || e.Type != flags.ErrHelp {
-	flag.IntVar(&progress, "p", 0, "show progress")
+			parser.WriteHelp(os.Stderr)
-
+		}
-	flag.Parse()
-
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	if len (infile) == 0 {
-		fmt.Printf("Must specify inputfile")
 		return
 	}
 
+	runtime.GOMAXPROCS(runtime.NumCPU())
+
 	log, err = seelog.LoggerFromWriterWithMinLevel(os.Stdout,
 		seelog.InfoLvl)
 	if err != nil {
@@ -70,30 +74,29 @@ func main() {
 	defer log.Flush()
 	btcdb.UseLogger(log)
 
-	if len(dbType) == 0 {
+	var testnet string
-		dbType = "sqlite"
+	if cfg.TestNet3 {
+		testnet = "testnet"
+	} else {
+		testnet = "mainnet"
 	}
 
-	if len(datadir) == 0 {
+	cfg.DataDir = filepath.Join(cfg.DataDir, testnet)
-		datadir = filepath.Join(btcdHomeDir(), "data")
-	}
-	datadir = filepath.Join(datadir, "mainnet")
 
-	err = os.MkdirAll(datadir, 0700)
+	err = os.MkdirAll(cfg.DataDir, 0700)
 	if err != nil {
-		fmt.Printf("unable to create db repo area %v, %v", datadir, err)
+		fmt.Printf("unable to create db repo area %v, %v", cfg.DataDir, err)
 	}
 
-
 	blockDbNamePrefix := "blocks"
-        dbName := blockDbNamePrefix + "_" + dbType
+	dbName := blockDbNamePrefix + "_" + cfg.DbType
-	if dbType == "sqlite" {
+	if cfg.DbType == "sqlite" {
 		dbName = dbName + ".db"
 	}
-	dbPath := filepath.Join(datadir, dbName)
+	dbPath := filepath.Join(cfg.DataDir, dbName)
 
 	log.Infof("loading db")
-	db, err := btcdb.CreateDB(dbType, dbPath)
+	db, err := btcdb.CreateDB(cfg.DbType, dbPath)
 	if err != nil {
 		log.Warnf("db open failed: %v", err)
 		return
@@ -101,16 +104,15 @@ func main() {
 	defer db.Close()
 	log.Infof("db created")
 
-
 	var fi io.ReadCloser
 
-	fi, err = os.Open(infile)
+	fi, err = os.Open(cfg.InFile)
 	if err != nil {
-		log.Warnf("failed to open file %v, err %v", infile, err)
+		log.Warnf("failed to open file %v, err %v", cfg.InFile, err)
 	}
 	defer func() {
 		if err := fi.Close(); err != nil {
-			log.Warn("failed to close file %v %v", infile, err)
+			log.Warn("failed to close file %v %v", cfg.InFile, err)
 		}
 	}()
 
@@ -138,7 +140,7 @@ func main() {
 					blkP.complete <- true
 					db.InsertBlock(blkP.blk)
 
-					if progress != 0 && eheight%int64(progress) == 0 {
+					if cfg.Progress && eheight%int64(1) == 0 {
 						log.Infof("Processing block %v", eheight)
 					}
 					eheight++