use std::{fs::File, env::args};
use actix_files as fs;
-use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query, middleware::Logger};
+use actix_web::{get, web, Responder, middleware, App, HttpServer, HttpResponse, web::Query, middleware::Logger};
use askama::Template;
use listenfd::ListenFd;
m: Option<String>
}
-fn main_page(query: Query<Request>) -> Result<HttpResponse> {
+fn main_page(query: Query<Request>) -> HttpResponse {
- let main_template = MainTemplate { test: &"test" };
+ let main_template = MainTemplate { test: &"*** test ***" };
let s = main_template.render().unwrap();
- Ok(HttpResponse::Ok().content_type("text/html").body(s))
+ HttpResponse::Ok().content_type("text/html").body(s)
}
#[derive(Debug, Deserialize)]
first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
}
-fn main() -> std::io::Result<()> {
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
if process_args() { return Ok(()) }
- println!("Starting RUP as web server...");
+ println!("Starting Recipes as web server...");
let config: Config = {
let f = File::open(consts::FILE_CONF).unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF));
println!("Configuration: {:?}", config);
- let database_connection = db::create_or_update();
+ // let database_connection = db::create_or_update();
std::env::set_var("RUST_LOG", "actix_web=info");
env_logger::init();
server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
};
- server.run()
+ server.run().await
}
fn process_args() -> bool {
print_usage();
return true
} else if args.iter().any(|arg| arg == "--test") {
- let database_connection = db::create_or_update();
+ let db_connection = db::Connection::new();
+ db_connection.create_or_update();
return true
}