coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-28 22:08:01 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

gateway: bring back dir-index-html assets

Browse Source 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
This commit is contained in:
Lars Gierth 2016-09-01 02:59:50 +02:00
parent 1eef1ef389
commit 02aa6b4714
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/assets.go
View File

@ -1,4 +1,4 @@
//go:generate go-bindata -pkg=assets init-doc ../vendor/dir-index-html-v1.0.0
//go:generate go-bindata -pkg=assets -prefix=$GOPATH/src/gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T init-doc $GOPATH/src/gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T/dir-index-html
//go:generate gofmt -w bindata.go
package assets
@ -6,12 +6,16 @@ package assets
import (
"bytes"
"fmt"
"os"
"path/filepath"
"github.com/ipfs/go-ipfs/core"
"github.com/ipfs/go-ipfs/core/coreunix"
uio "github.com/ipfs/go-ipfs/unixfs/io"
cid "gx/ipfs/QmXfiyr2RWEXpVDdaYnD2HNiBk6UBddsvEP4RPfXb6nGqY/go-cid"
// this import keeps gx from thinking the dep isn't used
_ "gx/ipfs/QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T/dir-index-html"
)
// initDocPaths lists the paths for the docs we want to seed during --init
@ -29,9 +33,10 @@ func SeedInitDocs(nd *core.IpfsNode) (*cid.Cid, error) {
return addAssetList(nd, initDocPaths)
}
var initDirPath = filepath.Join(os.Getenv("GOPATH"), "gx", "ipfs", "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T", "dir-index-html")
var initDirIndex = []string{
filepath.Join("..", "vendor", "dir-index-html-v1.0.0", "knownIcons.txt"),
filepath.Join("..", "vendor", "dir-index-html-v1.0.0", "dir-index.html"),
filepath.Join(initDirPath, "knownIcons.txt"),
filepath.Join(initDirPath, "dir-index.html"),
}
func SeedInitDirIndex(nd *core.IpfsNode) (*cid.Cid, error) {

5
core/corehttp/gateway_indexPage.go
View File

@ -25,8 +25,7 @@ type directoryItem struct {
var listingTemplate *template.Template
func init() {
assetPath := "../vendor/dir-index-html-v1.0.0/"
knownIconsBytes, err := assets.Asset(assetPath + "knownIcons.txt")
knownIconsBytes, err := assets.Asset("dir-index-html/knownIcons.txt")
if err != nil {
panic(err)
}
@ -53,7 +52,7 @@ func init() {
}
// Directory listing template
dirIndexBytes, err := assets.Asset(assetPath + "dir-index.html")
dirIndexBytes, err := assets.Asset("dir-index-html/dir-index.html")
if err != nil {
panic(err)
}

7
package.json
View File

@ -281,6 +281,13 @@
"hash": "QmRcAVqrbY5wryx7hfNLtiUZbCcstzaJL7YJFBboitcqWF",
"name": "go-ipld-cbor",
"version": "0.3.0"
},
{
"author": "lgierth",
"hash": "QmQfeKxQtBN721pekQh6Jq24adFUjnU65YdY3GNczfuG2T",
"name": "dir-index-html",
"version": "1.0.3",
"comment": "This one needs code updates in assets/assets.go too."
}
],
"gxVersion": "0.4.0",