homelab/bin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove dependency on ring

Browse source
This commit is contained in:
Jordan Johnson-Doyle 2019-02-16 18:55:37 +00:00
parent caa8c3568d
commit c3b886c196
No known key found for this signature in database
GPG key ID: A95F87B578CE79B6
3 changed files with 37 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main.rs
View file

@ -8,7 +8,6 @@ extern crate lazy_static;
extern crate rocket;
extern crate askama;
extern crate askama_escape;
mod highlight;
mod io;
@ -18,8 +17,7 @@ use highlight::highlight;
use io::{generate_id, get_paste, store_paste};
use params::{HostHeader, IsPlaintextRequest};
use askama::Template;
use askama_escape::{Html, MarkupDisplay};
use askama::{MarkupDisplay, Template};
use rocket::http::{ContentType, Status};
use rocket::request::Form;
@ -35,11 +33,14 @@ use std::io::Read;
#[derive(Template)]
#[template(path = "index.html")]
struct Index {}
struct Index;
#[get("/")]
fn index() -> Index {
Index {}
fn index() -> Result<rocket::response::content::Html<String>, Status> {
Index
.render()
.map(|h| rocket::response::content::Html(h))
.map_err(|_| Status::InternalServerError)
}
///
@ -79,7 +80,7 @@ fn submit_raw(input: Data, host: HostHeader) -> std::io::Result<String> {
#[derive(Template)]
#[template(path = "paste.html")]
struct ShowPaste {
content: MarkupDisplay<Html, String>,
content: MarkupDisplay<String>,
}
#[get("/<key>")]
@ -96,9 +97,9 @@ fn show_paste(key: String, plaintext: IsPlaintextRequest) -> Result<Content<Stri
Ok(Content(ContentType::Plain, entry))
} else {
let content = match ext {
None => MarkupDisplay::new_unsafe(entry, Html),
None => MarkupDisplay::Unsafe(entry),
Some(extension) => highlight(&entry, extension)
.map(|h| MarkupDisplay::new_safe(h, Html))
.map(|h| MarkupDisplay::Safe(h))
.ok_or_else(|| Status::NotFound)?,
};