simpler

Author: drahnr

progenitor-client/src/progenitor_client.rs

@@ -95,36 +95,27 @@ impl std::fmt::Display for FilenameError {
 impl std::error::Error for FilenameError {}
 
 /// A validated MIME content-type for form parts.
-///
-/// Content types are validated to have a valid `type/subtype` format.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ContentType(String);
 
 impl ContentType {
     /// Create a new content-type, validating the format.
-    ///
-    /// # Errors
-    /// Returns an error if the content-type doesn't follow the `type/subtype` format.
     pub fn new(content_type: impl Into<String>) -> Result<Self, ContentTypeError> {
         let content_type = content_type.into();
-        // Basic validation: must contain exactly one '/' and non-empty parts
-        let parts: Vec<&str> = content_type.split('/').collect();
-        if parts.len() != 2 {
+        let Some((type_part, rest)) = content_type.split_once('/') else {
             return Err(ContentTypeError::InvalidFormat);
-        }
-        // Get type and subtype (subtype may have parameters like charset)
-        let type_part = parts[0].trim();
-        let subtype_part = parts[1].split(';').next().unwrap_or("").trim();
-        if type_part.is_empty() || subtype_part.is_empty() {
+        };
+        let subtype_part = rest.split_once(';').map_or(rest, |(s, _)| s);
+        if type_part.trim().is_empty()
+            || subtype_part.trim().is_empty()
+            || subtype_part.contains('/')
+        {
             return Err(ContentTypeError::InvalidFormat);
         }
         Ok(Self(content_type))
     }
 
     /// Create a content-type without validation.
-    ///
-    /// # Safety
-    /// The caller must ensure the content-type is valid.
     pub fn new_unchecked(content_type: impl Into<String>) -> Self {
         Self(content_type.into())
     }
@@ -139,34 +130,19 @@ impl ContentType {
         self.0
     }
 
-    /// Common content type: `application/json`
-    pub fn json() -> Self {
-        Self("application/json".to_string())
-    }
-
-    /// Common content type: `application/octet-stream`
-    pub fn octet_stream() -> Self {
-        Self("application/octet-stream".to_string())
-    }
-
-    /// Common content type: `text/plain`
-    pub fn text_plain() -> Self {
-        Self("text/plain".to_string())
-    }
-
-    /// Common content type: `application/pdf`
-    pub fn pdf() -> Self {
-        Self("application/pdf".to_string())
+    /// Create `application/{subtype}` content type.
+    pub fn application(subtype: impl AsRef<str>) -> Self {
+        Self(format!("application/{}", subtype.as_ref()))
     }
 
-    /// Common content type: `image/png`
-    pub fn png() -> Self {
-        Self("image/png".to_string())
+    /// Create `text/{subtype}` content type.
+    pub fn text(subtype: impl AsRef<str>) -> Self {
+        Self(format!("text/{}", subtype.as_ref()))
     }
 
-    /// Common content type: `image/jpeg`
-    pub fn jpeg() -> Self {
-        Self("image/jpeg".to_string())
+    /// Create `image/{subtype}` content type.
+    pub fn image(subtype: impl AsRef<str>) -> Self {
+        Self(format!("image/{}", subtype.as_ref()))
     }
 }
 
@@ -286,7 +262,7 @@ impl TextFormPart {
     pub fn json<T: serde::Serialize>(value: &T) -> Result<Self, serde_json::Error> {
         Ok(Self {
             value: serde_json::to_string(value)?,
-            content_type: Some(ContentType::json()),
+            content_type: Some(ContentType::application("json")),
         })
     }