src/main.rs

@@ -17,7 +17,7 @@ use nyazoom_headers::ForwardedFor;
 
 use sanitize_filename_reader_friendly::sanitize;
 
-use std::{io, net::SocketAddr, path::Path};
+use std::{io, net::SocketAddr, path::Path, time::Duration};
 
 use tokio_util::{
     compat::FuturesAsyncWriteCompatExt,
@@ -65,7 +65,7 @@ async fn main() -> io::Result<()> {
 
     let state = cache::fetch_cache().await;
 
-    sweeper::spawn_sweeper(state.clone());
+    let _ = sweeper::spawn_sweeper();
 
     // Router Setup
     let app = Router::new()
@@ -87,6 +87,7 @@ async fn main() -> io::Result<()> {
 
     // Server creation
     let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
+    tracing::debug!("listening on http://{}/", addr);
     let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
     axum::serve(
         listener,
@@ -95,8 +96,6 @@ async fn main() -> io::Result<()> {
     .await
     .unwrap();
 
-    tracing::debug!("listening on http://{}/", addr);
-
     Ok(())
 }
 

src/sweeper.rs

@@ -1,22 +1,23 @@
-use std::time::Duration;
+use tokio::task::JoinHandle;
 
-use crate::state::{AppState, AsyncRemoveRecord};
+pub fn spawn_sweeper() -> JoinHandle<!> {
+    // Spawn a repeating task that will clean files periodically
+    tokio::spawn({
+        let state = state.clone();
+        async move {
+            loop {
+                tokio::time::sleep(Duration::from_secs(15 * 60)).await;
+                tracing::info!("Cleaning Sweep!");
 
-/// Spawn a repeating task that will clean files periodically
+                let mut records = state.records.lock().await;
-pub fn spawn_sweeper(state: AppState) {
-    tokio::spawn(async move {
-        loop {
-            tokio::time::sleep(Duration::from_secs(15 * 60)).await;
-            tracing::info!("Cleaning Sweep!");
 
-            let mut records = state.records.lock().await;
+                for (key, record) in records.clone().into_iter() {
-
+                    if !record.can_be_downloaded() {
-            for (key, record) in records.clone().into_iter() {
+                        tracing::info!("culling: {:?}", record);
-                if !record.can_be_downloaded() {
+                        records.remove_record(&key).await.unwrap();
-                    tracing::info!("culling: {:?}", record);
+                    }
-                    records.remove_record(&key).await.unwrap();
                 }
             }
         }
-    });
+    })
 }