Refactor getting artifact info to avoid duplication

Author: Kobzol

database/src/lib.rs

@@ -384,6 +384,30 @@ impl From<Commit> for ArtifactId {
     }
 }
 
+struct ArtifactInfo<'a> {
+    name: &'a str,
+    date: Option<DateTime<Utc>>,
+    kind: &'static str,
+}
+
+impl ArtifactId {
+    fn info(&self) -> ArtifactInfo {
+        let (name, date, ty) = match self {
+            Self::Commit(commit) => (
+                commit.sha.as_str(),
+                Some(commit.date.0),
+                if commit.is_try() { "try" } else { "master" },
+            ),
+            Self::Tag(a) => (a.as_str(), None, "release"),
+        };
+        ArtifactInfo {
+            name,
+            date,
+            kind: ty,
+        }
+    }
+}
+
 intern!(pub struct QueryLabel);
 
 #[derive(PartialEq, Eq, Clone, Debug)]

database/src/pool/postgres.rs

@@ -948,33 +948,26 @@ where
     }
 
     async fn artifact_id(&self, artifact: &ArtifactId) -> ArtifactIdNumber {
-        let (name, date, ty) = match artifact {
-            ArtifactId::Commit(commit) => (
-                commit.sha.to_string(),
-                Some(commit.date.0),
-                if commit.is_try() { "try" } else { "master" },
-            ),
-            ArtifactId::Tag(a) => (a.clone(), None, "release"),
-        };
+        let info = artifact.info();
         let aid = self
             .conn()
-            .query_opt("select id from artifact where name = $1", &[&name])
+            .query_opt("select id from artifact where name = $1", &[&info.name])
             .await
             .unwrap();
 
         let aid = match aid {
             Some(aid) => aid.get::<_, i32>(0) as u32,
             None => {
                 self.conn()
-                    .query_opt("insert into artifact (name, date, type) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING RETURNING id", &[
-                        &name,
-                        &date,
-                        &ty,
-                    ])
-                    .await
-                    .unwrap();
+            .query_opt("insert into artifact (name, date, type) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING RETURNING id", &[
+                &info.name,
+                &info.date,
+                &info.kind,
+            ])
+            .await
+            .unwrap();
                 self.conn()
-                    .query_one("select id from artifact where name = $1", &[&name])
+                    .query_one("select id from artifact where name = $1", &[&info.name])
                     .await
                     .unwrap()
                     .get::<_, i32>(0) as u32

database/src/pool/sqlite.rs

@@ -624,26 +624,19 @@ impl Connection for SqliteConnection {
         )
     }
     async fn artifact_id(&self, artifact: &crate::ArtifactId) -> ArtifactIdNumber {
-        let (name, date, ty) = match artifact {
-            crate::ArtifactId::Commit(commit) => (
-                commit.sha.to_string(),
-                Some(commit.date.0),
-                if commit.is_try() { "try" } else { "master" },
-            ),
-            crate::ArtifactId::Tag(a) => (a.clone(), None, "release"),
-        };
+        let info = artifact.info();
 
         self.raw_ref()
             .execute(
                 "insert or ignore into artifact (name, date, type) VALUES (?, ?, ?)",
-                params![&name, &date.map(|d| d.timestamp()), &ty,],
+                params![&info.name, &info.date.map(|d| d.timestamp()), &info.kind,],
             )
             .unwrap();
         ArtifactIdNumber(
             self.raw_ref()
                 .query_row(
                     "select id from artifact where name = $1",
-                    params![&name],
+                    params![&info.name],
                     |r| r.get::<_, i32>(0),
                 )
                 .unwrap() as u32,