From 08319e0dc91c9ac3fc24f442321ce0ab3f2a09f8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Mon, 9 May 2022 23:04:44 +0200
Subject: [PATCH] use api-client::save

---
 Cargo.lock    | 11 +++++------
 Cargo.toml    |  6 +-----
 src/backup.rs | 14 +++-----------
 src/main.rs   |  2 --
 src/store.rs  | 25 +++----------------------
 5 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10ea3a1..564a8cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,14 +30,10 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 name = "backup"
 version = "0.1.0"
 dependencies = [
- "bytes",
  "demostf-client",
  "dotenv",
  "futures-util",
- "hex",
  "main_error",
- "md5",
- "serde",
  "thiserror",
  "tokio",
  "tracing",
@@ -76,18 +72,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "demostf-client"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba6215021299e2f440f91c6c32bb5dd8f19ae7e94c9c692124f52daa9ec5b57"
+checksum = "0ec005bc832bfc50b85c2f70c11342d6e0f5ed125464a7e70a1109fef32465b6"
 dependencies = [
  "bytes",
  "futures-util",
  "hex",
+ "md5",
  "reqwest",
  "serde",
  "steamid-ng",
  "thiserror",
  "time",
+ "tinyvec",
+ "tracing",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index eaaae8f..651416d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,17 +5,13 @@ authors = ["Robin Appelman <robin@icewind.nl>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0.136", features = ["derive"] }
 thiserror = "1.0.30"
-md5 = "0.7.0"
-hex = "0.4.3"
 dotenv = "0.15.0"
 main_error = "0.1.2"
-demostf-client = { version = "0.3.1", default-features = false, features = ["rustls-tls"] }
+demostf-client = { version = "0.3.3", default-features = false, features = ["rustls-tls"] }
 tokio = { version = "1.17.0", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1.33"
 tracing-subscriber = "0.3.11"
-bytes = "1.1.0"
 futures-util = "0.3.21"
 
 [profile.release]
diff --git a/src/backup.rs b/src/backup.rs
index c9ddded..bd9476d 100644
--- a/src/backup.rs
+++ b/src/backup.rs
@@ -19,19 +19,11 @@ impl Backup {
     #[instrument(skip_all, fields(demo.id = demo.id, demo.name = name))]
     async fn backup_demo(&self, name: &str, demo: &Demo) -> Result<(), Error> {
         info!("backing up");
-        let chunks = demo.download(&self.client).await?;
 
-        let digest = self.store.store(name, chunks).await?;
+        let mut file = self.store.create(name).await?;
 
-        if digest == demo.hash || digest == [0; 16] {
-            Ok(())
-        } else {
-            let _ = self.store.remove(name);
-            Err(Error::DigestMismatch {
-                expected: demo.hash,
-                got: digest,
-            })
-        }
+        demo.save(&self.client, &mut file).await?;
+        Ok(())
     }
 
     #[instrument(skip(self))]
diff --git a/src/main.rs b/src/main.rs
index aa84c19..7effa1b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,8 +16,6 @@ pub enum Error {
     Request(#[from] std::io::Error),
     #[error(transparent)]
     Api(#[from] demostf_client::Error),
-    #[error("MD5 digest mismatch for downloaded demo, expected {expected:?}, received {got:?}")]
-    DigestMismatch { expected: [u8; 16], got: [u8; 16] },
 }
 
 #[tokio::main]
diff --git a/src/store.rs b/src/store.rs
index 9f77b0a..e8f110b 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -1,13 +1,8 @@
 use crate::Error;
-use bytes::Bytes;
-use futures_util::{Stream, StreamExt};
-use md5::Context;
 use std::fs;
 use std::fs::{File, Permissions};
-use std::io::Write;
 use std::os::unix::fs::PermissionsExt;
 use std::path::{Path, PathBuf};
-use tokio::pin;
 
 pub struct Store {
     basedir: PathBuf,
@@ -20,28 +15,14 @@ impl Store {
         }
     }
 
-    pub async fn store(
-        &self,
-        name: &str,
-        data: impl Stream<Item = Result<Bytes, demostf_client::Error>>,
-    ) -> Result<[u8; 16], Error> {
+    pub async fn create(&self, name: &str) -> Result<File, Error> {
         let path = self.generate_path(name);
         fs::create_dir_all(path.parent().unwrap())?;
 
-        let mut file = File::create(&path)?;
-
-        let mut context = Context::new();
-
-        pin!(data);
-        // copy the file and compute the digest was we go
-        while let Some(chunk) = data.next().await {
-            let chunk = chunk?;
-            context.consume(&chunk);
-            file.write_all(&chunk)?;
-        }
+        let file = File::create(&path)?;
         file.set_permissions(Permissions::from_mode(0o644))?;
 
-        Ok(context.compute().0)
+        Ok(file)
     }
 
     pub fn exists(&self, name: &str) -> bool {