Merge pull request #293 from onur/failures-count

onur · web-flow · commit 28f60f292091 · 2019-02-14T12:19:14.000+03:00
Show daily build failure count in release activity page
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/utils/daemon.rs b/src/utils/daemon.rs
@@ -121,12 +121,12 @@ pub fn start_daemon() {
     });
 
 
-    // update release activity everyday at 02:00
+    // update release activity everyday at 23:55
     thread::spawn(move || {
         loop {
             thread::sleep(Duration::from_secs(60));
             let now = time::now();
-            if now.tm_hour == 2 && now.tm_min == 0 {
+            if now.tm_hour == 23 && now.tm_min == 55 {
                 info!("Updating release activity");
                 if let Err(e) = update_release_activity() {
                     error!("Failed to update release activity: {}", e);
diff --git a/src/utils/release_activity_updater.rs b/src/utils/release_activity_updater.rs
@@ -11,30 +11,45 @@ pub fn update_release_activity() -> Result<()> {
     let conn = try!(connect_db());
     let mut dates = Vec::new();
     let mut crate_counts = Vec::new();
+    let mut failure_counts = Vec::new();
 
-    for day in 1..31 {
+    for day in 0..30 {
         let rows = try!(conn.query(&format!("SELECT COUNT(*)
                                              FROM releases
                                              WHERE release_time < NOW() - INTERVAL '{} day' AND
                                                    release_time > NOW() - INTERVAL '{} day'",
                                             day,
                                             day + 1),
                                    &[]));
+        let failures_count_rows = try!(conn.query(
+                                   &format!("SELECT COUNT(*)
+                                             FROM releases
+                                             WHERE is_library = TRUE AND
+                                                   build_status = FALSE AND
+                                                   release_time < NOW() - INTERVAL '{} day' AND
+                                                   release_time > NOW() - INTERVAL '{} day'",
+                                            day,
+                                            day + 1),
+                                   &[]));
         let release_count: i64 = rows.get(0).get(0);
+        let failure_count: i64 = failures_count_rows.get(0).get(0);
         let now = now();
         let date = now - Duration::days(day);
         dates.push(format!("{}", date.strftime("%d %b").unwrap()));
         // unwrap is fine here,             ~~~~~~~~~~~~^  our date format is always valid
         crate_counts.push(release_count);
+        failure_counts.push(failure_count);
     }
 
     dates.reverse();
     crate_counts.reverse();
+    failure_counts.reverse();
 
     let map = {
         let mut map = BTreeMap::new();
         map.insert("dates".to_owned(), dates.to_json());
         map.insert("counts".to_owned(), crate_counts.to_json());
+        map.insert("failures".to_owned(), failure_counts.to_json());
         map.to_json()
     };
 
diff --git a/src/web/mod.rs b/src/web/mod.rs
@@ -100,17 +100,25 @@ impl CratesfyiHandler {
         router.get("/robots.txt", sitemap::robots_txt_handler, "robots_txt");
         router.get("/sitemap.xml", sitemap::sitemap_handler, "sitemap_xml");
         router.get("/opensearch.xml", opensearch_xml_handler, "opensearch_xml");
-        router.get("/releases", releases::releases_handler, "releases");
+        router.get("/releases", releases::recent_releases_handler, "releases");
         router.get("/releases/feed",
                    releases::releases_feed_handler,
                    "releases_feed");
         router.get("/releases/recent/:page",
-                   releases::releases_handler,
+                   releases::recent_releases_handler,
                    "releases_recent_page");
-        router.get("/releases/stars", releases::stars_handler, "releases_stars");
+        router.get("/releases/stars", releases::releases_by_stars_handler, "releases_stars");
         router.get("/releases/stars/:page",
-                   releases::stars_handler,
+                   releases::releases_by_stars_handler,
                    "releases_stars_page");
+        router.get("/releases/recent-failures", releases::releases_recent_failures_handler, "releases_recent_failures");
+        router.get("/releases/recent-failures/:page",
+                   releases::releases_recent_failures_handler,
+                   "releases_recent_failures_page");
+        router.get("/releases/failures", releases::releases_failures_by_stars_handler, "releases_failures_by_stars");
+        router.get("/releases/failures/:page",
+                   releases::releases_failures_by_stars_handler,
+                   "releases_failures_by_starts_page");
         router.get("/releases/:author",
                    releases::author_handler,
                    "releases_author");
diff --git a/src/web/releases.rs b/src/web/releases.rs
@@ -69,6 +69,8 @@ impl ToJson for Release {
 enum Order {
     ReleaseTime, // this is default order
     GithubStars,
+    RecentFailures,
+    FailuresByGithubStars,
 }
 
 
@@ -105,6 +107,34 @@ fn get_releases(conn: &Connection, page: i64, limit: i64, order: Order) -> Vec<R
              ORDER BY crates.github_stars DESC
              LIMIT $1 OFFSET $2"
         }
+        Order::RecentFailures => {
+            "SELECT crates.name,
+                    releases.version,
+                    releases.description,
+                    releases.target_name,
+                    releases.release_time,
+                    releases.rustdoc_status,
+                    crates.github_stars
+             FROM crates
+             INNER JOIN releases ON crates.id = releases.crate_id
+             WHERE releases.build_status = FALSE AND releases.is_library = TRUE
+             ORDER BY releases.release_time DESC
+             LIMIT $1 OFFSET $2"
+        }
+        Order::FailuresByGithubStars => {
+            "SELECT crates.name,
+                    releases.version,
+                    releases.description,
+                    releases.target_name,
+                    releases.release_time,
+                    releases.rustdoc_status,
+                    crates.github_stars
+             FROM crates
+             INNER JOIN releases ON releases.id = crates.latest_version_id
+             WHERE releases.build_status = FALSE AND releases.is_library = TRUE
+             ORDER BY crates.github_stars DESC
+             LIMIT $1 OFFSET $2"
+        }
     };
 
     let mut packages = Vec::new();
@@ -300,13 +330,11 @@ pub fn releases_feed_handler(req: &mut Request) -> IronResult<Response> {
 }
 
 
-pub fn releases_handler(req: &mut Request) -> IronResult<Response> {
-    // page number of releases
-    let page_number: i64 = extension!(req, Router).find("page").unwrap_or("1").parse().unwrap_or(1);
-
-    let conn = extension!(req, Pool);
-    let packages = get_releases(conn, page_number, RELEASES_IN_RELEASES, Order::ReleaseTime);
-
+pub fn releases_handler(packages: Vec<Release>,
+                        page_number: i64,
+                        release_type: &str,
+                        tab: &str,
+                        title: &str) -> IronResult<Response> {
     if packages.is_empty() {
         return Err(IronError::new(Nope::CrateNotFound, status::NotFound));
     }
@@ -318,10 +346,10 @@ pub fn releases_handler(req: &mut Request) -> IronResult<Response> {
 
     Page::new(packages)
         .title("Releases")
-        .set("description", "Recently uploaded crates")
-        .set("release_type", "recent")
+        .set("description", title)
+        .set("release_type", release_type)
         .set_true("show_releases_navigation")
-        .set_true("releases_navigation_recent_tab")
+        .set_true(tab)
         .set_bool("show_next_page_button", show_next_page)
         .set_int("next_page", page_number + 1)
         .set_bool("show_previous_page_button", show_previous_page)
@@ -330,35 +358,36 @@ pub fn releases_handler(req: &mut Request) -> IronResult<Response> {
 }
 
 
-// TODO: This function is almost identical to previous one
-pub fn stars_handler(req: &mut Request) -> IronResult<Response> {
-    // page number of releases
+// Following functions caused a code repeat due to design of our /releases/ URL routes
+pub fn recent_releases_handler(req: &mut Request) -> IronResult<Response> {
     let page_number: i64 = extension!(req, Router).find("page").unwrap_or("1").parse().unwrap_or(1);
+    let conn = extension!(req, Pool);
+    let packages = get_releases(conn, page_number, RELEASES_IN_RELEASES, Order::ReleaseTime);
+    releases_handler(packages, page_number, "recent", "releases_navigation_recent_tab", "Recently uploaded crates")
+}
 
+
+pub fn releases_by_stars_handler(req: &mut Request) -> IronResult<Response> {
+    let page_number: i64 = extension!(req, Router).find("page").unwrap_or("1").parse().unwrap_or(1);
     let conn = extension!(req, Pool);
     let packages = get_releases(conn, page_number, RELEASES_IN_RELEASES, Order::GithubStars);
+    releases_handler(packages, page_number, "stars", "releases_navigation_stars_tab", "Crates with most stars")
+}
 
-    if packages.is_empty() {
-        return Err(IronError::new(Nope::CrateNotFound, status::NotFound));
-    }
 
-    // Show next and previous page buttons
-    // This is a temporary solution to avoid expensive COUNT(*)
-    let (show_next_page, show_previous_page) = (packages.len() == RELEASES_IN_RELEASES as usize,
-                                                page_number != 1);
+pub fn releases_recent_failures_handler(req: &mut Request) -> IronResult<Response> {
+    let page_number: i64 = extension!(req, Router).find("page").unwrap_or("1").parse().unwrap_or(1);
+    let conn = extension!(req, Pool);
+    let packages = get_releases(conn, page_number, RELEASES_IN_RELEASES, Order::RecentFailures);
+    releases_handler(packages, page_number, "recent-failures", "releases_navigation_recent_failures_tab", "Recent crates failed to build")
+}
 
-    Page::new(packages)
-        .title("Releases")
-        .set("description", "Most starred crates")
-        .set("release_type", "stars")
-        .set_true("show_releases_navigation")
-        .set_true("releases_navigation_stars_tab")
-        .set_true("show_stars")
-        .set_bool("show_next_page_button", show_next_page)
-        .set_int("next_page", page_number + 1)
-        .set_bool("show_previous_page_button", show_previous_page)
-        .set_int("previous_page", page_number - 1)
-        .to_resp("releases")
+
+pub fn releases_failures_by_stars_handler(req: &mut Request) -> IronResult<Response> {
+    let page_number: i64 = extension!(req, Router).find("page").unwrap_or("1").parse().unwrap_or(1);
+    let conn = extension!(req, Pool);
+    let packages = get_releases(conn, page_number, RELEASES_IN_RELEASES, Order::FailuresByGithubStars);
+    releases_handler(packages, page_number, "failures", "releases_navigation_failures_by_stars_tab", "Crates with most stars failed to build")
 }
 
 
diff --git a/templates/navigation.hbs b/templates/navigation.hbs
@@ -67,6 +67,8 @@
           <ul class="pure-menu-list">
             <li class="pure-menu-item"><a href="/releases" class="pure-menu-link{{#if varsb.releases_navigation_recent_tab}} pure-menu-active{{/if}}"><i class="fa fa-fw fa-leaf"></i><span class="title"> Recent</span></a></li>
             <li class="pure-menu-item"><a href="/releases/stars" class="pure-menu-link{{#if varsb.releases_navigation_stars_tab}} pure-menu-active{{/if}}"><i class="fa fa-fw fa-star"></i><span class="title"> Stars</span></a></li>
+            <li class="pure-menu-item"><a href="/releases/recent-failures" class="pure-menu-link{{#if varsb.releases_navigation_recent_failures_tab}} pure-menu-active{{/if}}"><i class="fa fa-fw fa-warning"></i><span class="title"> Recent Failures</span></a></li>
+            <li class="pure-menu-item"><a href="/releases/failures" class="pure-menu-link{{#if varsb.releases_navigation_failures_by_stars_tab}} pure-menu-active{{/if}}"><i class="fa fa-fw fa-star-o"></i><span class="title"> Failures By Stars</span></a></li>
             <li class="pure-menu-item"><a href="/releases/activity" class="pure-menu-link{{#if varsb.releases_navigation_activity_tab}} pure-menu-active{{/if}}"><i class="fa fa-fw fa-line-chart"></i><span class="title"> Activity</span></a></li>
             <li class="pure-menu-item"><a href="/releases/queue" class="pure-menu-link{{#if varsb.releases_queue_tab}} pure-menu-active{{/if}}"><i class="fa fa-fw fa-list-ol"></i><span class="title"> Queue</span></a></li>
             {{#if varss.author}}
diff --git a/templates/releases_activity.hbs b/templates/releases_activity.hbs
@@ -31,6 +31,9 @@ new Highcharts.Chart({
   series: [{
     name: 'Releases',
     data: [{{#each counts}}{{this}},{{/each}}]
+  },{
+    name: 'Build Failures',
+    data: [{{#each failures}}{{this}},{{/each}}]
   }]
 });
 </script>
