From bb061d615c21cf0cd794bbfac9409af106cc06ef Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 7 Feb 2018 13:37:27 +0100 Subject: [PATCH] Extract posinfo package to github.com/ipfs/go-ipfs-posinfo License: MIT Signed-off-by: Hector Sanjuan --- core/coreunix/add.go | 2 +- core/coreunix/add_test.go | 2 +- filestore/filestore.go | 2 +- filestore/filestore_test.go | 2 +- filestore/fsrefstore.go | 2 +- importer/helpers/helpers.go | 2 +- package.json | 6 ++++++ thirdparty/posinfo/posinfo.go | 18 ------------------ 8 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 thirdparty/posinfo/posinfo.go diff --git a/core/coreunix/add.go b/core/coreunix/add.go index a40747b88f3..2a19b82f4b7 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -21,8 +21,8 @@ import ( dag "github.com/ipfs/go-ipfs/merkledag" mfs "github.com/ipfs/go-ipfs/mfs" "github.com/ipfs/go-ipfs/pin" - posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo" unixfs "github.com/ipfs/go-ipfs/unixfs" + posinfo "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo" ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore" syncds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 5a12d3c15b8..812e5ac210e 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -18,7 +18,7 @@ import ( "github.com/ipfs/go-ipfs/repo" "github.com/ipfs/go-ipfs/repo/config" ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2" - pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" + pi "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" diff --git a/filestore/filestore.go b/filestore/filestore.go index 534d3f26dde..e7215dfccf7 100644 --- a/filestore/filestore.go +++ b/filestore/filestore.go @@ -11,7 +11,7 @@ import ( "context" "github.com/ipfs/go-ipfs/blocks/blockstore" - posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo" + posinfo "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo" "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query" diff --git a/filestore/filestore_test.go b/filestore/filestore_test.go index 8021114244a..883df0d7690 100644 --- a/filestore/filestore_test.go +++ b/filestore/filestore_test.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-ipfs/blocks/blockstore" dag "github.com/ipfs/go-ipfs/merkledag" - posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo" + posinfo "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo" ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" diff --git a/filestore/fsrefstore.go b/filestore/fsrefstore.go index 603a513805f..8e048fd69c0 100644 --- a/filestore/fsrefstore.go +++ b/filestore/fsrefstore.go @@ -10,7 +10,7 @@ import ( "github.com/ipfs/go-ipfs/blocks/blockstore" pb "github.com/ipfs/go-ipfs/filestore/pb" dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help" - posinfo "github.com/ipfs/go-ipfs/thirdparty/posinfo" + posinfo "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo" "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore" diff --git a/importer/helpers/helpers.go b/importer/helpers/helpers.go index 28630c822c6..a6d8ca0699d 100644 --- a/importer/helpers/helpers.go +++ b/importer/helpers/helpers.go @@ -6,8 +6,8 @@ import ( "os" dag "github.com/ipfs/go-ipfs/merkledag" - pi "github.com/ipfs/go-ipfs/thirdparty/posinfo" ft "github.com/ipfs/go-ipfs/unixfs" + pi "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format" diff --git a/package.json b/package.json index a788b98b989..fbdccda13d9 100644 --- a/package.json +++ b/package.json @@ -515,6 +515,12 @@ "hash": "QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY", "name": "go-base58-fast", "version": "0.1.1" + }, + { + "author": "hector", + "hash": "Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995", + "name": "go-ipfs-posinfo", + "version": "0.0.1" } ], "gxVersion": "0.10.0", diff --git a/thirdparty/posinfo/posinfo.go b/thirdparty/posinfo/posinfo.go deleted file mode 100644 index ff7fdcd364a..00000000000 --- a/thirdparty/posinfo/posinfo.go +++ /dev/null @@ -1,18 +0,0 @@ -package posinfo - -import ( - "os" - - ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format" -) - -type PosInfo struct { - Offset uint64 - FullPath string - Stat os.FileInfo // can be nil -} - -type FilestoreNode struct { - ipld.Node - PosInfo *PosInfo -}