Skip to content

Redirect /releases/user to crates.io #1879

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

Merged
merged 4 commits into from
Oct 14, 2022
Merged

Redirect /releases/user to crates.io #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bdb40f
Redirect /releases/user to crates.io
jsha Oct 13, 2022
24e66af
Replace links to /releases/<owner> with crates.io
jsha Oct 13, 2022
b974016
Remove a releases-by-owner test
jsha Oct 13, 2022
7440a47
Add test for owner releases redirect
jsha Oct 14, 2022
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
196 changes: 22 additions & 174 deletions src/web/releases.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,61 +114,6 @@ pub(crate) fn get_releases(
.collect()
}

fn get_releases_by_owner(
conn: &mut Client,
page: i64,
limit: i64,
owner: &str,
) -> (String, Vec<Release>) {
let offset = (page - 1) * limit;

let query = "SELECT crates.name,
releases.version,
releases.description,
releases.target_name,
builds.build_time,
releases.rustdoc_status,
repositories.stars,
owners.name,
owners.login
FROM crates
INNER JOIN releases ON releases.id = crates.latest_version_id
INNER JOIN builds ON releases.id = builds.rid
INNER JOIN owner_rels ON owner_rels.cid = crates.id
INNER JOIN owners ON owners.id = owner_rels.oid
LEFT JOIN repositories ON releases.repository_id = repositories.id
WHERE owners.login = $1
ORDER BY repositories.stars DESC NULLS LAST
LIMIT $2 OFFSET $3";
let query = conn.query(query, &[&owner, &limit, &offset]).unwrap();

let mut owner_name = None;
let packages = query
.into_iter()
.map(|row| {
if owner_name.is_none() {
owner_name = Some(if !row.get::<usize, String>(7).is_empty() {
row.get(7)
} else {
row.get(8)
});
}

Release {
name: row.get(0),
version: row.get(1),
description: row.get(2),
target_name: row.get(3),
build_time: row.get(4),
rustdoc_status: row.get(5),
stars: row.get::<_, Option<i32>>(6).unwrap_or(0),
}
})
.collect();

(owner_name.unwrap_or_default(), packages)
}

struct SearchResult {
pub results: Vec<Release>,
pub executed_query: Option<String>,
Expand Down Expand Up @@ -355,7 +300,6 @@ pub(super) enum ReleaseType {
Stars,
RecentFailures,
Failures,
Owner,
Search,
}

Expand All @@ -379,9 +323,9 @@ fn releases_handler(req: &mut Request, release_type: ReleaseType) -> IronResult<
true,
),

ReleaseType::Owner | ReleaseType::Search => panic!(
"The owners and search page have special requirements and cannot use this handler",
),
ReleaseType::Search => {
panic!("The search page has special requirements and cannot use this handler",)
}
};

