From 87223f7952a031ee409c415ff7f69c18878f89a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sat, 2 Apr 2022 13:31:51 +0200
Subject: [PATCH] http_protocol: add AnnounceEvent::as_str, run cargo fmt

---
 aquatic_http_protocol/src/common.rs  | 11 +++++++++++
 aquatic_http_protocol/src/request.rs | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/aquatic_http_protocol/src/common.rs b/aquatic_http_protocol/src/common.rs
index bf77550..91b6a5f 100644
--- a/aquatic_http_protocol/src/common.rs
+++ b/aquatic_http_protocol/src/common.rs
@@ -52,6 +52,17 @@ impl FromStr for AnnounceEvent {
     }
 }
 
+impl AnnounceEvent {
+    pub fn as_str(&self) -> Option<&str> {
+        match self {
+            Self::Started => Some("started"),
+            Self::Stopped => Some("stopped"),
+            Self::Completed => Some("completed"),
+            Self::Empty => None,
+        }
+    }
+}
+
 #[cfg(test)]
 impl quickcheck::Arbitrary for InfoHash {
     fn arbitrary(g: &mut quickcheck::Gen) -> Self {
diff --git a/aquatic_http_protocol/src/request.rs b/aquatic_http_protocol/src/request.rs
index 133d1c6..d61a242 100644
--- a/aquatic_http_protocol/src/request.rs
+++ b/aquatic_http_protocol/src/request.rs
@@ -61,7 +61,7 @@ impl AnnounceRequest {
     pub fn from_query_string(query_string: &str) -> anyhow::Result<Self> {
         // -- Parse key-value pairs
 
-        let mut opt_info_hash= None;
+        let mut opt_info_hash = None;
         let mut opt_peer_id = None;
         let mut opt_port = None;
         let mut opt_bytes_left = None;
@@ -283,9 +283,13 @@ impl Request {
         let query_string = split_parts.next().with_context(|| "no query string")?;
 
         if location == "/announce" {
-            Ok(Request::Announce(AnnounceRequest::from_query_string(query_string)?))
+            Ok(Request::Announce(AnnounceRequest::from_query_string(
+                query_string,
+            )?))
         } else {
-            Ok(Request::Scrape(ScrapeRequest::from_query_string(query_string)?))
+            Ok(Request::Scrape(ScrapeRequest::from_query_string(
+                query_string,
+            )?))
         }
     }