Move business logic out of main, use askama and bound the ENTRIES

src/main.rs

@@ -1,30 +1,35 @@
 #![feature(proc_macro_hygiene, decl_macro)]
+#![feature(uniform_paths)]
 
 #[macro_use] extern crate lazy_static;
 
 #[macro_use] extern crate rocket;
-extern crate rocket_contrib;
 
-extern crate gpw;
-extern crate syntect;
-extern crate chashmap;
+extern crate askama;
+extern crate askama_escape;
+
+mod io;
+mod highlight;
+
+use io::{store_paste, get_paste};
+use highlight::highlight;
+
+use askama::Template;
+use askama_escape::{MarkupDisplay, Html};
 
-use rocket_contrib::templates::Template;
 use rocket::response::Redirect;
 use rocket::request::Form;
+use rocket::Data;
 
-use serde::Serialize;
-use syntect::parsing::SyntaxSet;
-use syntect::highlighting::ThemeSet;
-use syntect::easy::HighlightLines;
-use syntect::html::{styled_line_to_highlighted_html, IncludeBackground};
+use std::io::Read;
 
-use chashmap::CHashMap;
-use std::borrow::Cow;
-use std::cell::RefCell;
+#[derive(Template)]
+#[template(path = "index.html")]
+struct Index {}
 
-lazy_static! {
-    static ref ENTRIES: CHashMap<String, String> = CHashMap::new();
+#[get("/")]
+fn index() -> Index {
+    Index {}
 }
 
 
@@ -32,25 +37,6 @@ lazy_static! {
 struct IndexForm {
     val: String
 }
-
-#[get("/")]
-fn index() -> Template {
-    #[derive(Serialize)]
-    struct Index {}
-
-    Template::render("index", Index {})
-}
-
-
-/// Generates a randomly generated id, stores the given paste under that id and then returns the id.
-fn store_paste(content: String) -> String {
-    thread_local!(static KEYGEN: RefCell<gpw::PasswordGenerator> = RefCell::new(gpw::PasswordGenerator::default()));
-
-    let id = KEYGEN.with(|k| k.borrow_mut().next().unwrap());
-    ENTRIES.insert(id.clone(), content);
-    id
-}
-
 #[post("/", data = "<input>")]
 fn submit(input: Form<IndexForm>) -> Redirect {
     let id = store_paste(input.into_inner().val);
@@ -58,53 +44,40 @@ fn submit(input: Form<IndexForm>) -> Redirect {
 }
 
 #[put("/", data = "<input>")]
-fn submit_raw(input: String) -> String {
-    format!("https://{}/{}", "localhost:8000", store_paste(input))
+fn submit_raw(input: Data) -> std::io::Result<String> {
+    let mut data = String::new();
+    input.open().take(1024 * 1000).read_to_string(&mut data)?;
+    Ok(format!("https://{}/{}", "localhost:8000", store_paste(data)))
 }
 
 
-/// Takes the content of a paste and the extension passed in by the viewer and will return the content
-/// highlighted in the appropriate format in HTML.
-fn highlight(content: &str, ext: &str) -> Option<String> {
-    lazy_static! {
-        static ref SS: SyntaxSet = SyntaxSet::load_defaults_newlines();
-        static ref TS: ThemeSet = ThemeSet::load_defaults();
-    }
-
-    let syntax = SS.find_syntax_by_extension(ext)?;
-    let mut h = HighlightLines::new(syntax, &TS.themes["base16-ocean.dark"]);
-    let regions = h.highlight(content, &SS);
-
-    Some(styled_line_to_highlighted_html(&regions[..], IncludeBackground::No))
+#[derive(Template)]
+#[template(path = "paste.html")]
+struct Render {
+    content: MarkupDisplay<Html, String>
 }
 
 #[get("/<key>")]
-fn render<'a>(key: String) -> Option<Template> {
+fn render<'a>(key: String) -> Option<Render> {
     let mut splitter = key.splitn(2, ".");
     let key = splitter.next().unwrap();
     let ext = splitter.next();
 
     // get() returns a read-only lock, we're not going to be writing to this key
     // again so we can hold this for as long as we want
-    let entry = ENTRIES.get(key)?;
+    let entry = get_paste(key)?;
 
-    #[derive(Serialize)]
-    struct Render<'a> {
-        content: Cow<'a, String>
-    }
-
-    Some(Template::render("paste", Render {
+    Some(Render {
         content: match ext {
-            None => Cow::Borrowed(&*entry),
-            Some(extension) => Cow::Owned(highlight(&*entry, extension)?)
+            None => MarkupDisplay::new_unsafe(entry, Html),
+            Some(extension) => MarkupDisplay::new_safe(highlight(&entry, extension)?, Html)
         }
-    }))
+    })
 }
 
 
 fn main() {
     rocket::ignite()
-        .attach(Template::fairing())
         .mount("/", routes![index, submit, submit_raw, render])
         .launch();
 }