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

Revert "hold raw header string"

Browse source 
This reverts commit 5bb52fbd8c.
This commit is contained in:
yggverse 2025-03-19 15:06:53 +02:00
parent 3f968d87b1
commit 9eb21bb6a3
11 changed files with 78 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/client/connection/response/failure/permanent.rs
View file

@ -10,30 +10,15 @@ const BAD_REQUEST: (u8, &str) = (59, "bad-request");
/// https://geminiprotocol.net/docs/protocol-specification.gmi#permanent-failure
pub enum Permanent {
/// https://geminiprotocol.net/docs/protocol-specification.gmi#status-50
Default {
header: String,
message: Option<String>,
},
Default { message: Option<String> },
/// https://geminiprotocol.net/docs/protocol-specification.gmi#status-51-not-found
NotFound {
header: String,
message: Option<String>,
},
NotFound { message: Option<String> },
/// https://geminiprotocol.net/docs/protocol-specification.gmi#status-52-gone
Gone {
header: String,
message: Option<String>,
},
Gone { message: Option<String> },
/// https://geminiprotocol.net/docs/protocol-specification.gmi#status-53-proxy-request-refused
ProxyRequestRefused {
header: String,
message: Option<String>,
},
ProxyRequestRefused { message: Option<String> },
/// https://geminiprotocol.net/docs/protocol-specification.gmi#status-59-bad-request
BadRequest {
header: String,
message: Option<String>,
},
BadRequest { message: Option<String> },
}
impl Permanent {
@ -42,14 +27,7 @@ impl Permanent {
/// Create new `Self` from buffer include header bytes
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
use std::str::FromStr;
let len = buffer.len();
match std::str::from_utf8(
&buffer[..if len > super::super::HEADER_LEN {
super::super::HEADER_LEN
} else {
len
}],
) {
match std::str::from_utf8(buffer) {
Ok(header) => Self::from_str(header),
Err(e) => Err(Error::Utf8Error(e)),
}
@ -68,24 +46,13 @@ impl Permanent {
.0
}
pub fn header(&self) -> &str {
match self {
Self::Default { header, .. }
| Self::NotFound { header, .. }
| Self::Gone { header, .. }
| Self::ProxyRequestRefused { header, .. }
| Self::BadRequest { header, .. } => header,
}
.as_str()
}
pub fn message(&self) -> Option<&str> {
match self {
Self::Default { message, .. }
| Self::NotFound { message, .. }
| Self::Gone { message, .. }
| Self::ProxyRequestRefused { message, .. }
| Self::BadRequest { message, .. } => message,
Self::Default { message } => message,
Self::NotFound { message } => message,
Self::Gone { message } => message,
Self::ProxyRequestRefused { message } => message,
Self::BadRequest { message } => message,
}
.as_deref()
}
@ -113,31 +80,26 @@ impl std::str::FromStr for Permanent {
fn from_str(header: &str) -> Result<Self, Self::Err> {
if let Some(postfix) = header.strip_prefix("50") {
return Ok(Self::Default {
header: header.to_string(),
message: message(postfix),
});
}
if let Some(postfix) = header.strip_prefix("51") {
return Ok(Self::NotFound {
header: header.to_string(),
message: message(postfix),
});
}
if let Some(postfix) = header.strip_prefix("52") {
return Ok(Self::Gone {
header: header.to_string(),
message: message(postfix),
});
}
if let Some(postfix) = header.strip_prefix("53") {
return Ok(Self::ProxyRequestRefused {
header: header.to_string(),
message: message(postfix),
});
}
if let Some(postfix) = header.strip_prefix("59") {
return Ok(Self::BadRequest {
header: header.to_string(),
message: message(postfix),
});
}