nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2026-01-30 12:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustical_dav: Make actix-web a completely optional dependency

Browse Source
This commit is contained in:
Lennart
2025-06-02 21:58:46 +02:00
parent 05ff2536f6
commit 9836a696ad
10 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/dav/src/error.rs
View File

@@ -1,4 +1,4 @@
use actix_web::{HttpResponse, http::StatusCode};
use http::StatusCode;
use rustical_xml::XmlError;
use thiserror::Error;
use tracing::error;
@@ -30,8 +30,8 @@ pub enum Error {
PreconditionFailed,
}
impl actix_web::error::ResponseError for Error {
fn status_code(&self) -> StatusCode {
impl Error {
pub fn status_code(&self) -> StatusCode {
match self {
Self::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
Self::NotFound => StatusCode::NOT_FOUND,
@@ -51,14 +51,21 @@ impl actix_web::error::ResponseError for Error {
Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
}
}
}
fn error_response(&self) -> HttpResponse {
#[cfg(feature = "actix")]
impl actix_web::error::ResponseError for Error {
fn status_code(&self) -> StatusCode {
self.status_code()
}
fn error_response(&self) -> actix_web::HttpResponse {
error!("Error: {self}");
match self {
Error::Unauthorized => HttpResponse::build(self.status_code())
Error::Unauthorized => actix_web::HttpResponse::build(self.status_code())
.append_header(("WWW-Authenticate", "Basic"))
.body(self.to_string()),
_ => HttpResponse::build(self.status_code()).body(self.to_string()),
_ => actix_web::HttpResponse::build(self.status_code()).body(self.to_string()),
}
}
}