defaults, search engine support

bunbun.toml

@@ -1,8 +1,16 @@
 bind_address: "127.0.0.1:8080"
+public_address: "localhost:8080"
+
+default_route: "g"
 
 routes:
   # Meta
   ls: "/ls"
+  help: "/ls"
+  list: "/ls"
   # Google
   g: "https://google.com/search?q={{query}}"
   yt: "https://www.youtube.com/results?search_query={{query}}"
+  # Searches
+  na: "https://nyaa.si/?f=0&c=1_2&q={{query}}"
+  #

src/main.rs

@@ -5,14 +5,17 @@ use actix_web::{
     App, HttpResponse, HttpServer, Responder,
 };
 use handlebars::Handlebars;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use std::collections::BTreeMap;
+use std::collections::HashMap;
 use std::fs::{File, OpenOptions};
 use std::io::{Error, Write};
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 
-static DEFAULT_CONFIG: &'static [u8] = br#"
+static DEFAULT_CONFIG: &[u8] = br#"
 bind_address: "127.0.0.1:8080"
+public_address: "localhost"
+
 routes:
     g: "https://google.com/search?q={{query}}"
 "#;
@@ -23,16 +26,16 @@ struct SearchQuery {
 }
 
 #[get("/ls")]
-fn list(data: Data<Arc<BTreeMap<String, String>>>) -> impl Responder {
+fn list(data: Data<Arc<State>>) -> impl Responder {
     let mut resp = String::new();
-    for (k, v) in data.iter() {
+    for (k, v) in data.routes.iter() {
         resp.push_str(&format!("{}: {}\n", k, v));
     }
     HttpResponse::Ok().body(resp)
 }
 
 #[get("/hop")]
-fn hop(data: Data<Arc<BTreeMap<String, String>>>, query: Query<SearchQuery>) -> impl Responder {
+fn hop(data: Data<Arc<State>>, query: Query<SearchQuery>) -> impl Responder {
     let reg = Handlebars::new();
     let mut raw_args = query.to.split_ascii_whitespace();
     let command = raw_args.next();
@@ -51,30 +54,77 @@ fn hop(data: Data<Arc<BTreeMap<String, String>>>, query: Query<SearchQuery>) ->
         return HttpResponse::NotFound().body("not found");
     }
 
-    // This struct is used until anonymous structs can be made
+    let mut template_args = HashMap::new();
-    #[derive(Serialize)]
+    template_args.insert("query", args);
-    struct Filler {
-        query: String,
-    }
 
-    match data.get(command.unwrap()) {
+    match data.routes.get(command.unwrap()) {
         Some(template) => HttpResponse::Found()
             .header(
                 header::LOCATION,
-                reg.render_template(template, &Filler { query: args })
+                reg.render_template(template, &template_args).unwrap(),
-                    .unwrap(),
             )
             .finish(),
-        None => HttpResponse::NotFound().body("not found"),
+        None => match &data.default_route {
+            Some(route) => {
+                template_args.insert(
+                    "query",
+                    format!(
+                        "{}+{}",
+                        command.unwrap(),
+                        template_args.get("query").unwrap()
+                    ),
+                );
+                HttpResponse::Found()
+                    .header(
+                        header::LOCATION,
+                        reg.render_template(data.routes.get(route).unwrap(), &template_args)
+                            .unwrap(),
+                    )
+                    .finish()
+            }
+            None => HttpResponse::NotFound().body("not found"),
+        },
     }
 }
 
+#[get("/")]
+fn index(data: Data<Arc<State>>) -> impl Responder {
+    HttpResponse::Ok().body(data.renderer.read().unwrap().render("index", &()).unwrap())
+}
+
+#[get("/bunbunsearch.xml")]
+fn opensearch(data: Data<Arc<State>>) -> impl Responder {
+    let mut template_args = HashMap::new();
+    template_args.insert("hostname", &data.public_address);
+    HttpResponse::Ok()
+        .header(
+            header::CONTENT_TYPE,
+            "application/opensearchdescription+xml",
+        )
+        .body(
+            data.renderer
+                .read()
+                .unwrap()
+                .render("opensearch", &template_args)
+                .unwrap(),
+        )
+}
+
 #[derive(Deserialize)]
 struct Config {
     bind_address: String,
+    public_address: String,
+    default_route: Option<String>,
     routes: BTreeMap<String, String>,
 }
 
+struct State {
+    public_address: String,
+    default_route: Option<String>,
+    routes: BTreeMap<String, String>,
+    renderer: RwLock<Handlebars>,
+}
+
 fn main() -> Result<(), Error> {
     let config_file = match File::open("bunbun.toml") {
         Ok(file) => file,
@@ -89,10 +139,41 @@ fn main() -> Result<(), Error> {
             File::open("bunbun.toml")?
         }
     };
-    let conf: Config = serde_yaml::from_reader(config_file).unwrap();
-    let routes = Arc::from(conf.routes);
 
-    HttpServer::new(move || App::new().data(routes.clone()).service(hop).service(list))
+    let renderer = compile_templates();
-        .bind(&conf.bind_address)?
+    let conf: Config = serde_yaml::from_reader(config_file).unwrap();
-        .run()
+    let state = Arc::from(State {
+        public_address: conf.public_address,
+        default_route: conf.default_route,
+        routes: conf.routes,
+        renderer: RwLock::new(renderer),
+    });
+
+    HttpServer::new(move || {
+        App::new()
+            .data(state.clone())
+            .service(hop)
+            .service(list)
+            .service(index)
+            .service(opensearch)
+    })
+    .bind(&conf.bind_address)?
+    .run()
+}
+
+fn compile_templates() -> Handlebars {
+    let mut handlebars = Handlebars::new();
+    handlebars
+        .register_template_string(
+            "index",
+            String::from_utf8_lossy(include_bytes!("templates/index.hbs")),
+        )
+        .unwrap();
+    handlebars
+        .register_template_string(
+            "opensearch",
+            String::from_utf8_lossy(include_bytes!("templates/bunbunsearch.xml")),
+        )
+        .unwrap();
+    handlebars
 }

src/templates/bunbunsearch.xml

@@ -0,0 +1,9 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
+                       xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+  <ShortName>bunbun</ShortName>
+  <Description>Hop to where you need to go</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <!--<Image width="16" height="16">data:image/x-icon;base64,</Image>-->
+  <Url type="text/html" template="http://{{hostname}}/hop?to={searchTerms}"></Url>
+  <Url type="application/x-moz-keywordsearch" template="http://{{hostname}}/hop?to={searchTerms}"></Url>
+</OpenSearchDescription>

src/templates/index.hbs

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  <link rel="search"
+        type="application/opensearchdescription+xml"
+        title="bunbun"
+        href="bunbunsearch.xml">
+  </head>
+  <body>
+    hello world
+  </body>
+</html>