Milo Refactor: Remove theme support

milo/appengine/buildbucket/html.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package buildbucket
 
 import (
+        "errors"
         "net/http"
 
         "github.com/julienschmidt/httprouter"
-        "golang.org/x/net/context"
-
-        "github.com/luci/luci-go/milo/appengine/settings"
-        "github.com/luci/luci-go/milo/common/miloerror"
+        "github.com/luci/luci-go/milo/appengine/common"
+        "github.com/luci/luci-go/server/router"
         "github.com/luci/luci-go/server/templates"
 )
 
 // TODO(nodir): move this value to luci-config.
 const defaultServer = "cr-buildbucket.appspot.com"
 
-// Builder displays builder view by fetching builds from buildbucket.
-type Builder struct{}
-
-// GetTemplateName for Builder returns the template name for builder pages.
-func (b Builder) GetTemplateName(t settings.Theme) string {
-        return "builder.html"
-}
-
-// Render renders builder view page.
-// Note: The builder html template contains self links to "?limit=123", which could
-// potentially override any other request parameters set.
-func (b Builder) Render(c context.Context, r *http.Request, p httprouter.Params) (*templates.Args, error) {
-        // Parse URL parameters.
+func validateParams(r *http.Request, p httprouter.Params) (*builderQuery, error) {

[nodir, 2017/03/17 20:47:57]

s/validateParams/parseBuilderQuery/
because it parses the request to a builder query, and returns an error if the
input is bad

[hinoka, 2017/03/17 22:04:55]

Done.

         server := r.FormValue("server")
         if server == "" {
                 server = defaultServer
         }
 
         bucket := p.ByName("bucket")
         if bucket == "" {
-                return nil, &miloerror.Error{
-                        Message: "No bucket",
-                        Code:    http.StatusBadRequest,
-                }
+                return nil, errors.New("No bucket")
         }
 
         builder := p.ByName("builder")
         if builder == "" {
-                return nil, &miloerror.Error{
-                        Message: "No builder",
-                        Code:    http.StatusBadRequest,
-                }
+                return nil, errors.New("No builder")
         }
 
         // limit is a name of the query string parameter for specifying
         // maximum number of builds to show.
-        limit, err := settings.GetLimit(r)
+        limit, err := common.GetLimit(r)
         if err != nil {
                 return nil, err
         }
 
-        result, err := builderImpl(c, server, bucket, builder, limit)
+        return &builderQuery{
+                Server:  server,
+                Bucket:  bucket,
+                Builder: builder,
+                Limit:   limit,
+        }, nil
+}
+
+// BuilderHandler renders the builder view page.
+// Note: The builder html template contains self links to "?limit=123", which could
+// potentially override any other request parameters set.
+func BuilderHandler(c *router.Context) {
+        query, err := validateParams(c.Request, c.Params)
         if err != nil {
-                return nil, err
+                common.ErrorPage(c, http.StatusBadRequest, err.Error())
+                return
         }
 
-        // Render into the template
-        args := &templates.Args{
+        result, err := builderImpl(c.Context, query)
+        if err != nil {
+                common.ErrorPage(c, http.StatusInternalServerError, err.Error())
+                return
+        }
+
+        templates.MustRender(c.Context, c.Writer, "pages/builder.html", templates.Args{
                 "Builder": result,
-        }
-        return args, nil
+        })
+        return

[nodir, 2017/03/17 20:47:57]

remove

[hinoka, 2017/03/17 22:04:54]

Done.

 }