Skip to content
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

Jump to bottom

Refactored web/mod.rs #685

Merged
merged 11 commits into from
Apr 15, 2020
Merged

Refactored web/mod.rs #685

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
706f64f
Freed web/mod.rs from the tyranny of bad style
Kixiron Apr 2, 2020
aa645dd
Merge branch 'master' of https://github.com/rust-lang/docs.rs into fr…
Kixiron Apr 3, 2020
38a35b5
Removed formatting :(
Kixiron Apr 3, 2020
85f4136
Rebased with master
Kixiron Apr 14, 2020
ba0fc2c
Update src/web/mod.rs
Kixiron Apr 14, 2020
91eb7d0
Update src/web/mod.rs
Kixiron Apr 14, 2020
63911c7
Update src/web/mod.rs
Kixiron Apr 14, 2020
f86e52a
Update src/web/mod.rs
Kixiron Apr 14, 2020
c0cdfb5
removed pre-allocation
Kixiron Apr 15, 2020
8371c7d
Merge branch 'freedom-to-the-web' of github.com:Kixiron/docs.rs into …
Kixiron Apr 15, 2020
a2eb524
Fixed match
Kixiron Apr 15, 2020
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
134 changes: 68 additions & 66 deletions src/web/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,11 @@ impl MatchSemver {
/// underscores (`_`) and vice-versa. The return value will indicate whether the crate name has
/// been matched exactly, or if there has been a "correction" in the name that matched instead.
fn match_version(conn: &Connection, name: &str, version: Option<&str>) -> Option<MatchVersion> {
// version is an Option<&str> from router::Router::get
// need to decode first
jyn514 marked this conversation as resolved.
Show resolved Hide resolved
// version is an Option<&str> from router::Router::get, need to decode first
use url::percent_encoding::percent_decode;

let req_version = version
.and_then(|v| match percent_decode(v.as_bytes()).decode_utf8() {
Ok(p) => Some(p),
Err(_) => None,
})
.and_then(|v| percent_decode(v.as_bytes()).decode_utf8().ok())
Kixiron marked this conversation as resolved.
Show resolved Hide resolved
.map(|v| {
if v == "newest" || v == "latest" {
"*".into()
Expand All @@ -265,11 +262,13 @@ fn match_version(conn: &Connection, name: &str, version: Option<&str>) -> Option
let query = "SELECT name, version, releases.id
FROM releases INNER JOIN crates ON releases.crate_id = crates.id
WHERE normalize_crate_name(name) = normalize_crate_name($1) AND yanked = false";

let rows = conn.query(query, &[&name]).unwrap();
let mut rows = rows.iter().peekable();

if let Some(row) = rows.peek() {
let db_name = row.get(0);

if db_name != name {
corrected_name = Some(db_name);
}
Expand All @@ -278,15 +277,12 @@ fn match_version(conn: &Connection, name: &str, version: Option<&str>) -> Option
rows.map(|row| (row.get(1), row.get(2))).collect()
};

// first check for exact match
// we can't expect users to use semver in query
for version in &versions {
if version.0 == req_version {
return Some(MatchVersion {
corrected_name,
version: MatchSemver::Exact(version.clone()),
});
}
// first check for exact match, we can't expect users to use semver in query
if let Some((version, id)) = versions.iter().find(|(vers, _)| vers == &req_version) {
jyn514 marked this conversation as resolved.
Show resolved Hide resolved
return Some(MatchVersion {
corrected_name,
version: MatchSemver::Exact((version.to_owned(), *id)),
});
}

// Now try to match with semver
Expand All @@ -297,8 +293,7 @@ fn match_version(conn: &Connection, name: &str, version: Option<&str>) -> Option
let mut versions_sem: Vec<(Version, i32)> = Vec::new();

for version in &versions {
// in theory a crate must always have a semver compatible version
// but check result just in case
// in theory a crate must always have a semver compatible version, but check result just in case
jyn514 marked this conversation as resolved.
Show resolved Hide resolved
versions_sem.push((Version::parse(&version.0).ok()?, version.1));
}

Expand All @@ -307,13 +302,14 @@ fn match_version(conn: &Connection, name: &str, version: Option<&str>) -> Option
versions_sem
};

for version in &versions_sem {
if req_sem_ver.matches(&version.0) {
return Some(MatchVersion {
corrected_name,
version: MatchSemver::Semver((version.0.to_string(), version.1)),
});
}
if let Some((version, id)) = versions_sem
.iter()
.find(|(vers, _)| req_sem_ver.matches(vers))
jyn514 marked this conversation as resolved.
Show resolved Hide resolved
{
return Some(MatchVersion {
corrected_name,
version: MatchSemver::Semver((version.to_string(), *id)),
});
}

// semver is acting weird for '*' (any) range if a crate only have pre-release versions
Expand Down Expand Up @@ -402,25 +398,26 @@ impl Server {
fn duration_to_str(ts: time::Timespec) -> String {
let tm = time::at(ts);
let delta = time::now() - tm;
let delta = (
delta.num_days(),
delta.num_hours(),
delta.num_minutes(),
delta.num_seconds(),
);

if delta.num_days() > 5 {
format!("{}", tm.strftime("%b %d, %Y").unwrap())
} else if delta.num_days() > 1 {
format!("{} days ago", delta.num_days())
} else if delta.num_days() == 1 {
"one day ago".to_string()
} else if delta.num_hours() > 1 {
format!("{} hours ago", delta.num_hours())
} else if delta.num_hours() == 1 {
"an hour ago".to_string()
} else if delta.num_minutes() > 1 {
format!("{} minutes ago", delta.num_minutes())
} else if delta.num_minutes() == 1 {
"one minute ago".to_string()
} else if delta.num_seconds() > 0 {
format!("{} seconds ago", delta.num_seconds())
} else {
"just now".to_string()
match delta {
(days, ..) if days > 5 => format!("{}", tm.strftime("%b %d, %Y").unwrap()),
(days @ 2..=5, ..) => format!("{} days ago", days),
(1, ..) => "one day ago".to_string(),

(_, hours, ..) if hours > 1 => format!("{} hours ago", hours),
(_, 1, ..) => "an hour ago".to_string(),

(_, _, minutes, _) if minutes > 1 => format!("{} minutes ago", minutes),
(_, _, 1, _) => "one minute ago".to_string(),

(_, _, _, seconds) if seconds > 0 => format!("{} seconds ago", seconds),
_ => "just now".to_string(),
}
}

Expand Down Expand Up @@ -458,10 +455,12 @@ fn style_css_handler(_: &mut Request) -> IronResult<Response> {
CacheDirective::Public,
CacheDirective::MaxAge(STATIC_FILE_CACHE_DURATION as u32),
];

response
.headers
.set(ContentType("text/css".parse().unwrap()));
response.headers.set(CacheControl(cache));

Ok(response)
}

Expand All @@ -475,6 +474,7 @@ fn load_js(file_path_str: &'static str) -> IronResult<Response> {
.headers
.set(ContentType("application/javascript".parse().unwrap()));
response.headers.set(CacheControl(cache));

Ok(response)
}

Expand All @@ -487,7 +487,9 @@ fn opensearch_xml_handler(_: &mut Request) -> IronResult<Response> {
response.headers.set(ContentType(
"application/opensearchdescription+xml".parse().unwrap(),
));

response.headers.set(CacheControl(cache));

Ok(response)
}

Expand Down Expand Up @@ -523,34 +525,31 @@ pub(crate) struct MetaData {

impl MetaData {
fn from_crate(conn: &Connection, name: &str, version: &str) -> Option<MetaData> {
if let Some(row) = &conn
let rows = conn
.query(
"SELECT crates.name,
releases.version,
releases.description,
releases.target_name,
releases.rustdoc_status,
releases.default_target
FROM releases
INNER JOIN crates ON crates.id = releases.crate_id
WHERE crates.name = $1 AND releases.version = $2",
releases.version,
releases.description,
releases.target_name,
releases.rustdoc_status,
releases.default_target
FROM releases
INNER JOIN crates ON crates.id = releases.crate_id
WHERE crates.name = $1 AND releases.version = $2",
&[&name, &version],
)
.unwrap()
.iter()
.next()
{
return Some(MetaData {
name: row.get(0),
version: row.get(1),
description: row.get(2),
target_name: row.get(3),
rustdoc_status: row.get(4),
default_target: row.get(5),
});
}
.unwrap();

None
let row = rows.iter().next()?;

Some(MetaData {
name: row.get(0),
version: row.get(1),
description: row.get(2),
target_name: row.get(3),
rustdoc_status: row.get(4),
default_target: row.get(5),
})
}
}

Expand All @@ -563,6 +562,7 @@ impl ToJson for MetaData {
m.insert("target_name".to_owned(), self.target_name.to_json());
m.insert("rustdoc_status".to_owned(), self.rustdoc_status.to_json());
m.insert("default_target".to_owned(), self.default_target.to_json());

m.to_json()
}
}
Expand Down Expand Up @@ -660,6 +660,7 @@ mod test {
let web = env.frontend();
for krate in &["std", "alloc", "core", "proc_macro", "test"] {
let target = format!("https://doc.rust-lang.org/stable/{}/", krate);

// with or without slash
assert_redirect(&format!("/{}", krate), &target, web)?;
assert_redirect(&format!("/{}/", krate), &target, web)?;
Expand Down Expand Up @@ -699,6 +700,7 @@ mod test {
.source_file("src/main.rs", br#"println!("definitely valid rust")"#)
.create()
.unwrap();

let web = env.frontend();
assert_success("/crate/regex/0.3.0/source/src/main.rs", web)?;
assert_success("/crate/regex/0.3.0/source", web)?;
Expand Down Expand Up @@ -742,6 +744,7 @@ mod test {

let release_id = release("0.3.0", db);
let query = "UPDATE releases SET yanked = true WHERE id = $1 AND version = '0.3.0'";

db.conn().query(query, &[&release_id]).unwrap();
assert_eq!(version(None, db), None);
assert_eq!(version(Some("0.3"), db), None);
Expand All @@ -763,7 +766,6 @@ mod test {
release("0.1.0+4.1", db);
release("0.1.1", db);
assert_eq!(version(None, db), semver("0.1.1"));

release("0.5.1+zstd.1.4.4", db);
assert_eq!(version(None, db), semver("0.5.1+zstd.1.4.4"));
assert_eq!(version(Some("0.5"), db), semver("0.5.1+zstd.1.4.4"));
Expand Down