Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/publisher: use relative paths in filenames within zip 

Change-Id: Ib491b8e664e2f623d61dfd8afb81242042c0cd5c
This commit is contained in:
Attila Tajti 2017-04-24 11:53:26 +02:00
parent 8a545a1ed2
commit f504d10ee4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/publisher/zip.go
View File

@ -107,7 +107,7 @@ func (zh *zipHandler) blobList(dirPath string, dirBlob blob.Ref) ([]*blobFile, e
var list []*blobFile var list []*blobFile
if isDir { if isDir {
dirRoot := dirBlobPath[1] dirRoot := dirBlobPath[1]
children, err := zh.blobsFromDir("/", dirRoot) children, err := zh.blobsFromDir("", dirRoot)
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not get list of blobs from %v: %v", dirRoot, err) return nil, fmt.Errorf("Could not get list of blobs from %v: %v", dirRoot, err)
} }
@ -234,7 +234,7 @@ func (zh *zipHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
http.Error(rw, "Invalid method", http.StatusMethodNotAllowed) http.Error(rw, "Invalid method", http.StatusMethodNotAllowed)
return return
} }
bf, err := zh.blobList("/", zh.root) bf, err := zh.blobList("", zh.root)
if err != nil { if err != nil {
log.Printf("Could not serve zip for %v: %v", zh.root, err) log.Printf("Could not serve zip for %v: %v", zh.root, err)
http.Error(rw, "Server error", http.StatusInternalServerError) http.Error(rw, "Server error", http.StatusInternalServerError)