allow downloading individual files from bundle

src/store.rs

@@ -10,12 +10,15 @@ use rand::{
     thread_rng, Rng,
 };
 use serde::{Deserialize, Serialize};
+use serde_with::skip_serializing_none;
 use time::OffsetDateTime;
 use tokio::{
     fs::File,
     io::{AsyncReadExt, AsyncWriteExt},
 };
 
+use crate::upload::UploadedFile;
+
 const STATE_FILE_NAME: &str = "files.json";
 const MAX_STORAGE_FILES: usize = 1024;
 
@@ -33,55 +36,16 @@ pub fn is_valid_storage_code(s: &str) -> bool {
         .all(|c| c.is_ascii_alphanumeric() || c == &b'-')
 }
 
+#[skip_serializing_none]
 #[derive(Clone, Deserialize, Serialize)]
 pub struct StoredFile {
     pub name: String,
     pub size: u64,
-    #[serde(with = "timestamp")]
+    #[serde(with = "crate::timestamp")]
     pub modtime: OffsetDateTime,
-    #[serde(with = "timestamp")]
+    #[serde(with = "crate::timestamp")]
     pub expiry: OffsetDateTime,
-}
-
-pub(crate) mod timestamp {
-    use core::fmt;
-
-    use serde::{de::Visitor, Deserializer, Serializer};
-    use time::OffsetDateTime;
-
-    pub(crate) fn serialize<S: Serializer>(
-        time: &OffsetDateTime,
-        ser: S,
-    ) -> Result<S::Ok, S::Error> {
-        ser.serialize_i64(time.unix_timestamp())
-    }
-
-    struct I64Visitor;
-
-    impl<'de> Visitor<'de> for I64Visitor {
-        type Value = i64;
-
-        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            write!(formatter, "an integer")
-        }
-
-        fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E> {
-            Ok(v)
-        }
-
-        fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E> {
-            Ok(v as i64)
-        }
-    }
-
-    pub(crate) fn deserialize<'de, D: Deserializer<'de>>(
-        de: D,
-    ) -> Result<OffsetDateTime, D::Error> {
-        Ok(
-            OffsetDateTime::from_unix_timestamp(de.deserialize_i64(I64Visitor)?)
-                .unwrap_or_else(|_| OffsetDateTime::now_utc()),
-        )
-    }
+    pub contents: Option<Vec<UploadedFile>>,
 }
 
 async fn is_valid_entry(key: &str, info: &StoredFile, storage_dir: &Path) -> bool {