simple refactoring

This commit is contained in:
Lennart
2024-11-06 16:18:11 +01:00
parent c21993ab15
commit f56fd81d0e
8 changed files with 40 additions and 29 deletions

View File

@@ -1,8 +1,10 @@
use crate::{namespace::Namespace, xml::TagList};
use actix_web::{
body::BoxBody, http::header::ContentType, HttpRequest, HttpResponse, Responder, ResponseError,
body::BoxBody,
http::{header::ContentType, StatusCode},
HttpRequest, HttpResponse, Responder, ResponseError,
};
use serde::Serialize;
use serde::{Serialize, Serializer};
// Intermediate struct because of a serde limitation, see following article:
// https://stackoverflow.com/questions/78444158/unsupportedcannot-serialize-enum-newtype-variant-exampledata
@@ -18,7 +20,12 @@ pub struct PropTagWrapper<T: Serialize> {
#[serde(rename_all = "kebab-case")]
pub struct PropstatElement<PropType: Serialize> {
pub prop: PropType,
pub status: String,
#[serde(serialize_with = "serialize_status")]
pub status: StatusCode,
}
fn serialize_status<S: Serializer>(status: &StatusCode, serializer: S) -> Result<S::Ok, S::Error> {
format!("HTTP/1.1 {}", status).serialize(serializer)
}
#[derive(Serialize)]
@@ -36,10 +43,20 @@ pub enum PropstatWrapper<T: Serialize> {
pub struct ResponseElement<PropstatType: Serialize> {
pub href: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub status: Option<String>,
#[serde(serialize_with = "serialize_optional_status")]
pub status: Option<StatusCode>,
pub propstat: Vec<PropstatWrapper<PropstatType>>,
}
fn serialize_optional_status<S: Serializer>(
status_option: &Option<StatusCode>,
serializer: S,
) -> Result<S::Ok, S::Error> {
status_option
.map(|status| format!("HTTP/1.1 {}", status))
.serialize(serializer)
}
impl<PT: Serialize> Default for ResponseElement<PT> {
fn default() -> Self {
Self {

View File

@@ -1,3 +1,4 @@
use derive_more::derive::From;
use serde::ser::SerializeMap;
use serde::{
@@ -5,7 +6,7 @@ use serde::{
Deserialize, Serialize,
};
#[derive(Clone, Debug, PartialEq)]
#[derive(Clone, Debug, PartialEq, From)]
pub struct TagList(Vec<String>);
struct TagListVisitor;
@@ -59,9 +60,3 @@ impl TagList {
self.0
}
}
impl From<Vec<String>> for TagList {
fn from(value: Vec<String>) -> Self {
Self(value)
}
}