Extract index module

Author: Turbo87

src/index.rs

@@ -0,0 +1,41 @@
+use crate::models;
+use crate::util::diesel::Conn;
+use anyhow::Context;
+use diesel::prelude::*;
+use sentry::Level;
+
+#[instrument(skip_all, fields(krate.name = ?name))]
+pub fn get_index_data(name: &str, conn: &mut impl Conn) -> anyhow::Result<Option<String>> {
+    debug!("Looking up crate by name");
+    let Some(krate): Option<models::Crate> =
+        models::Crate::by_exact_name(name).first(conn).optional()?
+    else {
+        return Ok(None);
+    };
+
+    debug!("Gathering remaining index data");
+    let crates = krate
+        .index_metadata(conn)
+        .context("Failed to gather index metadata")?;
+
+    // This can sometimes happen when we delete versions upon owner request
+    // but don't realize that the crate is now left with no versions at all.
+    //
+    // In this case we will delete the crate from the index and log a warning to
+    // Sentry to clean this up in the database.
+    if crates.is_empty() {
+        let message = format!("Crate `{name}` has no versions left");
+        sentry::capture_message(&message, Level::Warning);
+
+        return Ok(None);
+    }
+
+    debug!("Serializing index data");
+    let mut bytes = Vec::new();
+    crates_io_index::write_crates(&crates, &mut bytes)
+        .context("Failed to serialize index metadata")?;
+
+    let str = String::from_utf8(bytes).context("Failed to decode index metadata as utf8")?;
+
+    Ok(Some(str))
+}

src/lib.rs

@@ -42,6 +42,7 @@ pub mod email;
 pub mod external_urls;
 pub mod fastly;
 pub mod headers;
+pub mod index;
 mod licenses;
 pub mod metrics;
 pub mod middleware;

src/worker/jobs/index/sync.rs

@@ -1,13 +1,10 @@
-use crate::models;
+use crate::index::get_index_data;
 use crate::tasks::spawn_blocking;
-use crate::util::diesel::Conn;
 use crate::worker::Environment;
 use anyhow::Context;
 use crates_io_index::Repository;
 use crates_io_worker::BackgroundJob;
-use diesel::{OptionalExtension, RunQueryDsl};
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
-use sentry::Level;
 use std::fs;
 use std::fs::File;
 use std::io::{ErrorKind, Write};
@@ -126,39 +123,3 @@ impl BackgroundJob for SyncToSparseIndex {
         Ok(())
     }
 }
-
-#[instrument(skip_all, fields(krate.name = ?name))]
-fn get_index_data(name: &str, conn: &mut impl Conn) -> anyhow::Result<Option<String>> {
-    debug!("Looking up crate by name");
-    let Some(krate): Option<models::Crate> =
-        models::Crate::by_exact_name(name).first(conn).optional()?
-    else {
-        return Ok(None);
-    };
-
-    debug!("Gathering remaining index data");
-    let crates = krate
-        .index_metadata(conn)
-        .context("Failed to gather index metadata")?;
-
-    // This can sometimes happen when we delete versions upon owner request
-    // but don't realize that the crate is now left with no versions at all.
-    //
-    // In this case we will delete the crate from the index and log a warning to
-    // Sentry to clean this up in the database.
-    if crates.is_empty() {
-        let message = format!("Crate `{name}` has no versions left");
-        sentry::capture_message(&message, Level::Warning);
-
-        return Ok(None);
-    }
-
-    debug!("Serializing index data");
-    let mut bytes = Vec::new();
-    crates_io_index::write_crates(&crates, &mut bytes)
-        .context("Failed to serialize index metadata")?;
-
-    let str = String::from_utf8(bytes).context("Failed to decode index metadata as utf8")?;
-
-    Ok(Some(str))
-}