Merge remote-tracking branch 'upstream/master' into sitemap-split

syphar · syphar · commit 8eef24d27472 · 2020-12-27T16:46:30.000+01:00
diff --git a/src/db/add_package.rs b/src/db/add_package.rs
@@ -92,7 +92,7 @@ pub(crate) fn add_package_into_database(
         &[
             &crate_id,
             &metadata_pkg.version,
-            &registry_data.release_time.naive_utc(),
+            &registry_data.release_time,
             &serde_json::to_value(&dependencies)?,
             &metadata_pkg.package_name(),
             &registry_data.yanked,
diff --git a/src/db/migrate.rs b/src/db/migrate.rs
@@ -556,6 +556,49 @@ pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<(
                     ADD COLUMN github_last_update TIMESTAMP;
             "
         ),
+        migration!(
+            context,
+            24,
+            "migrate timestamp to be timezone aware",
+            // upgrade
+            "
+                ALTER TABLE builds 
+                    ALTER build_time TYPE timestamptz USING build_time AT TIME ZONE 'UTC';
+
+                ALTER TABLE files
+                    ALTER date_added TYPE timestamptz USING date_added AT TIME ZONE 'UTC',
+                    ALTER date_updated TYPE timestamptz USING date_updated AT TIME ZONE 'UTC';
+
+                ALTER TABLE github_repos 
+                    ALTER updated_at TYPE timestamptz USING updated_at AT TIME ZONE 'UTC', 
+                    ALTER last_commit TYPE timestamptz USING last_commit AT TIME ZONE 'UTC';
+
+                ALTER TABLE queue 
+                    ALTER date_added TYPE timestamptz USING date_added AT TIME ZONE 'UTC';
+
+                ALTER TABLE releases 
+                    ALTER release_time TYPE timestamptz USING release_time AT TIME ZONE 'UTC';
+            ",
+            // downgrade 
+            "
+                ALTER TABLE builds 
+                    ALTER build_time TYPE timestamp USING build_time AT TIME ZONE 'UTC';
+
+                ALTER TABLE files
+                    ALTER date_added TYPE timestamp USING date_added AT TIME ZONE 'UTC',
+                    ALTER date_updated TYPE timestamp USING date_updated AT TIME ZONE 'UTC';
+
+                ALTER TABLE github_repos 
+                    ALTER updated_at TYPE timestamp USING updated_at AT TIME ZONE 'UTC', 
+                    ALTER last_commit TYPE timestamp USING last_commit AT TIME ZONE 'UTC';
+
+                ALTER TABLE queue 
+                    ALTER date_added TYPE timestamp USING date_added AT TIME ZONE 'UTC';
+
+                ALTER TABLE releases 
+                    ALTER release_time TYPE timestamp USING release_time AT TIME ZONE 'UTC';
+            ",
+        ),
     ];
 
     for migration in migrations {
diff --git a/src/storage/database.rs b/src/storage/database.rs
@@ -1,7 +1,6 @@
 use super::{Blob, StorageTransaction};
 use crate::db::Pool;
 use crate::Metrics;
-use chrono::{DateTime, NaiveDateTime, Utc};
 use failure::Error;
 use postgres::Transaction;
 use std::sync::Arc;
@@ -61,7 +60,7 @@ impl DatabaseBackend {
             Ok(Blob {
                 path: row.get("path"),
                 mime: row.get("mime"),
-                date_updated: DateTime::from_utc(row.get::<_, NaiveDateTime>("date_updated"), Utc),
+                date_updated: row.get("date_updated"),
                 content: row.get("content"),
                 compression,
             })
diff --git a/src/web/builds.rs b/src/web/builds.rs
@@ -4,7 +4,7 @@ use crate::{
     impl_webpage,
     web::{page::WebPage, MetaData},
 };
-use chrono::{DateTime, NaiveDateTime, Utc};
+use chrono::{DateTime, Utc};
 use iron::{
     headers::{
         AccessControlAllowOrigin, CacheControl, CacheDirective, ContentType, Expires, HttpDate,
@@ -80,7 +80,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
                 rustc_version: row.get("rustc_version"),
                 docsrs_version: row.get("cratesfyi_version"),
                 build_status: row.get("build_status"),
-                build_time: DateTime::from_utc(row.get::<_, NaiveDateTime>("build_time"), Utc),
+                build_time: row.get("build_time"),
                 output: row.get("output"),
             };
 
diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs
@@ -1,6 +1,6 @@
 use super::{match_version, redirect_base, render_markdown, MatchSemver, MetaData};
 use crate::{db::Pool, impl_webpage, web::page::WebPage};
-use chrono::{DateTime, NaiveDateTime, Utc};
+use chrono::{DateTime, Utc};
 use iron::prelude::*;
 use iron::Url;
 use postgres::Client;
@@ -181,7 +181,7 @@ impl CrateDetails {
             dependencies: krate.get("dependencies"),
             readme: krate.get("readme"),
             rustdoc: krate.get("description_long"),
-            release_time: DateTime::from_utc(krate.get::<_, NaiveDateTime>("release_time"), Utc),
+            release_time: krate.get("release_time"),
             build_status: krate.get("build_status"),
             last_successful_build: None,
             rustdoc_status: krate.get("rustdoc_status"),
diff --git a/src/web/releases.rs b/src/web/releases.rs
@@ -7,7 +7,7 @@ use crate::{
     web::{error::Nope, match_version, page::WebPage, redirect_base},
     BuildQueue,
 };
-use chrono::{DateTime, NaiveDateTime, Utc};
+use chrono::{DateTime, Utc};
 use iron::{
     headers::{ContentType, Expires, HttpDate},
     mime::{Mime, SubLevel, TopLevel},
@@ -102,7 +102,7 @@ pub(crate) fn get_releases(conn: &mut Client, page: i64, limit: i64, order: Orde
             version: row.get(1),
             description: row.get(2),
             target_name: row.get(3),
-            release_time: DateTime::from_utc(row.get::<_, NaiveDateTime>(4), Utc),
+            release_time: row.get(4),
             rustdoc_status: row.get(5),
             stars: row.get::<_, Option<i32>>(6).unwrap_or(0),
         })
@@ -149,7 +149,7 @@ fn get_releases_by_author(
                 version: row.get(1),
                 description: row.get(2),
                 target_name: row.get(3),
-                release_time: DateTime::from_utc(row.get::<_, NaiveDateTime>(4), Utc),
+                release_time: row.get(4),
                 rustdoc_status: row.get(5),
                 stars: row.get::<_, Option<i32>>(6).unwrap_or(0),
             }
@@ -203,7 +203,7 @@ fn get_releases_by_owner(
                 version: row.get(1),
                 description: row.get(2),
                 target_name: row.get(3),
-                release_time: DateTime::from_utc(row.get::<_, NaiveDateTime>(4), Utc),
+                release_time: row.get(4),
                 rustdoc_status: row.get(5),
                 stars: row.get::<_, Option<i32>>(6).unwrap_or(0),
             }
@@ -286,7 +286,7 @@ fn get_search_results(
             version: row.get("version"),
             description: row.get("description"),
             target_name: row.get("target_name"),
-            release_time: DateTime::from_utc(row.get("release_time"), Utc),
+            release_time: row.get("release_time"),
             rustdoc_status: row.get("rustdoc_status"),
             stars: row.get::<_, Option<i32>>("github_stars").unwrap_or(0),
         })
diff --git a/src/web/sitemap.rs b/src/web/sitemap.rs
@@ -1,5 +1,5 @@
 use crate::{db::Pool, docbuilder::Limits, impl_webpage, web::error::Nope, web::page::WebPage};
-use chrono::{DateTime, NaiveDateTime, Utc};
+use chrono::{DateTime, Utc};
 use iron::{
     headers::ContentType,
     mime::{Mime, SubLevel, TopLevel},
@@ -80,9 +80,7 @@ pub fn sitemap_handler(req: &mut Request) -> IronResult<Response> {
     let releases = query
         .into_iter()
         .map(|row| {
-            let time = DateTime::<Utc>::from_utc(row.get::<_, NaiveDateTime>(1), Utc)
-                .format("%+")
-                .to_string();
+            let time = row.get::<_, DateTime<Utc>>(1).format("%+").to_string();
 
             (row.get(0), time)
         })
diff --git a/templates/base.html b/templates/base.html
@@ -13,13 +13,12 @@
         <link rel="stylesheet" href="/-/static/vendored.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
         <link rel="stylesheet" href="/-/static/style.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
 
-        {%- block css -%}{%- endblock css -%}
-
         <link rel="search" href="/-/static/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs" />
 
         <title>{%- block title -%} Docs.rs {%- endblock title -%}</title>
 
         <script type="text/javascript">{%- include "theme.js" -%}</script>
+        {%- block css -%}{%- endblock css -%}
     </head>
 
     <body>
diff --git a/templates/macros.html b/templates/macros.html
@@ -22,8 +22,30 @@
 {# Makes the appropriate CSS imports for highlighting #}
 {% macro highlight_css() %}
     {# Load the highlighting theme css #}
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/github.min.css"
-        type="text/css" media="all" />
+    <script>
+        // Choose which highlight.js theme to load based on the user theme
+        var stylesheet;
+        switch(document.documentElement.dataset.theme) {
+            case "dark":
+            case "ayu":
+                stylesheet = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/dark.min.css";
+                break;
+            case "null": // The user is visiting docs.rs for the first time and hasn't set a theme yet.
+            case "light":
+                stylesheet = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/github.min.css";
+                break;
+            default:
+                throw "unrecognized theme " + document.documentElement.dataset.theme;
+                break;
+        }
+        // Now add the stylesheet to the document
+        var link = document.createElement("link");
+        link.rel = "stylesheet";
+        link.href = stylesheet;
+        link.type = "text/css";
+        link.media = "all";
+        document.head.appendChild(link);
+    </script>
 {% endmacro highlight_css %}
 
 {#
diff --git a/templates/style/base.scss b/templates/style/base.scss
@@ -97,7 +97,7 @@ body {
         border-bottom: 1px solid;
     }
     pre {
-        background-color: #F5F5F5;
+        background-color: var(--color-background-code);
         padding: 14px;
     }
     code, kbd, pre, samp {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ body {`
`97`	`97`	`border-bottom: 1px solid;`
`98`	`98`	`}`
`99`	`99`	`pre {`
`100`		`- background-color: #F5F5F5;`
	`100`	`+ background-color: var(--color-background-code);`
`101`	`101`	`padding: 14px;`
`102`	`102`	`}`
`103`	`103`	`code, kbd, pre, samp {`