templates: Support inner errors

angrynode · angrynode · commit 8a8a135b1a0d · 2025-10-30T17:41:34.000+01:00
diff --git a/src/routes/index.rs b/src/routes/index.rs
@@ -3,7 +3,7 @@ use askama_web::WebTemplate;
 use axum::extract::State;
 
 use crate::extractors::user::User;
-use crate::state::{AppState, AppStateContext, error::AppStateError};
+use crate::state::{AppState, AppStateContext, error::*};
 
 use std::collections::HashMap;
 
diff --git a/src/state/error.rs b/src/state/error.rs
@@ -2,6 +2,7 @@ use askama::Template;
 use askama_web::WebTemplate;
 use axum::http::StatusCode;
 use axum::response::{IntoResponse, Response};
+use snafu::ErrorCompat;
 use snafu::prelude::*;
 
 use super::free_space::FreeSpaceError;
@@ -15,30 +16,43 @@ pub enum AppStateError {
     API { source: hightorrent_api::ApiError },
     #[snafu(display("Failed to get free space information"))]
     FreeSpace { source: FreeSpaceError },
+    #[snafu(display("An other error occurred"))]
+    Other {
+        source: Box<dyn snafu::Error + Send + Sync + 'static>,
+    },
+}
+
+impl AppStateError {
+    pub fn inner_errors(&self) -> Vec<Box<dyn std::error::Error + '_>> {
+        let mut inner_errors = vec![];
+        for error in self.iter_chain().skip(1) {
+            inner_errors.push(Box::new(error).into());
+        }
+        inner_errors
+    }
 }
 
 /// Global error page generated from an [AppStateError].
-#[derive(Clone, Debug, Template, WebTemplate)]
+#[derive(Debug, Template, WebTemplate)]
 #[template(path = "error.html")]
 pub struct AppStateErrorContext {
     state: AppStateErrorContextInner,
 }
 
 /// Helper struct so we can reuse base.html
 /// with all it's `state.foo` expressions.
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct AppStateErrorContextInner {
-    // TODO: typed errors
-    // errors: Vec<AppStateError>,
-    errors: Vec<String>,
+    // TODO: askama doesn't handle recursion well, so we convert
+    // all errors to strings. Maybe related to:
+    // https://github.com/askama-rs/askama/issues/393
+    errors: Vec<AppStateError>,
 }
 
 impl From<AppStateError> for AppStateErrorContext {
     fn from(e: AppStateError) -> Self {
         Self {
-            state: AppStateErrorContextInner {
-                errors: vec![e.to_string()],
-            },
+            state: AppStateErrorContextInner { errors: vec![e] },
         }
     }
 }
@@ -49,3 +63,19 @@ impl IntoResponse for AppStateError {
         (StatusCode::INTERNAL_SERVER_ERROR, error_context).into_response()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn can_extract_from_any_error() {
+        let res: Result<_, AppStateError> =
+            std::fs::read("/tmp/qsjlkdjsqlkdsqfsqhsjklfhalkjfkjh.toml")
+                .boxed()
+                .context(OtherSnafu);
+
+        assert!(res.is_err());
+        assert_eq!(&res.unwrap_err().to_string(), "An other error occurred");
+    }
+}
diff --git a/src/state/mod.rs b/src/state/mod.rs
@@ -31,7 +31,8 @@ pub struct AppState {
 pub struct AppStateContext {
     // TODO: proper categories
     pub categories: Vec<String>,
-    pub errors: Vec<String>,
+    pub errors: Vec<AppStateError>,
+    // pub errors: Vec<String>,
     pub free_space: FreeSpace,
 }
 
diff --git a/templates/base.html b/templates/base.html
@@ -1,4 +1,3 @@
-{#{% import "menus/macro.html" as menus %}#}
 <!DOCTYPE html>
 <html>
 	<head>
@@ -17,7 +16,14 @@
             <div class="container">
 {% for error in state.errors %}
                 <div class="notification is-danger">
-                <h2 style="font-weight: bold; text-align: center;">{{ error }}</h2>
+								<details>
+									<summary>{{ error }}</summary>
+									<ul class="ml-5">
+									{% for inner_error in error.inner_errors() %}
+										<li>→ {{ inner_error }}</li>
+									{% endfor %}
+									</ul>
+								</details>
                 </div>
 {% endfor %}
 						</div>

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ pub struct AppState {`
`31`	`31`	`pub struct AppStateContext {`
`32`	`32`	`// TODO: proper categories`
`33`	`33`	`pub categories: Vec<String>,`
`34`		`- pub errors: Vec<String>,`
	`34`	`+ pub errors: Vec<AppStateError>,`
	`35`	`+ // pub errors: Vec<String>,`
`35`	`36`	`pub free_space: FreeSpace,`
`36`	`37`	`}`
`37`	`38`