From 80aace0fa25dcc9d89aff8f3b767852c2935685f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 4 Jan 2019 02:35:40 +0100
Subject: [PATCH] Fix offline gateway directory logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@360e8bbf0b798f4c52541d9116e3b2d240c71a9a

This commit was moved from ipfs/boxo@aecc5aa1ac7d14502faf74530e73fb801aed4158
---
 core/coreiface/path.go       |  9 +++++++--
 core/coreiface/tests/path.go | 12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 01dda97d5..96f30852d 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,9 +1,8 @@
 package iface
 
 import (
+	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	ipfspath "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
-
-	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 )
 
 //TODO: merge with ipfspath so we don't depend on it
@@ -106,6 +105,12 @@ type resolvedPath struct {
 	remainder string
 }
 
+// Join appends provided segments to the base path
+func Join(base Path, a ...string) Path {
+	s := ipfspath.Join(append([]string{base.String()}, a...))
+	return &path{path: ipfspath.FromString(s)}
+}
+
 // IpfsPath creates new /ipfs path from the provided CID
 func IpfsPath(c cid.Cid) ResolvedPath {
 	return &resolvedPath{
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index e74053c04..7057d6286 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -15,6 +15,7 @@ func (tp *provider) TestPath(t *testing.T) {
 	t.Run("TestEmptyPathRemainder", tp.TestEmptyPathRemainder)
 	t.Run("TestInvalidPathRemainder", tp.TestInvalidPathRemainder)
 	t.Run("TestPathRoot", tp.TestPathRoot)
+	t.Run("TestPathJoin", tp.TestPathJoin)
 }
 
 func (tp *provider) TestMutablePath(t *testing.T) {
@@ -165,3 +166,14 @@ func (tp *provider) TestPathRoot(t *testing.T) {
 		t.Error("unexpected path cid")
 	}
 }
+
+func (tp *provider) TestPathJoin(t *testing.T) {
+	p1, err := coreiface.ParsePath("/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz")
+	if err != nil {
+		t.Error(err)
+	}
+
+	if coreiface.Join(p1, "foo").String() != "/ipfs/QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6/bar/baz/foo" {
+		t.Error("unexpected path")
+	}
+}