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

include publish roots in discovery response 

Change-Id: I726462e83be9d93fa446e28a7a81410a38acc260
This commit is contained in:
Brad Fitzpatrick 2011-06-19 14:12:56 -07:00
parent ec817d3c0f
commit 4915f6aee8
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/go/camlistored/ui.go
View File

@ -96,7 +96,7 @@ func newUiFromConfig(ld blobserver.Loader, conf jsonconfig.Obj) (h http.Handler,
if !ok { if !ok {
return return
} }
ui.PublishRoots[pubh.RootName] = pubh ui.PublishRoots[pubRoot] = pubh
} }
checkType := func(key string, htype string) { checkType := func(key string, htype string) {
@ -210,12 +210,22 @@ func (ui *UIHandler) serveDiscovery(rw http.ResponseWriter, req *http.Request) {
fmt.Fprintf(rw, "%s(", cb) fmt.Fprintf(rw, "%s(", cb)
inCb = true inCb = true
} }
pubRoots := map[string]interface{}{}
for key, pubh := range ui.PublishRoots {
pubRoots[key] = map[string]interface{}{
"name": pubh.RootName,
// TODO: include gpg key id
}
}
bytes, _ := json.Marshal(map[string]interface{}{ bytes, _ := json.Marshal(map[string]interface{}{
"blobRoot": ui.BlobRoot, "blobRoot": ui.BlobRoot,
"searchRoot": ui.SearchRoot, "searchRoot": ui.SearchRoot,
"jsonSignRoot": ui.JSONSignRoot, "jsonSignRoot": ui.JSONSignRoot,
"uploadHelper": "?camli.mode=uploadhelper", // hack; remove with better javascript "uploadHelper": "?camli.mode=uploadhelper", // hack; remove with better javascript
"downloadHelper": "./download/", "downloadHelper": "./download/",
"publishRoots": pubRoots,
}) })
rw.Write(bytes) rw.Write(bytes)
if inCb { if inCb {