From 7f3930b8a0eca40a0393de7e24b08dc9cdf7b3d0 Mon Sep 17 00:00:00 2001
From: zzlk <2418897+zzlk@users.noreply.github.com>
Date: Fri, 14 Feb 2025 13:57:13 -0800
Subject: [PATCH] fix backblaze pumper (#59)

---
 crates/bwmapserver/src/pumpers.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/crates/bwmapserver/src/pumpers.rs b/crates/bwmapserver/src/pumpers.rs
index b719a71..9cc27e2 100644
--- a/crates/bwmapserver/src/pumpers.rs
+++ b/crates/bwmapserver/src/pumpers.rs
@@ -7,9 +7,7 @@ use tokio::io::AsyncReadExt;
 use tracing::{error, info, warn};
 
 pub async fn start_gsfs_pumper(client: reqwest::Client) -> Result<()> {
-    if let Err(e) = tokio::fs::create_dir_all("./pending/gsfs").await {
-        error!("failed to create pending/gsfs directory: {e}");
-    }
+    tokio::fs::create_dir_all("./pending/gsfs").await?;
 
     let Ok(endpoint) = std::env::var("GSFSFE_ENDPOINT") else {
         warn!("GSFSFE_ENDPOINT is not set, maps will NOT be uploaded to GSFS!!!");
@@ -68,9 +66,7 @@ pub async fn start_gsfs_pumper(client: reqwest::Client) -> Result<()> {
 pub async fn start_backblaze_pumper(client: reqwest::Client) -> Result<()> {
     info!("starting backblaze pumper");
 
-    if let Err(e) = tokio::fs::create_dir_all("./pending/backblaze").await {
-        error!("failed to create pending directory: {e}");
-    }
+    tokio::fs::create_dir_all("./pending/backblaze").await?;
 
     match std::env::var("BACKBLAZE_DISABLED") {
         Ok(v) if v == "true" => {
@@ -116,7 +112,7 @@ pub async fn start_backblaze_pumper(client: reqwest::Client) -> Result<()> {
             loop {
                 tokio::time::sleep(std::time::Duration::from_secs(1)).await;
 
-                let mut entries = match tokio::fs::read_dir("./pending").await {
+                let mut entries = match tokio::fs::read_dir("./pending/backblaze").await {
                     Ok(v) => v,
                     Err(e) => {
                         error!("could not readdir: {e:?}");
@@ -125,12 +121,6 @@ pub async fn start_backblaze_pumper(client: reqwest::Client) -> Result<()> {
                 };
 
                 while let Ok(Some(entry)) = entries.next_entry().await {
-                    if let Ok(filetype) = entry.file_type().await {
-                        if !filetype.is_file() {
-                            continue;
-                        }
-                    }
-
                     let Ok(filename) = entry.file_name().into_string() else {
                         error!("could not stringify filename: {:?}", entry.file_name());
                         continue;