mtrx/crablog
1
0
Fork 0
Code Issues 12 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

improved error messages

Browse source
This commit is contained in:
Leonard Lorenz 2020-10-22 01:38:43 +02:00
parent b848922eee
commit bc806593e3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/db.rs
View file

@ -8,7 +8,7 @@ use models::*;
fn establish_connection() -> SqliteConnection { fn establish_connection() -> SqliteConnection {
let db_path = "db.sqlite3"; let db_path = "db.sqlite3";
SqliteConnection::establish(&db_path) SqliteConnection::establish(&db_path)
.unwrap_or_else(|_| panic!("Error connection to {}", &db_path)) .unwrap_or_else(|_| panic!("Error, connection to {} failed.", &db_path))
} }
pub fn get_posts() -> std::vec::Vec<Post> { pub fn get_posts() -> std::vec::Vec<Post> {
@ -16,9 +16,10 @@ pub fn get_posts() -> std::vec::Vec<Post> {
let connection = establish_connection(); let connection = establish_connection();
posts posts
.filter(published.eq(true)) .filter(published.eq(true))
.order(id.desc())
.limit(5) .limit(5)
.load::<Post>(&connection) .load::<Post>(&connection)
.expect("Error loading posts") .expect("Error, couldn't load posts.")
} }
pub fn get_post_by_id(id: i32) -> Post { pub fn get_post_by_id(id: i32) -> Post {
@ -27,7 +28,7 @@ pub fn get_post_by_id(id: i32) -> Post {
posts posts
.find(id) .find(id)
.get_result(&connection) .get_result(&connection)
.expect("Couldn't find post") .expect("Error, couldn't find post")
} }
pub fn add_post(title: &str, body: &str) { pub fn add_post(title: &str, body: &str) {
@ -46,5 +47,5 @@ pub fn add_post(title: &str, body: &str) {
diesel::insert_into(posts::table) diesel::insert_into(posts::table)
.values(&new_post) .values(&new_post)
.execute(&connection) .execute(&connection)
.unwrap_or_else(|_| panic!("Error couldn't insert new Post!")); .unwrap_or_else(|_| panic!("Error, couldn't insert new Post."));
} }

8
src/routes.rs
View file

@ -19,12 +19,12 @@ async fn blog() -> impl Responder {
// one-off render blog template with context // one-off render blog template with context
let result = Tera::one_off( let result = Tera::one_off(
&(std::fs::read_to_string("templates/blog.html") &(std::fs::read_to_string("templates/blog.html")
.unwrap_or_else(|_| panic!("Couldn't load blog template.")) .unwrap_or_else(|e| panic!("Error, couldn't load blog template.\n{}", e))
.as_str()), .as_str()),
&context, &context,
true, true,
) )
.unwrap_or_else(|_| panic!("Couldn't render blog template.")); .unwrap_or_else(|e| panic!("Error, couldn't render blog template.\n{}", e));
HttpResponse::Ok().body(result) HttpResponse::Ok().body(result)
} }
@ -38,11 +38,11 @@ async fn blog_permalink(web::Path(post_id): web::Path<u32>) -> impl Responder {
// one-off render blog template with context // one-off render blog template with context
let result = Tera::one_off( let result = Tera::one_off(
&(std::fs::read_to_string("templates/blog.html") &(std::fs::read_to_string("templates/blog.html")
.unwrap_or_else(|_| panic!("Couldn't load blog template.")) .unwrap_or_else(|e| panic!("Error, couldn't load blog template.\n{}", e))
.as_str()), .as_str()),
&context, &context,
true, true,
) )
.unwrap_or_else(|_| panic!("Couldn't render blog template.")); .unwrap_or_else(|e| panic!("Error, couldn't render blog template.\n{}", e));
HttpResponse::Ok().body(result) HttpResponse::Ok().body(result)
} }