From d65b64c8846636d3e58c1857eaff149d2f82a283 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sat, 6 Jun 2015 00:02:32 -0400 Subject: [PATCH] Allow export command to take first and last args --- cmd/geth/chaincmd.go | 22 +++++++++++++++++++++- cmd/utils/cmd.go | 15 +++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 947532f40..509356a90 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -26,6 +26,12 @@ var ( Action: exportChain, Name: "export", Usage: `export blockchain into file`, + Description: ` +Requires a first argument of the file to write to. +Optional second and third arguments control the first and +last block to write. In this mode, the file will be appended +if already existing. + `, } upgradedbCommand = cli.Command{ Action: upgradeDB, @@ -68,7 +74,21 @@ func exportChain(ctx *cli.Context) { } chain, _, _, _ := utils.MakeChain(ctx) start := time.Now() - if err := utils.ExportChain(chain, ctx.Args().First()); err != nil { + + var err error + if len(ctx.Args()) < 3 { + err = utils.ExportChain(chain, ctx.Args().First()) + } else { + // This can be improved to allow for numbers larger than 9223372036854775807 + first, ferr := strconv.ParseInt(ctx.Args().Get(1), 10, 64) + last, lerr := strconv.ParseInt(ctx.Args().Get(2), 10, 64) + if ferr != nil || lerr != nil { + utils.Fatalf("Export error in parsing parameters\n") + } + err = utils.ExportAppendChain(chain, ctx.Args().First(), uint64(first), uint64(last)) + } + + if err != nil { utils.Fatalf("Export error: %v\n", err) } fmt.Printf("Export done in %v", time.Since(start)) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index e5413973d..f7520a8e4 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -268,3 +268,18 @@ func ExportChain(chainmgr *core.ChainManager, fn string) error { glog.Infoln("Exported blockchain to", fn) return nil } + +func ExportAppendChain(chainmgr *core.ChainManager, fn string, first uint64, last uint64) error { + glog.Infoln("Exporting blockchain to", fn) + // TODO verify mode perms + fh, err := os.OpenFile(fn, os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModePerm) + if err != nil { + return err + } + defer fh.Close() + if err := chainmgr.ExportN(fh, first, last); err != nil { + return err + } + glog.Infoln("Exported blockchain to", fn) + return nil +}