Merge pull request hound-search#152 from morria/master

Adding open search description to enable search from the URL bar
zengjun1987 · Sep 4, 2015 · 71e2150 · 71e2150
2 parents 3537d31 + c0d0ba5
commit 71e2150
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 26 deletions.
diff --git a/ui/assets/index.tpl.html b/ui/assets/index.tpl.html
@@ -5,6 +5,9 @@
         <title>Hound</title>
         <link rel="stylesheet" href="css/octicons/octicons.css">
         <link rel="stylesheet" href="css/hound.css">
+        <link rel="search" href="//{{ .Host }}/open_search.xml"
+              type="application/opensearchdescription+xml"
+              title="Hound" />
     </head>
     <body>
         <div id="root">

diff --git a/ui/assets/open_search.tpl.xml b/ui/assets/open_search.tpl.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+    <ShortName>Hound</ShortName>
+    <Description>Search code with Hound</Description>
+    <Tags>Hound</Tags>
+    <Url type="text/html"
+         method="get"
+         template="http://{{ .Host }}/?q={searchTerms}" />
+</OpenSearchDescription>
diff --git a/ui/bindata.go b/ui/bindata.go
diff --git a/ui/content.go b/ui/content.go
@@ -38,6 +38,10 @@ func init() {
 			},
 		},
 
+		"/open_search.xml": &content{
+			template: "open_search.tpl.xml",
+		},
+
 		"/excluded_files.html": &content{
 			template: "excluded_files.tpl.html",
 			sources: []string{

diff --git a/ui/ui.go b/ui/ui.go
@@ -53,14 +53,14 @@ func (h *devHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// If so, render the HTML
 	w.Header().Set("Content-Type", "text/html;charset=utf-8")
-	if err := renderForDev(w, h.root, cr, h.cfg); err != nil {
+	if err := renderForDev(w, h.root, cr, h.cfg, r); err != nil {
 		log.Panic(err)
 	}
 }
 
 // Renders a templated asset in dev-mode. This simply embeds external script tags
 // for the source elements.
-func renderForDev(w io.Writer, root string, c *content, cfg *config.Config) error {
+func renderForDev(w io.Writer, root string, c *content, cfg *config.Config, r *http.Request) error {
 	t, err := template.ParseFiles(
 		filepath.Join(root, c.template))
 	if err != nil {
@@ -89,6 +89,7 @@ func renderForDev(w io.Writer, root string, c *content, cfg *config.Config) erro
 		"jQueryVersion": JQueryVersion,
 		"ReposAsJson":   json,
 		"Source":        template.HTML(buf.String()),
+		"Host":          r.Host,
 	})
 }
 
@@ -117,7 +118,7 @@ func (h *prdHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ct := h.content[p]
 	if ct != nil {
 		// if so, render it
-		if err := renderForPrd(w, ct, h.cfgJson); err != nil {
+		if err := renderForPrd(w, ct, h.cfgJson, r); err != nil {
 			log.Panic(err)
 		}
 		return
@@ -131,7 +132,7 @@ func (h *prdHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 // Renders a templated asset in prd-mode. This strategy will embed
 // the sources directly in a script tag on the templated page.
-func renderForPrd(w io.Writer, c *content, cfgJson string) error {
+func renderForPrd(w io.Writer, c *content, cfgJson string, r *http.Request) error {
 
 	var buf bytes.Buffer
 	buf.WriteString("<script>")
@@ -149,6 +150,7 @@ func renderForPrd(w io.Writer, c *content, cfgJson string) error {
 		"jQueryVersion": JQueryVersion,
 		"ReposAsJson":   cfgJson,
 		"Source":        template.HTML(buf.String()),
+		"Host":          r.Host,
 	})
 }