Merge pull request #222 from Turbo87/simplify

Two small code simplifications

Author: alexcrichton

src/keyword.rs

@@ -159,9 +159,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
     }
 
     // Query for the total count of keywords
-    let stmt = try!(conn.prepare("SELECT COUNT(*) FROM keywords"));
-    let row = try!(stmt.query(&[])).into_iter().next().unwrap();
-    let total = row.get(0);
+    let total = try!(Keyword::count(conn));
 
     #[derive(RustcEncodable)]
     struct R { keywords: Vec<EncodableKeyword>, meta: Meta }

src/krate.rs

@@ -588,11 +588,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
 /// Handles the `GET /summary` route.
 pub fn summary(req: &mut Request) -> CargoResult<Response> {
     let tx = try!(req.tx());
-    let num_crates = {
-        let stmt = try!(tx.prepare("SELECT COUNT(*) FROM crates"));
-        let rows = try!(stmt.query(&[]));
-        rows.iter().next().unwrap().get("count")
-    };
+    let num_crates = try!(Crate::count(tx));
     let num_downloads = {
         let stmt = try!(tx.prepare("SELECT total_downloads FROM metadata"));
         let rows = try!(stmt.query(&[]));

src/model.rs

@@ -16,4 +16,11 @@ pub trait Model: Sized {
         let row = try!(rows.into_iter().next().chain_error(|| NotFound));
         Ok(Model::from_row(&row))
     }
+
+    fn count(conn: &GenericConnection) -> CargoResult<i64> {
+        let sql = format!("SELECT COUNT(*) FROM {}", Model::table_name(None::<Self>));
+        let stmt = try!(conn.prepare(&sql));
+        let rows = try!(stmt.query(&[]));
+        Ok(rows.iter().next().unwrap().get("count"))
+    }
 }

src/user/middleware.rs

@@ -32,11 +32,11 @@ impl conduit_middleware::Middleware for Middleware {
             None => {
 
                 // Look for an `Authorization` header on the request
-                let tx = try!(req.tx().map_err(std_error));
                 match req.headers().find("Authorization") {
                     Some(headers) => {
 
                         // Look for a user in the database with a matching API token
+                        let tx = try!(req.tx().map_err(std_error));
                         match User::find_by_api_token(tx, &headers[0]) {
                             Ok(user) => user,
                             Err(..) => return Ok(())