From 063780db3a35f67f58b22d261dfe404796f3d62c Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sat, 29 May 2021 14:13:36 -0400
Subject: [PATCH] this might be close...

---
 src/buckets/bucket_client.rs |  2 +-
 src/w2l_inference_job.rs     | 23 +++--------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/buckets/bucket_client.rs b/src/buckets/bucket_client.rs
index ad12e894f9..912d0fcc60 100644
--- a/src/buckets/bucket_client.rs
+++ b/src/buckets/bucket_client.rs
@@ -134,7 +134,7 @@ impl BucketClient {
   pub async fn upload_filename_with_content_type<P: AsRef<Path>>(
     &self,
     object_path: P,
-    filename: P,
+    filename: &Path,
     content_type: &str
   ) -> anyhow::Result<()> {
     let object_path_str = object_path.as_ref()
diff --git a/src/w2l_inference_job.rs b/src/w2l_inference_job.rs
index bf526e20fc..68df41a0be 100644
--- a/src/w2l_inference_job.rs
+++ b/src/w2l_inference_job.rs
@@ -461,14 +461,6 @@ async fn process_job(inferencer: &Inferencer, job: &W2lInferenceJobRecord) -> An
 
   let file_metadata = read_metadata_file(&output_metadata_fs_path)?;
 
-  if true {
-    info!("FAKE DONE");
-    thread::sleep(Duration::from_millis(50000));
-    return Ok(());
-  }
-
-
-
   // ==================== UPLOAD TO BUCKETS ==================== //
 
   let result_object_path = inferencer.bucket_path_unifier.w2l_inference_video_output_path(
@@ -484,34 +476,25 @@ async fn process_job(inferencer: &Inferencer, job: &W2lInferenceJobRecord) -> An
 
   inferencer.public_bucket_client.upload_filename_with_content_type(
     &result_object_path,
-    &video_or_image_path,
+    &output_video_fs_path,
     original_mime_type)
     .await?;
 
   // ==================== SAVE RECORDS ==================== //
 
-  let template_type = if file_metadata.is_video { "video" } else { "image" };
-
   info!("Saving w2l inference record...");
   let id = insert_w2l_result(
     &inferencer.mysql_pool,
-    template_type,
     job,
-    &private_bucket_hash,
-    &full_object_path,
-    &full_object_path_cached_faces,
-    maybe_image_preview_object_name.as_deref(),
-    maybe_video_preview_object_name.as_deref(),
+    &result_object_path,
     file_metadata.file_size_bytes,
     file_metadata.mimetype.as_deref(),
     file_metadata.width,
     file_metadata.height,
-    file_metadata.num_frames,
-    file_metadata.fps.unwrap_or(0.0f32),
     file_metadata.duration_millis.unwrap_or(0))
     .await?;
 
-  info!("Job {} complete success! Downloaded, processed, and uploaded. Saved model record: {}",
+  info!("Job {} complete success! Downloaded, ran inference, and uploaded. Saved model record: {}",
         job.id, id);
 
   mark_w2l_inference_job_done(&inferencer.mysql_pool, job, true).await?;