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

use human-readable bytes format

Browse source
This commit is contained in:
yggverse 2025-02-03 01:47:50 +02:00
parent a5fbca2ace
commit dc2300b1c0
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/client/connection/response.rs
View file

@ -1,5 +1,3 @@
//! Read and parse Gemini response as Object
pub mod certificate; pub mod certificate;
pub mod data; // @TODO deprecated pub mod data; // @TODO deprecated
pub mod error; pub mod error;
@ -19,7 +17,7 @@ use super::Connection;
use gio::{Cancellable, IOStream}; use gio::{Cancellable, IOStream};
use glib::{object::IsA, Priority}; use glib::{object::IsA, Priority};
const HEADER_LEN: usize = 0x400; // 1024 const HEADER_LEN: usize = 1024;
/// https://geminiprotocol.net/docs/protocol-specification.gmi#responses /// https://geminiprotocol.net/docs/protocol-specification.gmi#responses
pub enum Response { pub enum Response {
@ -48,23 +46,23 @@ impl Response {
match result { match result {
Ok(buffer) => match buffer.first() { Ok(buffer) => match buffer.first() {
Some(byte) => match byte { Some(byte) => match byte {
0x31 => match Input::from_utf8(&buffer) { b'1' => match Input::from_utf8(&buffer) {
Ok(input) => Ok(Self::Input(input)), Ok(input) => Ok(Self::Input(input)),
Err(e) => Err(Error::Input(e)), Err(e) => Err(Error::Input(e)),
}, },
0x32 => match Success::from_utf8(&buffer) { b'2' => match Success::from_utf8(&buffer) {
Ok(success) => Ok(Self::Success(success)), Ok(success) => Ok(Self::Success(success)),
Err(e) => Err(Error::Success(e)), Err(e) => Err(Error::Success(e)),
}, },
0x33 => match Redirect::from_utf8(&buffer) { b'3' => match Redirect::from_utf8(&buffer) {
Ok(redirect) => Ok(Self::Redirect(redirect)), Ok(redirect) => Ok(Self::Redirect(redirect)),
Err(e) => Err(Error::Redirect(e)), Err(e) => Err(Error::Redirect(e)),
}, },
0x34 | 0x35 => match Failure::from_utf8(&buffer) { b'4' | b'5' => match Failure::from_utf8(&buffer) {
Ok(failure) => Ok(Self::Failure(failure)), Ok(failure) => Ok(Self::Failure(failure)),
Err(e) => Err(Error::Failure(e)), Err(e) => Err(Error::Failure(e)),
}, },
0x36 => match Certificate::from_utf8(&buffer) { b'6' => match Certificate::from_utf8(&buffer) {
Ok(certificate) => Ok(Self::Certificate(certificate)), Ok(certificate) => Ok(Self::Certificate(certificate)),
Err(e) => Err(Error::Certificate(e)), Err(e) => Err(Error::Certificate(e)),
}, },

4
src/client/connection/response/failure.rs
View file

@ -22,11 +22,11 @@ impl Failure {
pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> { pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
match buffer.first() { match buffer.first() {
Some(byte) => match byte { Some(byte) => match byte {
0x34 => match Temporary::from_utf8(buffer) { b'4' => match Temporary::from_utf8(buffer) {
Ok(input) => Ok(Self::Temporary(input)), Ok(input) => Ok(Self::Temporary(input)),
Err(e) => Err(Error::Temporary(e)), Err(e) => Err(Error::Temporary(e)),
}, },
0x35 => match Permanent::from_utf8(buffer) { b'5' => match Permanent::from_utf8(buffer) {
Ok(failure) => Ok(Self::Permanent(failure)), Ok(failure) => Ok(Self::Permanent(failure)),
Err(e) => Err(Error::Permanent(e)), Err(e) => Err(Error::Permanent(e)),
}, },