Dedup yourself

Author: Kixiron

src/web/releases.rs

@@ -164,21 +164,22 @@ fn get_releases_by_author(
 ) -> (String, Vec<Release>) {
     let offset = (page - 1) * limit;
 
-    let query = "SELECT crates.name,
-                        releases.version,
-                        releases.description,
-                        releases.target_name,
-                        releases.release_time,
-                        releases.rustdoc_status,
-                        crates.github_stars,
-                        authors.name
-                 FROM crates
-                 INNER JOIN releases ON releases.id = crates.latest_version_id
-                 INNER JOIN author_rels ON releases.id = author_rels.rid
-                 INNER JOIN authors ON authors.id = author_rels.aid
-                 WHERE authors.slug = $1
-                 ORDER BY crates.github_stars DESC
-                 LIMIT $2 OFFSET $3";
+    let query = "
+        SELECT crates.name,
+               releases.version,
+               releases.description,
+               releases.target_name,
+               releases.release_time,
+               releases.rustdoc_status,
+               crates.github_stars,
+               authors.name
+        FROM crates
+        INNER JOIN releases ON releases.id = crates.latest_version_id
+        INNER JOIN author_rels ON releases.id = author_rels.rid
+        INNER JOIN authors ON authors.id = author_rels.aid
+        WHERE authors.slug = $1
+        ORDER BY crates.github_stars DESC
+        LIMIT $2 OFFSET $3";
     let query = conn.query(&query, &[&author, &limit, &offset]).unwrap();
 
     let mut author_name = None;
@@ -537,13 +538,13 @@ pub fn search_handler(req: &mut Request) -> IronResult<Response> {
             if query.is_empty() {
                 let rows = ctry!(conn.query(
                     "SELECT crates.name,
-                                                    releases.version,
-                                                    releases.target_name
-                                             FROM crates
-                                             INNER JOIN releases
-                                                   ON crates.latest_version_id = releases.id
-                                             WHERE github_stars >= 100 AND rustdoc_status = true
-                                             OFFSET FLOOR(RANDOM() * 280) LIMIT 1",
+                            releases.version,
+                            releases.target_name
+                     FROM crates
+                     INNER JOIN releases
+                         ON crates.latest_version_id = releases.id
+                     WHERE github_stars >= 100 AND rustdoc_status = true
+                     OFFSET FLOOR(RANDOM() * 280) LIMIT 1",
                     &[]
                 ));
                 //                                        ~~~~~~^
@@ -645,9 +646,9 @@ pub fn build_queue_handler(req: &mut Request) -> IronResult<Response> {
     let query = conn
         .query(
             "SELECT name, version, priority
-                          FROM queue
-                          WHERE attempt < 5
-                          ORDER BY priority ASC, attempt ASC, id ASC",
+             FROM queue
+             WHERE attempt < 5
+             ORDER BY priority ASC, attempt ASC, id ASC",
             &[],
         )
         .unwrap();

src/web/source.rs

@@ -104,8 +104,8 @@ impl FileList {
 
         let files: Value = rows.get(0).get_opt(5).unwrap().ok()?;
 
-        let mut file_list: Vec<File> = if let Some(files) = files.as_array() {
-            let mut file_list = files
+        if let Some(files) = files.as_array() {
+            let mut file_list: Vec<File> = files
                 .iter()
                 .filter_map(|file| {
                     if let Some(file) = file.as_array() {
@@ -139,7 +139,6 @@ impl FileList {
                                 file_type: ftype,
                             };
 
-                            // avoid adding duplicates, a directory may occur more than once
                             return Some(file);
                         }
                     }
@@ -148,38 +147,38 @@ impl FileList {
                 })
                 .collect::<Vec<_>>();
 
+            if file_list.is_empty() {
+                return None;
+            }
+
+            file_list.sort_by(|a, b| {
+                // directories must be listed first
+                if a.file_type == FileType::Dir && b.file_type != FileType::Dir {
+                    Ordering::Less
+                } else if a.file_type != FileType::Dir && b.file_type == FileType::Dir {
+                    Ordering::Greater
+                } else {
+                    a.name.to_lowercase().cmp(&b.name.to_lowercase())
+                }
+            });
+
+            // avoid adding duplicates, a directory may occur more than once
             file_list.dedup();
-            file_list
-        } else {
-            Vec::new()
-        };
 
-        if file_list.is_empty() {
-            return None;
+            Some(FileList {
+                metadata: MetaData {
+                    name: rows.get(0).get(0),
+                    version: rows.get(0).get(1),
+                    description: rows.get(0).get(2),
+                    target_name: rows.get(0).get(3),
+                    rustdoc_status: rows.get(0).get(4),
+                    default_target: rows.get(0).get(6),
+                },
+                files: file_list,
+            })
+        } else {
+            None
         }
-
-        file_list.sort_by(|a, b| {
-            // directories must be listed first
-            if a.file_type == FileType::Dir && b.file_type != FileType::Dir {
-                Ordering::Less
-            } else if a.file_type != FileType::Dir && b.file_type == FileType::Dir {
-                Ordering::Greater
-            } else {
-                a.name.to_lowercase().cmp(&b.name.to_lowercase())
-            }
-        });
-
-        Some(FileList {
-            metadata: MetaData {
-                name: rows.get(0).get(0),
-                version: rows.get(0).get(1),
-                description: rows.get(0).get(2),
-                target_name: rows.get(0).get(3),
-                rustdoc_status: rows.get(0).get(4),
-                default_target: rows.get(0).get(6),
-            },
-            files: file_list,
-        })
     }
 }