Decouple seeding from server entrypoint

Cargo.toml

@@ -23,32 +23,25 @@ axum = { version = "0.7.9", features = ["json"] }
 axum-extra = { version = "0.9.6", features = ["cookie", "typed-header"] }
 axum-server = "0.6.0"
 base64 = "0.21.7"
-bytes = "1.10.1"
 chrono = { workspace = true }
 clap = { version = "4.5.38", features = ["derive"] }
 db = { path = "crates/db" }
 dotenv = "0.15.0"
 env_logger = "0.10.2"
-futures = "0.3.31"
 http = "1.3.1"
 log = "0.4.27"
 model = { path = "crates/model" }
 oauth2 = "4.4.2"
-rand = "0.9.1"
 reqwest = { version = "0.11.27", default-features = false, features = [ "blocking", "json", "rustls-tls"] }
-rusoto_core = { version = "0.48.0", default-features = false, features = [ "rustls", ] }
-rusoto_s3 = { version = "0.48.0", default-features = false, features = [ "rustls", ] }
 serde = { workspace = true }
 serde_json = { workspace = true }
-sha2 = "0.10.9"
 tokio = { workspace = true }
 tower = { version = "0.4.13", features = ["tracing", "limit", "buffer"] }
 tower-http = { version = "0.5.2", features = ["cors", "fs", "trace"] }
 tower_governor = "0.2.0"
 tracing = "0.1.41"
 typeshare = { workspace = true }
 url = "2.5.4"
-walkdir = "2.5.0"
 
 [dev-dependencies]
 hyper = { version = "1.6.0", features = ["server"] }

Dockerfile

@@ -27,4 +27,4 @@ COPY --from=server /usr/src/app/seed seed
 COPY --from=server /usr/src/app/.well-known .well-known
 COPY --from=server /usr/src/app/target/release/server /usr/local/bin
 
-CMD server --source seed --initialize --latest-courses --skip-reviews --asset-dir assets --db-name mcgill-courses
+CMD server --db-name mcgill-courses serve --asset-dir assets

crates/db/src/initializer.rs

@@ -116,25 +116,11 @@
   async fn seed(&self) -> Result {
     info!("Seeding the database...");
 
-    let mut seeds = self.collect()?;
-
-    if self.options.latest_courses {
-      let courses = seeds
-        .clone()
-        .into_iter()
-        .filter(|seed| matches!(seed, Seed::Courses(_)))
-        .collect::<Vec<Seed>>();
-
-      seeds.retain(|seed| !matches!(seed, Seed::Courses(_)));
-
-      if let Some(last) = courses.last() {
-        seeds.insert(0, last.clone());
-      }
-    }
+    let seeds = self.collect()?;
 
     for seed in seeds {
       match seed {
-        Seed::Courses((path, courses)) if !self.options.skip_courses => {
+        Seed::Courses((path, courses)) => {
           info!("Seeding courses from {}...", path.display());
 
           let runner = |db: Db, item: Course| async move {
@@ -149,7 +135,7 @@
 
           self.populate(courses, runner).await?;
         }
-        Seed::Reviews((path, reviews)) if !self.options.skip_reviews => {
+        Seed::Reviews((path, reviews)) => {
           info!("Seeding reviews from {}...", path.display());
 
           let runner = |db: Db, item: Review| async move {
@@ -165,7 +151,6 @@
             path.display()
           );
         }
-        _ => continue,
       }
     }
 

crates/model/Cargo.toml

@@ -9,5 +9,4 @@ bson = { version = "2.14.0", features = ["chrono-0_4"] }
 combine = { path = "../combine" }
 derivative = "2.2.0"
 serde = { workspace = true }
-serde_json = { workspace = true }
 typeshare = { workspace = true }

crates/model/src/initialize_options.rs

@@ -2,9 +2,6 @@ use super::*;
 
 #[derive(Debug, Default)]
 pub struct InitializeOptions {
-  pub latest_courses: bool,
   pub multithreaded: bool,
-  pub skip_courses: bool,
-  pub skip_reviews: bool,
   pub source: PathBuf,
 }

src/arguments.rs

@@ -0,0 +1,15 @@
+use super::*;
+
+#[derive(Debug, Parser)]
+pub(crate) struct Arguments {
+  #[clap(flatten)]
+  options: Options,
+  #[clap(subcommand)]
+  subcommand: Subcommand,
+}
+
+impl Arguments {
+  pub(crate) async fn run(self) -> Result {
+    self.subcommand.run(self.options).await
+  }
+}

src/main.rs

@@ -1,12 +1,14 @@
 use {
   crate::{
+    arguments::Arguments,
     assets::Assets,
     auth::{AuthRedirect, COOKIE_NAME},
     error::Error,
-    hash::Hash,
-    object::Object,
+    options::Options,
+    seeder::Seeder,
     server::Server,
     state::State,
+    subcommand::Subcommand,
     user::User,
   },
   anyhow::anyhow,
@@ -29,7 +31,6 @@
   db::Db,
   dotenv::dotenv,
   env_logger::Env,
-  futures::TryStreamExt,
   http::{
     header, header::SET_COOKIE, request::Parts, HeaderMap, Request, StatusCode,
   },
@@ -42,19 +43,13 @@
     basic::BasicClient, AuthType, AuthUrl, ClientId, ClientSecret, CsrfToken,
     RedirectUrl, Scope, TokenUrl,
   },
-  rusoto_core::Region,
-  rusoto_s3::S3Client,
-  rusoto_s3::{GetObjectRequest, PutObjectOutput, PutObjectRequest, S3},
   serde::{Deserialize, Serialize},
   serde_json::json,
-  sha2::{Digest, Sha256},
   std::{
     backtrace::BacktraceStatus,
     env,
     fmt::{self, Display, Formatter},
     fs,
-    fs::File,
-    io::Read,
     net::SocketAddr,
     path::PathBuf,
     process,
@@ -73,27 +68,27 @@
   tracing::Span,
   typeshare::typeshare,
   url::Url,
-  walkdir::WalkDir,
 };
 
+mod arguments;
 mod assets;
 mod auth;
 mod courses;
 mod error;
-mod hash;
 mod instructors;
 mod interactions;
 mod notifications;
-mod object;
 mod options;
 mod reviews;
 mod search;
+mod seeder;
 mod server;
 mod state;
+mod subcommand;
 mod subscriptions;
 mod user;
 
-type Result<T = (), E = error::Error> = std::result::Result<T, E>;
+type Result<T = (), E = Error> = std::result::Result<T, E>;
 
 #[tokio::main]
 async fn main() {
@@ -102,7 +97,7 @@
 
   dotenv().ok();
 
-  if let Err(error) = Server::parse().run().await {
+  if let Err(error) = Arguments::parse().run().await {
     eprintln!("error: {error}");
 
     for (i, error) in error.0.chain().skip(1).enumerate() {

src/options.rs

@@ -1,7 +1,7 @@
 use super::*;
 
-#[derive(Parser)]
+#[derive(Debug, Parser)]
 pub(crate) struct Options {
-  #[clap(long, default_value = "courses.json")]
-  pub(crate) source: PathBuf,
+  #[clap(long, default_value = "admin", help = "Database name")]
+  pub(crate) db_name: String,
 }