diff --git a/server/texture-sync-server/src/model/sha256.rs b/server/texture-sync-server/src/model/sha256.rs index 0aed6ba..744319e 100644 --- a/server/texture-sync-server/src/model/sha256.rs +++ b/server/texture-sync-server/src/model/sha256.rs @@ -1,5 +1,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer}; +use std::fmt; + #[derive(Clone, Debug, PartialOrd, Ord, Deserialize, Serialize, Eq, Hash, PartialEq)] pub struct Sha256(#[serde(serialize_with = "as_hex", deserialize_with = "from_hex")] pub [u8; 32]); @@ -49,6 +51,15 @@ impl Sha256 { } } +impl fmt::Display for Sha256 { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + for digit in self.0.iter() { + write!(f, "{:02X}", digit)? + } + Ok(()) + } +} + fn as_hex(hash: &[u8; 32], serializer: S) -> Result where S: Serializer, diff --git a/server/texture-sync-server/src/server_state.rs b/server/texture-sync-server/src/server_state.rs index 8bd1ff4..be14d43 100644 --- a/server/texture-sync-server/src/server_state.rs +++ b/server/texture-sync-server/src/server_state.rs @@ -99,12 +99,7 @@ impl ProtocolHandler for ServerState { let data = data_store.read_texture_file_by_hash(&hash); - println!( - "{}: Texture File: '{:?}' found: {}", - con, - &hash, - data.is_ok() - ); + println!("{}: Texture File: '{}' found: {}", con, &hash, data.is_ok()); Ok(data?) } @@ -123,7 +118,7 @@ impl ProtocolHandler for ServerState { let preview = data_store.get_texture_preview(&hash, format); println!( - "{}: Texture Preview: '{:?}' found: {}", + "{}: Texture Preview: '{}' found: {}", con, &hash, preview.is_ok()