aquatic_http: deserialize AnnounceRequest.compact to bool

TODO.md

@@ -16,7 +16,7 @@
 * move stuff to common crate with ws: what about Request/InMessage etc?
 * info hashes, peer ids: check that whole deserialization and url decoding
   works as it should. There are suspicously many `\u{fffd}`
-* AnnounceRequest.compact: parse int to bool
+* AnnounceRequest.compact: handle that it is optional
 
 ## aquatic_ws
 * tests

aquatic_http/src/lib/protocol/mod.rs

@@ -74,8 +74,11 @@ pub struct AnnounceRequest {
     pub bytes_left: usize,
     #[serde(default)]
     pub event: AnnounceEvent,
-    /// FIXME: number: 0 or 1 to bool
+    /// FIXME: is optional, so should default to something, maybe `true`
-    pub compact: u8,
+    #[serde(
+        deserialize_with = "deserialize_bool_from_number"
+    )]
+    pub compact: bool,
     /// Requested number of peers to return
     pub numwant: usize,
 }

aquatic_http/src/lib/protocol/serde_helpers.rs

@@ -5,6 +5,40 @@ use serde::{Serializer, Deserializer, de::{Visitor, SeqAccess}};
 use super::{InfoHash, ResponsePeer};
 
 
+struct BoolFromNumberVisitor;
+
+impl<'de> Visitor<'de> for BoolFromNumberVisitor {
+    type Value = bool;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("1 for true, 0 for false")
+    }
+
+    #[inline]
+    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+        where E: ::serde::de::Error,
+    {
+        if value == "0" {
+            Ok(false)
+        } else if value == "1" {
+            Ok(true)
+        } else {
+            Err(E::custom(format!("not 0 or 1: {}", value)))
+        }
+    }
+}
+
+
+#[inline]
+pub fn deserialize_bool_from_number<'de, D>(
+    deserializer: D
+) -> Result<bool, D::Error>
+    where D: Deserializer<'de>
+{
+    deserializer.deserialize_any(BoolFromNumberVisitor)
+}
+
+
 struct TwentyCharStringVisitor;
 
 impl<'de> Visitor<'de> for TwentyCharStringVisitor {