small changes in `index.html`, formatting

src/errors.rs

@@ -1,5 +1,8 @@
 use thiserror::Error;
 
+// TODO add NotFound and InternalServerError response here,
+// return it in NotFound and InternalError
+
 #[derive(Debug, Error)]
 pub enum RequestError {
 	#[error("request unable to be parsed as a form")]
@@ -22,8 +25,8 @@ pub enum InternalError {
 
 #[derive(Debug, Error)]
 pub enum HandlingError {
-	#[error("client error")]
+	#[error("client error: {0}")]
-	ClientError(#[from] RequestError),
+	ClientError(RequestError),
-	#[error("server error")]
+	#[error("server error: {0}")]
-	ServerError(#[from] InternalError),
+	ServerError(InternalError),
 }

src/http.rs

@@ -48,7 +48,7 @@ impl Request {
 		for mut x in self.body.split("&").map(|x| x.split("=")) {
 			hashmap.insert(
 				x.next().ok_or(RequestError::NotAForm)?,
-				x.next().ok_or(RequestError::NotAForm)?
+				x.next().ok_or(RequestError::NotAForm)?,
 			);
 		}
 		Ok(hashmap)
@@ -61,7 +61,9 @@ impl FromStr for Request {
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		//dbg!(&s);
 		let mut iter = s.lines();
-		let mut first = iter.next().ok_or(RequestError::BadRequest)?
+		let mut first = iter
+			.next()
+			.ok_or(RequestError::BadRequest)?
 			.split_whitespace();
 		let method = first.next().ok_or(RequestError::BadRequest)?;
 		let uri = first.next().ok_or(RequestError::BadRequest)?;
@@ -114,4 +116,3 @@ impl fmt::Display for Response {
 		)
 	}
 }
-

src/main.rs

@@ -2,10 +2,11 @@ mod errors;
 mod http;
 mod post;
 
-use crate::errors::{RequestError, HandlingError, InternalError};
+use crate::errors::{HandlingError, InternalError, RequestError};
 use crate::http::{Request, Response, Status};
 use crate::post::{Post, Thread};
 
+use std::error::Error;
 use std::io::{Read, Write};
 use std::net::{SocketAddr, TcpListener, TcpStream};
 use std::path::PathBuf;
@@ -16,10 +17,10 @@ use std::sync::{Arc, Mutex, MutexGuard};
 use bincode::{deserialize, serialize};
 use cached::proc_macro::cached;
 use lazy_static::lazy_static;
+use log::*;
 use simplelog::*;
 use structopt::StructOpt;
 use threadpool::ThreadPool;
-use log::*;
 
 // statically linked index and favicon
 const INDEX: &'static str = include_str!("www/index.html");
@@ -66,16 +67,14 @@ impl State {
 fn handle(request: &str, state: Arc<Mutex<State>>) -> Response {
 	let request = match request.parse::<Request>() {
 		Ok(s) => s,
-		Err(e) => {
+		Err(e) => return Response::new(Status::BadRequest, vec![], e.to_string()),
-			return Response::new(Status::BadRequest, vec![], "".to_string())
-		},
 	};
 	let state = state.lock().unwrap();
 
 	match request.method.as_str() {
 		"GET" => match get(&request.uri, state) {
 			Ok(s) => s,
-			Err(e) => Response::new(Status::NotFound, vec![], "".to_string()),
+			Err(e) => Response::new(Status::NotFound, vec![], e.to_string()),
 		},
 		"POST" => post(request, state),
 		// check admin hash
@@ -114,11 +113,14 @@ fn get(path: &str, state: MutexGuard<State>) -> Result<Response, HandlingError>
 			let content = content(
 				s,
 				&deserialize::<Thread>(
-					&state.db.get(&s.as_bytes())
+					&state
-					.map_err(|_| HandlingError::ServerError(InternalError::DatabaseReadError))?
+						.db
-					.ok_or(HandlingError::ClientError(RequestError::NotFound))?)
+						.get(&s.as_bytes())
-					.unwrap()
+						.map_err(|_| HandlingError::ServerError(InternalError::DatabaseReadError))?
-					.to_string(),
+						.ok_or(HandlingError::ClientError(RequestError::NotFound))?,
+				)
+				.unwrap()
+				.to_string(),
 			);
 
 			Ok(Response::new(Status::Ok, vec![], content))
@@ -141,7 +143,8 @@ fn post(request: Request, mut state: MutexGuard<State>) -> Response {
 
 			state
 				.db
-				.insert(id.to_ne_bytes(), serialize(&thread).unwrap());
+				.insert(id.to_ne_bytes(), serialize(&thread).unwrap())
+				.unwrap();
 
 			Response::new(Status::Ok, vec![], String::from(""))
 		}
@@ -168,8 +171,12 @@ fn main() {
 	let pool = ThreadPool::new(num_cpus::get());
 	// setup logger
 	TermLogger::init(
-		LevelFilter::Warn, Config::default(), TerminalMode::Mixed, ColorChoice::Auto
+		LevelFilter::Warn,
-			).unwrap();
+		Config::default(),
+		TerminalMode::Mixed,
+		ColorChoice::Auto,
+	)
+	.unwrap();
 	// open database
 	let state = Arc::new(Mutex::new(State {
 		db: sled::open(&OPT.database).unwrap(),

src/post.rs

@@ -11,7 +11,7 @@ pub struct Image {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Post {
 	pub id: u64,
-	pub img: Option<Image>,
+	//pub img: Option<Image>,
 	pub body: String,
 }
 
@@ -31,7 +31,11 @@ impl Thread {
 
 impl Post {
 	pub fn new(id: u64, img: Option<Image>, body: String) -> Self {
-		Self { id, img, body }
+		Self {
+			id,
+			//img,
+			body,
+		}
 	}
 }
 
@@ -60,11 +64,12 @@ impl fmt::Display for Post {
 			self.id,
 			"",
 			self.id,
-			if let Some(s) = &self.img {
+			//if let Some(s) = &self.img {
-				&s.filename
+			//	&s.filename
-			} else {
+			//} else {
-				""
+			//	""
-			},
+			//},
+			"",
 			self.body,
 		)
 	}

src/www/index.html

@@ -11,7 +11,7 @@
 			<nav>
 				<span>kchan &ndash;</span>
 				<a href="/">index</a>
-				<a href="faq.html">faq</a>
+				<a href="faq">faq</a>
 				<a href="new-thread.html">new thread</a>
 			</nav>
 		</div>