Break out include modes into specific categories

Author: nightkr

src/controllers/krate/metadata.rs

@@ -122,7 +122,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
     let conn = req.db_read_only()?;
     let krate: Crate = Crate::by_name(name).first(&*conn)?;
 
-    let versions_publishers_and_audit_actions = if include.full {
+    let versions_publishers_and_audit_actions = if include.versions {
         let mut versions_and_publishers: Vec<(Version, Option<User>)> = krate
             .all_versions()
             .left_outer_join(users::table)
@@ -150,7 +150,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
         .as_ref()
         .map(|vps| vps.iter().map(|v| v.0.id).collect());
 
-    let kws = if include.full {
+    let kws = if include.keywords {
         Some(
             CrateKeyword::belonging_to(&krate)
                 .inner_join(keywords::table)
@@ -160,7 +160,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
     } else {
         None
     };
-    let cats = if include.full {
+    let cats = if include.categories {
         Some(
             CrateCategory::belonging_to(&krate)
                 .inner_join(categories::table)
@@ -170,7 +170,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
     } else {
         None
     };
-    let recent_downloads = if include.full {
+    let recent_downloads = if include.downloads {
         RecentCrateDownloads::belonging_to(&krate)
             .select(recent_crate_downloads::downloads)
             .get_result(&*conn)
@@ -179,7 +179,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
         None
     };
 
-    let badges = if include.full {
+    let badges = if include.badges {
         Some(
             badges::table
                 .filter(badges::crate_id.eq(krate.id))
@@ -188,7 +188,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
     } else {
         None
     };
-    let top_versions = if include.full {
+    let top_versions = if include.versions {
         Some(krate.top_versions(&conn)?)
     } else {
         None
@@ -229,27 +229,63 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
 
 #[derive(Debug)]
 struct ShowIncludeMode {
-    full: bool,
+    versions: bool,
+    keywords: bool,
+    categories: bool,
+    badges: bool,
+    downloads: bool,
 }
 
 impl Default for ShowIncludeMode {
     fn default() -> Self {
         // Send everything for legacy clients that expect the full response
-        Self { full: true }
+        Self {
+            versions: true,
+            keywords: true,
+            categories: true,
+            badges: true,
+            downloads: true,
+        }
     }
 }
 
+impl ShowIncludeMode {
+    const INVALID_COMPONENT: &'static str =
+        "invalid component for ?mode= (expected 'versions', 'keywords', 'categories', 'badges', 'downloads', or 'full')";
+}
+
 impl FromStr for ShowIncludeMode {
     type Err = Box<dyn AppError>;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "" => Ok(ShowIncludeMode { full: false }),
-            "full" => Ok(ShowIncludeMode { full: true }),
-            _ => Err(bad_request(
-                "invalid value for ?mode= (expected '' or 'full')",
-            )),
+        let mut mode = Self {
+            versions: false,
+            keywords: false,
+            categories: false,
+            badges: false,
+            downloads: false,
+        };
+        for component in s.split(',') {
+            match component {
+                "" => {}
+                "full" => {
+                    mode = Self {
+                        versions: true,
+                        keywords: true,
+                        categories: true,
+                        badges: true,
+                        downloads: true,
+                    }
+                }
+                "versions" => mode.versions = true,
+                "keywords" => mode.keywords = true,
+                "categories" => mode.categories = true,
+                "badges" => mode.badges = true,
+                "downloads" => mode.downloads = true,
+                _ => return Err(bad_request(Self::INVALID_COMPONENT)),
+            }
         }
+        Ok(mode)
     }
 }