add tar commands

6 files changed, 115 insertions, 2 deletions

diff --git a/ipfs-api/Cargo.toml b/ipfs-api/Cargo.toml
index 53fc690..4670e40 100644
--- a/ipfs-api/Cargo.toml
+++ b/ipfs-api/Cargo.toml
@@ -19,3 +19,4 @@ tokio-io                  = "0.1"
 
 [dev-dependencies]
 tokio-timer               = "0.1"
+tar                       = "0.4"
diff --git a/ipfs-api/examples/add_tar.rs b/ipfs-api/examples/add_tar.rs
new file mode 100644
index 0000000..a6328af
--- /dev/null
+++ b/ipfs-api/examples/add_tar.rs
@@ -0,0 +1,52 @@
+// Copyright 2017 rust-ipfs-api Developers
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+//
+
+extern crate ipfs_api;
+extern crate tar;
+extern crate tokio_core;
+
+use ipfs_api::IpfsClient;
+use std::io::Cursor;
+use tar::Builder;
+use tokio_core::reactor::Core;
+
+// Creates an Ipfs client, and adds this source file to Ipfs.
+//
+fn main() {
+    println!("note: this must be run in the root of the project repository");
+    println!("connecting to localhost:5001...");
+
+    let mut core = Core::new().expect("expected event loop");
+    let client = IpfsClient::default(&core.handle());
+
+    let mut buf = Vec::new();
+
+    // Create a in-memory tar file with this source file as its contents.
+    //
+    {
+        let mut builder = Builder::new(&mut buf);
+
+        builder.append_path(file!()).expect(
+            "failed to create tar file",
+        );
+        builder.finish().expect("failed to create tar file");
+    }
+
+    let cursor = Cursor::new(buf);
+    let req = client.tar_add(cursor);
+    let add = core.run(req).expect("expected a valid response");
+
+    println!("added tar file: {:?}", add);
+    println!("");
+
+    let req = client.tar_cat(&add.hash[..]);
+    let cat = core.run(req).expect("expected a valid response");
+
+    println!("{}", String::from_utf8_lossy(&cat[..]));
+    println!("");
+}
diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs
index c5dfa82..157caff 100644
--- a/ipfs-api/src/client.rs
+++ b/ipfs-api/src/client.rs
@@ -895,6 +895,30 @@ impl IpfsClient {
         self.request(&request::SwarmPeers, None)
     }
 
+    /// Add a tar file to Ipfs.
+    ///
+    /// Note: `data` should already be a tar file. If it isn't the Api will return
+    /// an error.
+    ///
+    #[inline]
+    pub fn tar_add<R>(&self, data: R) -> AsyncResponse<response::TarAddResponse>
+    where
+        R: 'static + Read + Send,
+    {
+        let mut form = multipart::Form::default();
+
+        form.add_reader("file", data);
+
+        self.request(&request::TarAdd, Some(form))
+    }
+
+    /// Export a tar file from Ipfs.
+    ///
+    #[inline]
+    pub fn tar_cat(&self, path: &str) -> AsyncResponse<response::TarCatResponse> {
+        self.request_bytes(&request::TarCat { path }, None)
+    }
+
     /// Returns information about the Ipfs server version.
     ///
     #[inline]
diff --git a/ipfs-api/src/request/mod.rs b/ipfs-api/src/request/mod.rs
index 81f1dc1..cbee846 100644
--- a/ipfs-api/src/request/mod.rs
+++ b/ipfs-api/src/request/mod.rs
@@ -32,6 +32,7 @@ pub use self::pubsub::*;
 pub use self::refs::*;
 pub use self::stats::*;
 pub use self::swarm::*;
+pub use self::tar::*;
 pub use self::version::*;
 
 
@@ -95,6 +96,7 @@ mod pubsub;
 mod refs;
 mod stats;
 mod swarm;
+mod tar;
 mod version;
 
 
diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs
new file mode 100644
index 0000000..b97080b
--- /dev/null
+++ b/ipfs-api/src/request/tar.rs
@@ -0,0 +1,35 @@
+// Copyright 2017 rust-ipfs-api Developers
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+//
+
+use request::ApiRequest;
+
+
+pub struct TarAdd;
+
+impl_skip_serialize!(TarAdd);
+
+impl ApiRequest for TarAdd {
+    #[inline]
+    fn path() -> &'static str {
+        "/tar/add"
+    }
+}
+
+
+#[derive(Serialize)]
+pub struct TarCat<'a> {
+    #[serde(rename = "arg")]
+    pub path: &'a str,
+}
+
+impl<'a> ApiRequest for TarCat<'a> {
+    #[inline]
+    fn path() -> &'static str {
+        "/tar/cat"
+    }
+}
diff --git a/ipfs-api/src/response/tar.rs b/ipfs-api/src/response/tar.rs
index fa3ddcb..f19cfb8 100644
--- a/ipfs-api/src/response/tar.rs
+++ b/ipfs-api/src/response/tar.rs
@@ -6,12 +6,11 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-#[derive(Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct TarAddResponse {
     pub name: String,
     pub hash: String,
-    pub size: String,
 }