Skip to content

Add date alongside release version #2847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add date alongside release version #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ca4e98
Add date alongside release version
GuillaumeGomez Jun 19, 2025
be10101
Update SQL queries
GuillaumeGomez Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...fd0374f2b8e650fa12c3931da3ee2e1ed82c.json → ...56c6f943b5530760163ff8a667fac627626f.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .sqlx/query-bc0b3932dc2f8bd2b8a9f5a312262eafefd3b80b3322116448901aa55f2d89e7.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion src/web/crate_details.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ pub(crate) struct Release {
pub is_library: Option<bool>,
pub rustdoc_status: Option<bool>,
pub target_name: Option<String>,
pub release_time: Option<DateTime<Utc>>,
}

impl CrateDetails {
Expand Down Expand Up @@ -382,6 +383,7 @@ pub(crate) async fn releases_for_crate(
releases.yanked,
releases.is_library,
releases.rustdoc_status,
releases.release_time,
releases.target_name
FROM releases
INNER JOIN release_build_status ON releases.id = release_build_status.rid
Expand Down Expand Up @@ -412,6 +414,7 @@ pub(crate) async fn releases_for_crate(
is_library: row.is_library,
rustdoc_status: row.rustdoc_status,
target_name: row.target_name,
release_time: row.release_time,
}))
})
.try_collect()
Expand Down Expand Up @@ -1143,7 +1146,10 @@ mod tests {
.await?;

let mut conn = db.async_conn().await;
let details = crate_details(&mut conn, "foo", "0.2.0", None).await;
let mut details = crate_details(&mut conn, "foo", "0.2.0", None).await;
for detail in &mut details.releases {
detail.release_time = None;
}

assert_eq!(
details.releases,
Expand All @@ -1156,6 +1162,7 @@ mod tests {
rustdoc_status: Some(true),
id: details.releases[0].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.12.0")?,
Expand All @@ -1165,6 +1172,7 @@ mod tests {
rustdoc_status: Some(true),
id: details.releases[1].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.3.0")?,
Expand All @@ -1174,6 +1182,7 @@ mod tests {
rustdoc_status: Some(false),
id: details.releases[2].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.2.0")?,
Expand All @@ -1183,6 +1192,7 @@ mod tests {
rustdoc_status: Some(true),
id: details.releases[3].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.2.0-alpha")?,
Expand All @@ -1192,6 +1202,7 @@ mod tests {
rustdoc_status: Some(true),
id: details.releases[4].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.1.1")?,
Expand All @@ -1201,6 +1212,7 @@ mod tests {
rustdoc_status: Some(true),
id: details.releases[5].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.1.0")?,
Expand All @@ -1210,6 +1222,7 @@ mod tests {
rustdoc_status: Some(true),
id: details.releases[6].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
Release {
version: semver::Version::parse("0.0.1")?,
Expand All @@ -1219,6 +1232,7 @@ mod tests {
rustdoc_status: Some(false),
id: details.releases[7].id,
target_name: Some("foo".to_owned()),
release_time: None,
},
]
);
Expand Down
56 changes: 55 additions & 1 deletion src/web/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,7 @@ mod test {
web::{cache::CachePolicy, encode_url_path},
};
use anyhow::Context;
use chrono::{NaiveDate, Utc};
use kuchikiki::traits::TendrilSink;
use reqwest::StatusCode;
use std::collections::BTreeMap;
Expand Down Expand Up @@ -2319,7 +2320,7 @@ mod test {
let anchor = page
.select(&selector)
.unwrap()
.find(|a| a.text_contents().trim() == version)
.find(|a| a.text_contents().trim().split(" ").next().unwrap() == version)
.unwrap();
let attributes = anchor.as_node().as_element().unwrap().attributes.borrow();
let classes = attributes.get("class").unwrap();
Expand All @@ -2333,6 +2334,59 @@ mod test {
})
}

#[test]
fn test_crate_release_version_and_date() {
async_wrapper(|env| async move {
env.fake_release()
.await
.name("hexponent")
.version("0.3.0")
.release_time(
NaiveDate::from_ymd_opt(2021, 1, 12)
.unwrap()
.and_hms_milli_opt(0, 0, 0, 0)
.unwrap()
.and_local_timezone(Utc)
.unwrap(),
)
.create()
.await?;
env.fake_release()
.await
.name("hexponent")
.version("0.2.0")
.release_time(
NaiveDate::from_ymd_opt(2020, 12, 1)
.unwrap()
.and_hms_milli_opt(0, 0, 0, 0)
.unwrap()
.and_local_timezone(Utc)
.unwrap(),
)
.create()
.await?;
let web = env.web_app().await;

let status = |version, date| {
let web = web.clone();
async move {
let page = kuchikiki::parse_html()
.one(web.get("/crate/hexponent/0.3.0").await?.text().await?);
let selector = format!(r#"ul > li a[href="/crate/hexponent/{version}"]"#);
let full = format!("{version} ({date})");
Result::<bool, anyhow::Error>::Ok(page.select(&selector).unwrap().any(|a| {
eprintln!("++++++> {:?}", a.text_contents());
a.text_contents().trim() == full
}))
}
};

assert!(status("0.3.0", "2021/01/12").await?);
assert!(status("0.2.0", "2020/12/01").await?);
Ok(())
})
}

#[test_case(true)]
#[test_case(false)]
fn test_no_trailing_rustdoc_slash(archive_storage: bool) {
Expand Down
21 changes: 12 additions & 9 deletions templates/macros.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<li class="pure-menu-item">
<a class="pure-menu-link {% if active_tab == *expected %} pure-menu-active {% endif %}" href="{{ href }}">
{# safe: allow passing in HTML #}
{{ text|safe }}
{{ text|safe -}}
</a>
</li>
{% endmacro active_link %}
Expand All @@ -23,7 +23,7 @@
{% macro menu_link(href, text, target) %}
<li class="pure-menu-item">
<a class="pure-menu-link" href="{{ href }}" {% if !target.is_empty() -%} target="{{ target }}" {%- endif %}>
{{ text }}
{{- text -}}
</a>
</li>
{% endmacro menu_link %}
Expand Down Expand Up @@ -142,13 +142,16 @@
{% if !title.is_empty() %} title="{{ title }}"{% endif %}
{% if retain_fragment %}data-fragment="retain"{% endif %}
>
{% if warning %}
{{ crate::icons::IconTriangleExclamation.render_solid(false, false, "") }}
{% endif %}
{% if release.build_status == "in_progress" %}
{{ crate::icons::IconGear.render_solid(true, true, "") }}
{% endif %}
{{ release.version }}
{%- if warning -%}
{{ crate::icons::IconTriangleExclamation.render_solid(false, false, "") -}}
{%+ endif -%}
{% if release.build_status == "in_progress" -%}
{{ crate::icons::IconGear.render_solid(true, true, "") -}}
{%+ endif -%}
<b>{{ release.version }}</b>
{%- if let Some(release_time) = release.release_time -%}
{# +#} ({{ release_time.format("%Y/%m/%d") }})
{%- endif -%}
</a>
</li>
{%- endfor -%}
Expand Down
2 changes: 1 addition & 1 deletion templates/rustdoc/topbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{%- if metadata.req_version.to_string() == "latest" -%}
<li class="pure-menu-item">
<a href="{% if permalink_path is defined %}{{permalink_path|safe}}{% endif %}" class="pure-menu-link description" id="permalink" title="Get a link to this specific version">
{{ crate::icons::IconLink.render_solid(false, false, "") }} Permalink
{{- crate::icons::IconLink.render_solid(false, false, "") }} Permalink
</a>
</li>
{%- endif -%}
Expand Down
Loading