From f8f2f88271bf2c23f28a09d288d26507a9503c97 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 22 Feb 2018 03:57:59 +0000 Subject: [PATCH] Revert "godoc/dl: provide JSON feed of releases" This reverts commit 07fd8470d635b985c9c749fa83bdbc2f20b35d42. Reason for revert: doesn't compile; was never tested apparently. Change-Id: I9502dbd3fae1f388ee48d6de9a3f2c1df53411ad Reviewed-on: https://go-review.googlesource.com/96235 Reviewed-by: Brad Fitzpatrick --- godoc/dl/dl.go | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/godoc/dl/dl.go b/godoc/dl/dl.go index e50b0c24..977ba983 100644 --- a/godoc/dl/dl.go +++ b/godoc/dl/dl.go @@ -48,15 +48,15 @@ func RegisterHandlers(mux *http.ServeMux) { } type File struct { - Filename string `json:"filename"` - OS string `json:"os"` - Arch string `json:"arch"` - Version string `json:"-"` - Checksum string `json:"-" datastore:",noindex"` // SHA1; deprecated - ChecksumSHA256 string `json:"sha256" datastore:",noindex"` - Size int64 `json:"size" datastore:",noindex"` - Kind string `json:"kind"` // "archive", "installer", "source" - Uploaded time.Time `json:"-"` + Filename string + OS string + Arch string + Version string + Checksum string `datastore:",noindex"` // SHA1; deprecated + ChecksumSHA256 string `datastore:",noindex"` + Size int64 `datastore:",noindex"` + Kind string // "archive", "installer", "source" + Uploaded time.Time } func (f File) ChecksumType() string { @@ -137,11 +137,11 @@ func (f File) URL() string { } type Release struct { - Version string `json:"version"` - Stable bool `json:"stable"` - Files []File `json:"files"` - Visible bool `json:"-"` // show files on page load - SplitPortTable bool `json:"-"` // whether files should be split by primary/other ports. + Version string + Stable bool + Files []File + Visible bool // show files on page load + SplitPortTable bool // whether files should be split by primary/other ports. } type Feature struct { @@ -221,18 +221,6 @@ func listHandler(w http.ResponseWriter, r *http.Request) { log.Errorf(c, "cache set error: %v", err) } } - - if r.URL.Query().Get("mode") == "json" { - w.Header.Set("Content-Type", "application/json") - - e := json.NewEncoder(w).SetIndent("", " ") - if err := e.Encode(d.Stable); err != nil { - log.Errorf(c, "failed rendering JSON for releases: %v", err) - } - - return - } - if err := listTemplate.ExecuteTemplate(w, "root", d); err != nil { log.Errorf(c, "error executing template: %v", err) }