🐛 Add back reporting & anti-race waits

hackclub · Sep 11, 2024 · f706ef6 · f706ef6
1 parent b019a44
commit f706ef6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "replit-takeout"
-version = "1.7.11"
+version = "1.7.13"
 edition = "2021"
 authors = ["Ben Dixon <malted@malted.dev>"]
 

diff --git a/examples/full_flow.rs b/examples/full_flow.rs
@@ -40,9 +40,9 @@ async fn main() -> Result<()> {
         log::error!("Error with `{}`'s download: {err:#?}", user.fields.username);
 
         user.fields.status = ProcessState::ErroredMain;
-        //arst airtable::update_records(vec![user.clone()]).await?;
+        airtable::update_records(vec![user.clone()]).await?;
 
-        // user.fields.failed_ids = errored.join(",");
+        user.fields.failed_ids = errored.join(",");
 
         // send_email(
         //     &user.fields.email,

diff --git a/src/main.rs b/src/main.rs
@@ -223,9 +223,8 @@ async fn airtable_loop() -> Result<()> {
             error!("Error with `{}`'s download: {err:#?}", user.fields.username);
 
             user.fields.status = ProcessState::ErroredMain;
-            //arst airtable::update_records(vec![user.clone()]).await?;
-
-            // user.fields.failed_ids = errored.join(",");
+            airtable::update_records(vec![user.clone()]).await?;
+            user.fields.failed_ids = errored.join(",");
 
             // send_email(
             //     &user.fields.email,

diff --git a/src/replit_graphql.rs b/src/replit_graphql.rs
@@ -195,7 +195,7 @@ impl ProfileRepls {
     ) -> Result<()> {
         synced_user.fields.status = ProcessState::CollectingRepls;
         synced_user.fields.started_at = Some(chrono::offset::Utc::now());
-        //arst airtable::update_records(vec![synced_user.clone()]).await?;
+       airtable::update_records(vec![synced_user.clone()]).await?;
 
         let client = create_client(token, None)?;
 
@@ -225,7 +225,7 @@ impl ProfileRepls {
             }
 
             synced_user.fields.status = ProcessState::NoRepls;
-            //arst airtable::update_records(vec![synced_user.clone()]).await?;
+           airtable::update_records(vec![synced_user.clone()]).await?;
             return Ok(());
         }
 
@@ -342,13 +342,13 @@ impl ProfileRepls {
             );
 
             synced_user.fields.repl_count += 1;
-            //arst airtable::update_records(vec![synced_user.clone()]).await?;
+           airtable::update_records(vec![synced_user.clone()]).await?;
             progress.report(&current_user);
         }
 
         progress.completed = true;
         progress.report(&current_user);
-        //arst airtable::update_records(vec![synced_user.clone()]).await?;
+       airtable::update_records(vec![synced_user.clone()]).await?;
 
         let path = format!("repls/{}", current_user.username);
         make_zip(path.clone(), format!("repls/{}.zip", current_user.username)).await?;
@@ -365,11 +365,11 @@ impl ProfileRepls {
         let upload_result = r2::upload(upload_path.clone(), zip_path.clone()).await;
         fs::remove_file(&zip_path).await?;
         synced_user.fields.status = ProcessState::WaitingInR2;
-        //arst airtable::update_records(vec![synced_user.clone()]).await?;
+       airtable::update_records(vec![synced_user.clone()]).await?;
 
         if let Err(upload_err) = upload_result {
             synced_user.fields.status = ProcessState::ErroredR2;
-            //arst airtable::update_records(vec![synced_user.clone()]).await?;
+           airtable::update_records(vec![synced_user.clone()]).await?;
             error!("Failed to upload {upload_path} to R2");
             return Err(upload_err);
         }
@@ -433,7 +433,7 @@ impl ProfileRepls {
             synced_user.fields.failed_ids = errored.join(",");
         }
         synced_user.fields.finished_at = Some(chrono::offset::Utc::now());
-        //arst airtable::update_records(vec![synced_user]).await?;
+        airtable::update_records(vec![synced_user]).await?;
 
         Ok(())
     }