remote index_path from settings #51

kellnr · Oct 15, 2023 · 06b597c · 06b597c
1 parent a79bb27
commit 06b597c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/crates/db/migration/src/m20220101_000004_create_table.rs b/crates/db/migration/src/m20220101_000004_create_table.rs
@@ -149,14 +149,20 @@ impl MigrationTrait for Migration {
     }
 }
 
+pub fn index_path(settings: &Settings) -> std::path::PathBuf {
+    std::path::PathBuf::from(&settings.data_dir)
+        .join("git")
+        .join("index")
+}
+
 async fn fill_new_columns(
     db: &SchemaManagerConnection<'_>,
     settings: &Settings,
 ) -> Result<(), DbErr> {
     debug!("Filling new columns");
     use crate::m20220101_000004_create_table_entities::{crate_meta, krate};
 
-    let crate_path = settings.index_path();
+    let crate_path = index_path(settings);
     let crates = crate_meta::Entity::find()
         .find_also_related(krate::Entity)
         .all(db)

diff --git a/crates/db/migration/src/m20220101_000005_create_table.rs b/crates/db/migration/src/m20220101_000005_create_table.rs
@@ -350,11 +350,17 @@ impl MigrationTrait for Migration {
     }
 }
 
+pub fn index_path(settings: &Settings) -> std::path::PathBuf {
+    std::path::PathBuf::from(&settings.data_dir)
+        .join("git")
+        .join("index")
+}
+
 async fn fill_new_columns(
     db: &SchemaManagerConnection<'_>,
     settings: &Settings,
 ) -> Result<(), DbErr> {
-    let crate_path = settings.index_path();
+    let crate_path = index_path(settings);
     let crates = crate_meta::Entity::find()
         .find_also_related(krate::Entity)
         .all(db)

diff --git a/crates/settings/src/lib.rs b/crates/settings/src/lib.rs
@@ -122,12 +122,6 @@ impl Settings {
             .ok_or_else(|| ConfigError::Message("Invalid UTF-8 string".to_string()))
     }
 
-    pub fn index_path(&self) -> path::PathBuf {
-        path::PathBuf::from(&self.data_dir)
-            .join("git")
-            .join("index")
-    }
-
     pub fn bin_path(&self) -> path::PathBuf {
         path::PathBuf::from(&self.data_dir).join("crates")
     }
@@ -148,12 +142,6 @@ impl Settings {
         path::PathBuf::from(&self.data_dir).join("git")
     }
 
-    pub fn crates_io_index_path(&self) -> path::PathBuf {
-        path::PathBuf::from(&self.data_dir)
-            .join("git")
-            .join("cratesio")
-    }
-
     pub fn crates_io_bin_path(&self) -> path::PathBuf {
         path::PathBuf::from(&self.data_dir).join("cratesio")
     }