From 6c64aec13738b9412e0899791f26fc4345f18908 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Mon, 23 May 2016 18:42:59 +0200
Subject: [PATCH] Export formats and to file.

---
 parity/cli.rs  |  3 +++
 parity/main.rs | 27 ++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/parity/cli.rs b/parity/cli.rs
index d5b650d2e..e0edec29f 100644
--- a/parity/cli.rs
+++ b/parity/cli.rs
@@ -148,6 +148,8 @@ Export Options:
                            hash [default: 0].
   --to BLOCK               Export to (including) block NUMBER, which may be an
                            index, hash or 'latest' [default: latest].
+  --format FORMAT          Export in given format. FORMAT must be one of 'hex'
+                           and 'binary' [default: hex].
 
 Virtual Machine Options:
   --jitvm                  Enable the JIT VM.
@@ -241,6 +243,7 @@ pub struct Args {
 	pub flag_version: bool,
 	pub flag_from: String,
 	pub flag_to: String,
+	pub flag_format: String,
 	pub flag_jitvm: bool,
 	// legacy...
 	pub flag_geth: bool,
diff --git a/parity/main.rs b/parity/main.rs
index 7035bddbd..52f6a23b9 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -65,6 +65,7 @@ mod configuration;
 
 use ctrlc::CtrlC;
 use util::*;
+use std::fs::File;
 use util::panics::{MayPanic, ForwardPanic, PanicHandler};
 use ethcore::client::{BlockID, BlockChainClient};
 use ethcore::service::ClientService;
@@ -222,6 +223,11 @@ fn flush_stdout() {
 	::std::io::stdout().flush().expect("stdout is flushable; qed");
 }
 
+enum DataFormat {
+	Hex,
+	Binary,
+}
+
 fn execute_export(conf: Configuration) {
 	println!("Exporting to {:?} from {}, to {}", conf.args.arg_file, conf.args.flag_from, conf.args.flag_to);
 
@@ -265,14 +271,29 @@ fn execute_export(conf: Configuration) {
 				die!("Unknown block hash passed to --to parameter: {:?}", s);
 			})
 		} else {
-			die!("Invalid --to parameter given: {:?}", s);
+			die!("Invalid block ID parameter given: {:?}", s);
 		}
 	};
 	let from = parse_block_id(&conf.args.flag_from);
 	let to = parse_block_id(&conf.args.flag_to);
+	let format = match conf.args.flag_format.deref() {
+		"binary" | "bin" => DataFormat::Binary,
+		"hex" => DataFormat::Hex,
+		x => die!("Invalid --format parameter given: {:?}", x),
+	};
 
-	for i in from..to {
-		println!("{}", client.deref().block(BlockID::Number(i)).unwrap().pretty());
+	let mut out: Box<Write> = if let Some(f) = conf.args.arg_file {
+		Box::new(File::create(&f).unwrap_or_else(|_| die!("Cannot write to file given: {}", f)))
+	} else {
+		Box::new(::std::io::stdout())
+	};
+
+	for i in from..(to + 1) {
+		let b = client.deref().block(BlockID::Number(i)).unwrap();
+		match format {
+			DataFormat::Binary => { out.write(&b).expect("Couldn't write to stream."); }
+			DataFormat::Hex => { out.write_fmt(format_args!("{}", b.pretty())).expect("Couldn't write to stream."); }
+		}
 	}
 }