diff --git a/src/bin/cratesfyi.rs b/src/bin/cratesfyi.rs index 55ef99f32..755a4cc8b 100644 --- a/src/bin/cratesfyi.rs +++ b/src/bin/cratesfyi.rs @@ -170,12 +170,9 @@ impl QueueSubcommand { crate_name, crate_version, build_priority, - } => ctx.build_queue()?.add_crate( - &crate_name, - &crate_version, - build_priority, - ctx.config()?.registry_url.as_deref(), - )?, + } => ctx + .build_queue()? + .add_crate(&crate_name, &crate_version, build_priority)?, Self::DefaultPriority { subcommand } => subcommand.handle_args(ctx)?, } diff --git a/src/build_queue.rs b/src/build_queue.rs index e2b8d4708..869aa9b38 100644 --- a/src/build_queue.rs +++ b/src/build_queue.rs @@ -11,7 +11,6 @@ pub(crate) struct QueuedCrate { pub(crate) name: String, pub(crate) version: String, pub(crate) priority: i32, - pub(crate) registry: Option, } #[derive(Debug)] @@ -30,16 +29,10 @@ impl BuildQueue { } } - pub fn add_crate( - &self, - name: &str, - version: &str, - priority: i32, - registry: Option<&str>, - ) -> Result<()> { + pub fn add_crate(&self, name: &str, version: &str, priority: i32) -> Result<()> { self.db.get()?.execute( - "INSERT INTO queue (name, version, priority, registry) VALUES ($1, $2, $3, $4);", - &[&name, &version, &priority, ®istry], + "INSERT INTO queue (name, version, priority) VALUES ($1, $2, $3);", + &[&name, &version, &priority], )?; Ok(()) } @@ -70,7 +63,7 @@ impl BuildQueue { pub(crate) fn queued_crates(&self) -> Result> { let query = self.db.get()?.query( - "SELECT id, name, version, priority, registry + "SELECT id, name, version, priority FROM queue WHERE attempt < $1 ORDER BY priority ASC, attempt ASC, id ASC", @@ -84,7 +77,6 @@ impl BuildQueue { name: row.get("name"), version: row.get("version"), priority: row.get("priority"), - registry: row.get("registry"), }) .collect()) } @@ -157,7 +149,7 @@ mod tests { ("high-priority-baz", "1.0.0", -1000), ]; for krate in &test_crates { - queue.add_crate(krate.0, krate.1, krate.2, None)?; + queue.add_crate(krate.0, krate.1, krate.2)?; } let assert_next = |name| -> Result<()> { @@ -222,9 +214,9 @@ mod tests { let queue = env.build_queue(); assert_eq!(queue.pending_count()?, 0); - queue.add_crate("foo", "1.0.0", 0, None)?; + queue.add_crate("foo", "1.0.0", 0)?; assert_eq!(queue.pending_count()?, 1); - queue.add_crate("bar", "1.0.0", 0, None)?; + queue.add_crate("bar", "1.0.0", 0)?; assert_eq!(queue.pending_count()?, 2); queue.process_next_crate(|krate| { @@ -243,11 +235,11 @@ mod tests { let queue = env.build_queue(); assert_eq!(queue.prioritized_count()?, 0); - queue.add_crate("foo", "1.0.0", 0, None)?; + queue.add_crate("foo", "1.0.0", 0)?; assert_eq!(queue.prioritized_count()?, 1); - queue.add_crate("bar", "1.0.0", -100, None)?; + queue.add_crate("bar", "1.0.0", -100)?; assert_eq!(queue.prioritized_count()?, 2); - queue.add_crate("baz", "1.0.0", 100, None)?; + queue.add_crate("baz", "1.0.0", 100)?; assert_eq!(queue.prioritized_count()?, 2); queue.process_next_crate(|krate| { @@ -270,9 +262,9 @@ mod tests { let queue = env.build_queue(); assert_eq!(queue.failed_count()?, 0); - queue.add_crate("foo", "1.0.0", -100, None)?; + queue.add_crate("foo", "1.0.0", -100)?; assert_eq!(queue.failed_count()?, 0); - queue.add_crate("bar", "1.0.0", 0, None)?; + queue.add_crate("bar", "1.0.0", 0)?; for _ in 0..MAX_ATTEMPTS { assert_eq!(queue.failed_count()?, 0); @@ -304,7 +296,7 @@ mod tests { ("baz", "1.0.0", 10), ]; for krate in &test_crates { - queue.add_crate(krate.0, krate.1, krate.2, None)?; + queue.add_crate(krate.0, krate.1, krate.2)?; } assert_eq!( diff --git a/src/db/migrate.rs b/src/db/migrate.rs index 36d4feb7d..c3a450ed0 100644 --- a/src/db/migrate.rs +++ b/src/db/migrate.rs @@ -475,20 +475,6 @@ pub fn migrate(version: Option, conn: &mut Client) -> CratesfyiResult<( DROP TYPE feature; " ), - migration!( - context, - 20, - // description - "Support alternative registries", - // upgrade query - " - ALTER TABLE queue ADD COLUMN registry TEXT DEFAULT NULL; - ", - // downgrade query - " - ALTER TABLE queue DROP COLUMN registry; - " - ) ]; for migration in migrations { diff --git a/src/docbuilder/queue.rs b/src/docbuilder/queue.rs index 66600dd02..b187fc9f9 100644 --- a/src/docbuilder/queue.rs +++ b/src/docbuilder/queue.rs @@ -45,12 +45,10 @@ impl DocBuilder { ChangeKind::Added => { let priority = get_crate_priority(&mut conn, &krate.name)?; - match self.build_queue.add_crate( - &krate.name, - &krate.version, - priority, - index.repository_url(), - ) { + match self + .build_queue + .add_crate(&krate.name, &krate.version, priority) + { Ok(()) => { debug!("{}-{} added into build queue", krate.name, krate.version); crates_added += 1; @@ -81,13 +79,7 @@ impl DocBuilder { queue.process_next_crate(|krate| { processed = true; - let kind = krate - .registry - .as_ref() - .map(|r| PackageKind::Registry(r.as_str())) - .unwrap_or(PackageKind::CratesIo); - - builder.build_package(&krate.name, &krate.version, kind)?; + builder.build_package(&krate.name, &krate.version, PackageKind::CratesIo)?; Ok(()) })?; diff --git a/src/index/mod.rs b/src/index/mod.rs index 894e282ab..733b80e31 100644 --- a/src/index/mod.rs +++ b/src/index/mod.rs @@ -113,8 +113,4 @@ impl Index { ); } } - - pub fn repository_url(&self) -> Option<&str> { - self.repository_url.as_deref() - } } diff --git a/src/web/releases.rs b/src/web/releases.rs index d0f04b109..087cd652c 100644 --- a/src/web/releases.rs +++ b/src/web/releases.rs @@ -1126,9 +1126,9 @@ mod tests { .expect("missing heading") .any(|el| el.text_contents().contains("nothing"))); - queue.add_crate("foo", "1.0.0", 0, None)?; - queue.add_crate("bar", "0.1.0", -10, None)?; - queue.add_crate("baz", "0.0.1", 10, None)?; + queue.add_crate("foo", "1.0.0", 0)?; + queue.add_crate("bar", "0.1.0", -10)?; + queue.add_crate("baz", "0.0.1", 10)?; let full = kuchiki::parse_html().one(web.get("/releases/queue").send()?.text()?); let items = full