let releases = {
Expand Down Expand Up @@ -431,45 +375,14 @@ pub fn releases_failures_by_stars_handler(req: &mut Request) -> IronResult<Respo

pub fn owner_handler(req: &mut Request) -> IronResult<Response> {
let router = extension!(req, Router);
// page number of releases
let page_number: i64 = router
.find("page")
.and_then(|page_num| page_num.parse().ok())
.unwrap_or(1);
let owner_route_value = router.find("owner").unwrap();

let (owner_name, releases) = {
let mut conn = extension!(req, Pool).get()?;

// We need to keep the owner_route_value unchanged, as we may render paginated links in the page.
// Changing the owner_route_value directly will cause the link to change, for example: @foobar -> foobar.
let mut owner = owner_route_value;
if owner.starts_with('@') {
owner = &owner[1..];
}
get_releases_by_owner(&mut conn, page_number, RELEASES_IN_RELEASES, owner)
};

if releases.is_empty() {
return Err(Nope::OwnerNotFound.into());
let mut owner = router.find("owner").unwrap();
if owner.starts_with('@') {
owner = &owner[1..];
}

// Show next and previous page buttons
let (show_next_page, show_previous_page) = (
releases.len() == RELEASES_IN_RELEASES as usize,
page_number != 1,
);

ViewReleases {
releases,
description: format!("Crates from {}", owner_name),
release_type: ReleaseType::Owner,
show_next_page,
show_previous_page,
page_number,
owner: Some(owner_route_value.into()),
match format!("https://crates.io/users/{}", owner).parse() {
Ok(url) => Ok(super::redirect(url)),
Err(_) => Err(Nope::OwnerNotFound.into()),
}
.into_response(req)
}

#[derive(Debug, Clone, PartialEq, Serialize)]
Expand Down Expand Up @@ -783,7 +696,9 @@ pub fn build_queue_handler(req: &mut Request) -> IronResult<Response> {
mod tests {
use super::*;
use crate::index::api::CrateOwner;
use crate::test::{assert_redirect, assert_success, wrapper, TestFrontend};
use crate::test::{
assert_redirect, assert_redirect_unchecked, assert_success, wrapper, TestFrontend,
};
use anyhow::Error;
use chrono::{Duration, TimeZone};
use kuchiki::traits::TendrilSink;
Expand Down Expand Up @@ -1457,83 +1372,6 @@ mod tests {
});
}

#[test]
fn nonexistent_owner_page() {
wrapper(|env| {
env.fake_release()
.name("some_random_crate")
.add_owner(CrateOwner {
login: "foobar".into(),
avatar: "https://example.org/foobar".into(),
name: "Foo Bar".into(),
email: "[email protected]".into(),
})
.create()?;
let page = kuchiki::parse_html().one(
env.frontend()
.get("/releases/random-author")
.send()?
.text()?,
);

assert_eq!(page.select("#crate-title").unwrap().count(), 1);
assert_eq!(
page.select("#crate-title")
.unwrap()
.next()
.unwrap()
.text_contents(),
"The requested owner does not exist",
);

Ok(())
});
}

#[test]
fn owners_page() {
wrapper(|env| {
let web = env.frontend();
env.fake_release()
.name("some_random_crate")
.add_owner(CrateOwner {
login: "foobar".into(),
avatar: "https://example.org/foobar".into(),
name: "Foo Bar".into(),
email: "[email protected]".into(),
})
.create()?;
// Request an owner without @ sign.
assert_success("/releases/foobar", web)?;
// Request an owner with @ sign.
assert_success("/releases/@foobar", web)
})
}

#[test]
fn owners_pagination() {
wrapper(|env| {
let web = env.frontend();
for i in 0..RELEASES_IN_RELEASES {
env.fake_release()
.name(&format!("some_random_crate_{}", i))
.add_owner(CrateOwner {
login: "foobar".into(),
avatar: "https://example.org/foobar".into(),
name: "Foo Bar".into(),
email: "[email protected]".into(),
})
.create()?;
}
let page = kuchiki::parse_html().one(web.get("/releases/@foobar").send()?.text()?);
let button = page.select_first("a[href='/releases/@foobar/2']");

assert!(button.is_ok());

Ok(())
})
}

#[test]
fn home_page_links() {
wrapper(|env| {
Expand Down Expand Up @@ -1636,4 +1474,14 @@ mod tests {
Ok(())
});
}

#[test]
fn check_owner_releases_redirect() {
wrapper(|env| {
let web = env.frontend();

assert_redirect_unchecked("/releases/someone", "https://crates.io/users/someone", web)?;
Ok(())
});
}
}
2 changes: 1 addition & 1 deletion templates/crate/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<li class="pure-menu-heading">Owners</li>
<li class="pure-menu-item">
{%- for owner in details.owners -%}
<a href="/releases/{{ owner[0] }}">
<a href="https://crates.io/users/{{ owner[0] }}">
<img src="{{ owner[1] }}" alt="{{ owner[0] }}" class="owner">
</a>
{%- endfor -%}
Expand Down
10 changes: 2 additions & 8 deletions templates/releases/releases.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,14 @@

<div class="pagination">
{% block pagination %}
{%- if release_type == 'owner' -%}
{%- set page_link = "/releases/" ~ owner -%}
{%- else -%}
{%- set page_link = "/releases/" ~ release_type -%}
{%- endif -%}

{%- if show_previous_page -%}
<a class="pure-button pure-button-normal" href="{{ page_link | safe }}/{{ page_number - 1 }}{{ query | default(value='') }}">
<a class="pure-button pure-button-normal" href="/releases/{{ release_type }}/{{ page_number - 1 }}{{ query | default(value='') }}">
{{ "arrow-left" | fas }} Previous Page
</a>
{%- endif -%}

{%- if show_next_page -%}
<a class="pure-button pure-button-normal" href="{{ page_link | safe }}/{{ page_number + 1 }}{{ query | default(value='') }}">
<a class="pure-button pure-button-normal" href="/releases/{{ release_type }}/{{ page_number + 1 }}{{ query | default(value='') }}">
Next Page {{ "arrow-right" | fas }}
</a>
{%- endif -%}
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 @@ -97,7 +97,7 @@

{%- for owner in krate.owners -%}
<li class="pure-menu-item">
<a href="/releases/{{ owner[0] }}" class="pure-menu-link">
<a href="https://crates.io/users/{{ owner[0] }}" class="pure-menu-link">
{{ "user" | fas(fw=true) }} {{ owner[0] }}
</a>
</li>
Expand Down