YGGverse/ggemini
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemini.git synced 2026-03-31 17:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove extra conversions

Browse source
This commit is contained in:
yggverse 2025-01-18 02:36:08 +02:00
parent b5e864e807
commit c5aada49b4
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/client/connection/response/meta/mime.rs
View file

@ -3,7 +3,7 @@
pub mod error;
pub use error::Error;
use glib::{GString, Regex, RegexCompileFlags, RegexMatchFlags};
use glib::{Regex, RegexCompileFlags, RegexMatchFlags};
/// MIME type holder for `Response` (by [Gemtext specification](https://geminiprotocol.net/docs/gemtext-specification.gmi#media-type-parameters))
/// * the value stored in lowercase
@ -29,22 +29,22 @@ impl Mime {
// Parse meta bytes only
match buffer.get(..if len > MAX_LEN { MAX_LEN } else { len }) {
Some(value) => match GString::from_utf8(value.into()) {
Ok(string) => Self::from_string(&string),
Some(utf8) => match std::str::from_utf8(utf8) {
Ok(s) => Self::from_string(s),
Err(e) => Err(Error::Decode(e)),
},
None => Err(Error::Protocol),
}
}
/// Create new `Self` from string that includes **header**
/// Create new `Self` from `str::str` that includes **header**
/// * return `None` for non 2* [status codes](https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes)
pub fn from_string(subject: &str) -> Result<Option<Self>, Error> {
if !subject.starts_with("2") {
pub fn from_string(s: &str) -> Result<Option<Self>, Error> {
if !s.starts_with("2") {
return Ok(None);
}
match parse(subject) {
Some(value) => Ok(Some(Self(value.to_lowercase()))),
match parse(s) {
Some(v) => Ok(Some(Self(v.to_lowercase()))),
None => Err(Error::Undefined),
}
}
@ -58,10 +58,10 @@ impl Mime {
}
/// Extract MIME type from from string that includes **header**
pub fn parse(value: &str) -> Option<String> {
pub fn parse(s: &str) -> Option<String> {
Regex::split_simple(
r"^2\d{1}\s([^\/]+\/[^\s;]+)",
value,
s,
RegexCompileFlags::DEFAULT,
RegexMatchFlags::DEFAULT,
)

8
src/client/connection/response/meta/mime/error.rs
View file

@ -1,14 +1,12 @@
use std::fmt::{Display, Formatter, Result};
#[derive(Debug)]
pub enum Error {
Decode(std::string::FromUtf8Error),
Decode(std::str::Utf8Error),
Protocol,
Undefined,
}
impl Display for Error {
fn fmt(&self, f: &mut Formatter) -> Result {
impl std::fmt::Display for Error {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Self::Decode(e) => {
write!(f, "Decode error: {e}")