forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed manifest relative path

Browse source
This commit is contained in:
zsfelfoldi 2015-05-28 14:59:23 +02:00
parent 567149c511
commit ff2081f5fd
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bzz/api.go
View file

@ -113,9 +113,20 @@ func (self *Api) Download(bzzpath, localpath string) (string, error) {
func (self *Api) Upload(localpath string) (string, error) { func (self *Api) Upload(localpath string) (string, error) {
var files []string var files []string
localpath = common.ExpandHomePath(localpath) localpath = common.ExpandHomePath(localpath)
start := len(localpath)
if (start > 0) && (localpath[start-1] != os.PathSeparator) {
start++
}
dpaLogger.Debugf("uploading '%s'", localpath) dpaLogger.Debugf("uploading '%s'", localpath)
err := filepath.Walk(localpath, func(path string, info os.FileInfo, err error) error { err := filepath.Walk(localpath, func(path string, info os.FileInfo, err error) error {
if err == nil { if (err == nil) && !info.IsDir() {
//fmt.Printf("lp %s path %s\n", localpath, path)
if len(path) <= start {
return fmt.Errorf("Path is too short")
}
if path[:len(localpath)] != localpath {
return fmt.Errorf("Path prefix does not match localpath")
}
files = append(files, path) files = append(files, path)
} }
return err return err
@ -147,9 +158,6 @@ func (self *Api) Upload(localpath string) (string, error) {
var buffer bytes.Buffer var buffer bytes.Buffer
buffer.WriteString(`{"entries":[`) buffer.WriteString(`{"entries":[`)
sc := "," sc := ","
var pathPrefix *regexp.Regexp
var relativePath string
pathPrefix, err = regexp.Compile("^" + localpath + fmt.Sprintf("%s", os.PathSeparator))
if err != nil { if err != nil {
return "", err return "", err
} }
@ -161,8 +169,7 @@ func (self *Api) Upload(localpath string) (string, error) {
if i == cnt-1 { if i == cnt-1 {
sc = "]}" sc = "]}"
} }
relativePath = pathPrefix.ReplaceAllString(path, "") buffer.WriteString(fmt.Sprintf(`{"hash":"%064x","path":"%s","contentType":"text/plain"}%s`, hashes[i], path[start:], sc))
buffer.WriteString(fmt.Sprintf(`{"hash":"%064x","path":"%s","contentType":"text/plain"}%s`, hashes[i], relativePath, sc))
} }
manifest := buffer.Bytes() manifest := buffer.Bytes()