Merge branch 'rewrite-find-artifact'

1 files changed, 16 insertions, 1 deletions

diff --git a/src/commands/find_artifact.rs b/src/commands/find_artifact.rs
index 0fc9b8c..6904cf4 100644
--- a/src/commands/find_artifact.rs
+++ b/src/commands/find_artifact.rs
@@ -31,6 +31,7 @@ use crate::filestore::path::StoreRoot;
 use crate::package::PackageVersionConstraint;
 use crate::repository::Repository;
 use crate::util::progress::ProgressBars;
+use crate::util::docker::ImageName;
 
 /// Implementation of the "find_artifact" subcommand
 pub async fn find_artifact(matches: &ArgMatches, config: &Configuration, progressbars: ProgressBars, repo: Repository, database_connection: PgConnection) -> Result<()> {
@@ -50,6 +51,10 @@ pub async fn find_artifact(matches: &ArgMatches, config: &Configuration, progres
         .transpose()?
         .unwrap_or_default();
 
+    let image_name = matches.value_of("image")
+        .map(String::from)
+        .map(ImageName::from);
+
     log::debug!("Finding artifacts for '{:?}' '{:?}'", package_name_regex, package_version_constraint);
 
     let release_stores = config
@@ -102,7 +107,17 @@ pub async fn find_artifact(matches: &ArgMatches, config: &Configuration, progres
         .inspect(|pkg| trace!("Found package: {:?}", pkg))
         .map(|pkg| {
             let script_filter = !matches.is_present("no_script_filter");
-            let pathes = crate::db::find_artifacts(database.clone(), config, pkg, &release_stores, staging_store.as_ref(), &env_filter, script_filter)?;
+            let pathes = crate::db::FindArtifacts::builder()
+                .config(config)
+                .release_stores(&release_stores)
+                .staging_store(staging_store.as_ref())
+                .database_connection(database.clone())
+                .env_filter(&env_filter)
+                .script_filter(script_filter)
+                .image_name(image_name.as_ref())
+                .package(pkg)
+                .build()
+                .run()?;
 
             pathes.iter()
                 .map(|tpl| (tpl.0.joined(), tpl.1))