azalea/MeowIndex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] Macros, handle errors

Browse Source
This commit is contained in:
Azalea Gui
2023-02-17 10:09:26 -05:00
parent b72f2ff701
commit 455aa9677e
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/macros.rs
+11
View File
@@ -0,0 +1,11 @@
macro_rules! resp {
($status:expr) => {
Response::builder().status($status)
};
}
macro_rules! ok {
() => {
resp!(StatusCode::OK)
};
}
backend/src/main.rs
+16 -4
View File
@@ -1,8 +1,11 @@
#[macro_use]
mod macros;
use std::convert::Infallible; use std::convert::Infallible;
use std::{env, fs}; use std::{env, fs};
use std::net::SocketAddr; use std::net::SocketAddr;
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
use hyper::{Body, Request, Response, Server}; use hyper::{Body, http, Request, Response, Server, StatusCode};
use hyper::service::{make_service_fn, service_fn}; use hyper::service::{make_service_fn, service_fn};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -34,8 +37,17 @@ struct ReturnPath {
mtime: i64 mtime: i64
} }
async fn hello_world(_req: Request<Body>) -> Result<Response<Body>, Infallible> { async fn hello_world(_req: Request<Body>) -> http::Result<Response<Body>> {
let paths: Vec<ReturnPath> = fs::read_dir("./").unwrap() let path = _req.uri().path();
println!("{path}");
// List files in directory
let read_dir = match fs::read_dir(".") {
Ok(file) => {file}
Err(e) => { return resp!(500).body(format!("Error {e}").into()) }
};
let paths: Vec<ReturnPath> = read_dir
.map(|x| x.unwrap()) .map(|x| x.unwrap())
.map(|x| ReturnPath { .map(|x| ReturnPath {
name: x.file_name().to_str().unwrap().parse().unwrap(), name: x.file_name().to_str().unwrap().parse().unwrap(),
@@ -43,5 +55,5 @@ async fn hello_world(_req: Request<Body>) -> Result<Response<Body>, Infallible>
mtime: x.metadata().unwrap().mtime(), mtime: x.metadata().unwrap().mtime(),
}).collect(); }).collect();
Ok(Response::new(serde_json::to_string(&paths).unwrap().into())) ok!().body(serde_json::to_string(&paths).unwrap().into())
} }