From a4b5d315b6aa0c4e5ecc91fcec1ee5df7b306416 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Wed, 14 Sep 2016 10:59:44 +0200
Subject: [PATCH 1/2] feat: add simple benchmark script

---
 .gitignore        |  2 ++
 .npmignore        |  2 ++
 package.json      |  3 ++-
 scripts/README.md | 10 ++++++++++
 scripts/bench.sh  | 16 ++++++++++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 scripts/README.md
 create mode 100755 scripts/bench.sh

diff --git a/.gitignore b/.gitignore
index 254988dc81..65f68d9a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ node_modules
 
 lib
 dist
+
+current.json
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index 59335fda64..6658451bbf 100644
--- a/.npmignore
+++ b/.npmignore
@@ -32,3 +32,5 @@ build
 node_modules
 
 test
+
+current.json
\ No newline at end of file
diff --git a/package.json b/package.json
index d07275c0d6..77c74a001f 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,8 @@
     "release": "gulp release",
     "release-minor": "gulp release --type minor",
     "release-major": "gulp release --type major",
-    "coverage-publish": "aegir-coverage publish"
+    "coverage-publish": "aegir-coverage publish",
+    "bench": "./scripts/bench.sh"
   },
   "pre-commit": [
     "lint",
diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 0000000000..fe9f0f6b13
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,10 @@
+# Scripts
+
+## `bench.sh`
+
+Run benchmarks using [ipfs-whatever](https://github.com/whyrusleeping/ipfs-whatever). This will create a file called `current.json` in the current folder with the results.
+
+### Requirements
+
+- go
+- Node.js
diff --git a/scripts/bench.sh b/scripts/bench.sh
new file mode 100755
index 0000000000..40ea9fdda0
--- /dev/null
+++ b/scripts/bench.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo "-- downloading benchmarks"
+go get github.com/whyrusleeping/ipfs-whatever
+
+echo "-- setting up ipfs"
+export IPFS_PATH=/tmp/bench-repo
+node src/cli/bin.js init
+node src/cli/bin.js daemon &
+sleep 5
+
+echo "-- running benchmarks"
+ipfs-whatever > current.json
+
+echo "-- cleaning up"
+rm -rf /tmp/bench-repo

From ce39c5af2a90f51cb05170c0a3c72d22f1b70b64 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Sun, 4 Dec 2016 09:59:27 +0100
Subject: [PATCH 2/2] fix failure

---
 src/http-api/resources/files.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/http-api/resources/files.js b/src/http-api/resources/files.js
index ec28ff90a5..17ca6113d6 100644
--- a/src/http-api/resources/files.js
+++ b/src/http-api/resources/files.js
@@ -23,9 +23,14 @@ exports.parseKey = (request, reply) => {
     }).code(400).takeover()
   }
 
+  let arg = request.query.arg
   try {
+    if (arg.indexOf('/ipfs/') === 0) {
+      arg = arg.replace('/ipfs/', '')
+    }
+
     return reply({
-      key: mh.fromB58String(request.query.arg)
+      key: mh.fromB58String(arg)
     })
   } catch (err) {
     log.error(err)