views: Implement from() methods for EncodableCrate

Author: Turbo87

src/controllers/krate/metadata.rs

@@ -41,7 +41,13 @@ pub fn summary(req: &mut dyn RequestExt) -> EndpointResult {
             .zip(krates)
             .zip(recent_downloads)
             .map(|((top_versions, krate), recent_downloads)| {
-                Ok(krate.minimal_encodable(&top_versions, None, false, recent_downloads))
+                Ok(EncodableCrate::from_minimal(
+                    krate,
+                    &top_versions,
+                    None,
+                    false,
+                    recent_downloads,
+                ))
             })
             .collect()
     };
@@ -165,7 +171,8 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
         categories: Vec<EncodableCategory>,
     }
     Ok(req.json(&R {
-        krate: krate.clone().encodable(
+        krate: EncodableCrate::from(
+            krate.clone(),
             &top_versions,
             Some(ids),
             Some(&kws),

src/controllers/krate/publish.rs

@@ -14,7 +14,7 @@ use crate::models::{
 
 use crate::render;
 use crate::util::{read_fill, read_le_u32, Maximums};
-use crate::views::{EncodableCrateUpload, GoodCrate, PublishWarnings};
+use crate::views::{EncodableCrate, EncodableCrateUpload, GoodCrate, PublishWarnings};
 
 pub const MISSING_RIGHTS_ERROR_MESSAGE: &str =
     "this crate exists but you don't seem to be an owner. \
@@ -218,7 +218,7 @@ pub fn publish(req: &mut dyn RequestExt) -> EndpointResult {
         };
 
         Ok(req.json(&GoodCrate {
-            krate: krate.minimal_encodable(&top_versions, None, false, None),
+            krate: EncodableCrate::from_minimal(krate, &top_versions, None, false, None),
             warnings,
         }))
     })

src/controllers/krate/search.rs

@@ -226,7 +226,8 @@ pub fn search(req: &mut dyn RequestExt) -> EndpointResult {
         .zip(badges)
         .map(
             |((((max_version, krate), perfect_match), recent_downloads), badges)| {
-                krate.minimal_encodable(
+                EncodableCrate::from_minimal(
+                    krate,
                     &max_version,
                     Some(badges),
                     perfect_match,

src/models/krate.rs

@@ -296,24 +296,6 @@ impl Crate {
             && prefix_part.map_or(true, Crate::valid_feature_prefix)
     }
 
-    pub fn minimal_encodable(
-        self,
-        top_versions: &TopVersions,
-        badges: Option<Vec<Badge>>,
-        exact_match: bool,
-        recent_downloads: Option<i64>,
-    ) -> EncodableCrate {
-        self.encodable(
-            top_versions,
-            None,
-            None,
-            None,
-            badges,
-            exact_match,
-            recent_downloads,
-        )
-    }
-
     #[allow(clippy::too_many_arguments)]
     pub fn encodable(
         self,

src/views.rs

@@ -4,8 +4,8 @@ use std::collections::HashMap;
 
 use crate::github;
 use crate::models::{
-    Badge, Category, CrateOwnerInvitation, CreatedApiToken, Dependency, DependencyKind, Keyword,
-    Owner, ReverseDependency, Team, User, Version, VersionDownload, VersionOwnerAction,
+    Badge, Category, Crate, CrateOwnerInvitation, CreatedApiToken, Dependency, DependencyKind,
+    Keyword, Owner, ReverseDependency, Team, User, Version, VersionDownload, VersionOwnerAction,
 };
 use crate::util::rfc3339;
 
@@ -205,6 +205,49 @@ pub struct EncodableCrate {
     pub exact_match: bool,
 }
 
+impl EncodableCrate {
+    #[allow(clippy::too_many_arguments)]
+    pub fn from(
+        krate: Crate,
+        top_versions: &TopVersions,
+        versions: Option<Vec<i32>>,
+        keywords: Option<&[Keyword]>,
+        categories: Option<&[Category]>,
+        badges: Option<Vec<Badge>>,
+        exact_match: bool,
+        recent_downloads: Option<i64>,
+    ) -> Self {
+        krate.encodable(
+            top_versions,
+            versions,
+            keywords,
+            categories,
+            badges,
+            exact_match,
+            recent_downloads,
+        )
+    }
+
+    pub fn from_minimal(
+        krate: Crate,
+        top_versions: &TopVersions,
+        badges: Option<Vec<Badge>>,
+        exact_match: bool,
+        recent_downloads: Option<i64>,
+    ) -> Self {
+        Self::from(
+            krate,
+            top_versions,
+            None,
+            None,
+            None,
+            badges,
+            exact_match,
+            recent_downloads,
+        )
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct EncodableCrateLinks {
     pub version_downloads: String,