serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor lookup of license resources

Browse source
This commit is contained in:
Magnus Hoff 2017-11-02 15:34:36 +01:00
parent 29a7d58b41
commit e563faf81a
1 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/wiki_lookup.rs
View file

@ -29,6 +29,21 @@ lazy_static! {
format!("amatic-sc-v9-latin-regular.woff") => format!("amatic-sc-v9-latin-regular.woff") =>
Box::new(|| Box::new(AmaticFont) as BoxResource) as ResourceFn, Box::new(|| Box::new(AmaticFont) as BoxResource) as ResourceFn,
}; };
static ref LICENSES_MAP: HashMap<String, ResourceFn> = hashmap!{
"bsd-3-clause".to_owned() => Box::new(|| Box::new(
HtmlResource::new(Some("../"), "The 3-Clause BSD License", include_str!("licenses/bsd-3-clause.html"))
) as BoxResource) as ResourceFn,
"gpl3".to_owned() => Box::new(|| Box::new(
HtmlResource::new(Some("../"), "GNU General Public License", include_str!("licenses/gpl3.html"))
) as BoxResource) as ResourceFn,
"mit".to_owned() => Box::new(|| Box::new(
HtmlResource::new(Some("../"), "The MIT License", include_str!("licenses/mit.html"))
) as BoxResource) as ResourceFn,
"mpl2".to_owned() => Box::new(|| Box::new(
HtmlResource::new(Some("../"), "Mozilla Public License Version 2.0", include_str!("licenses/mpl2.html"))
) as BoxResource) as ResourceFn,
};
} }
#[derive(Clone)] #[derive(Clone)]
@ -48,7 +63,9 @@ fn split_one(path: &str) -> Result<(Cow<str>, Option<&str>), Utf8Error> {
Ok((head, tail)) Ok((head, tail))
} }
fn asset_lookup(path: &str) -> FutureResult<Option<BoxResource>, Box<::std::error::Error + Send + Sync>> { fn map_lookup(map: &HashMap<String, ResourceFn>, path: &str) ->
FutureResult<Option<BoxResource>, Box<::std::error::Error + Send + Sync>>
{
let (head, tail) = match split_one(path) { let (head, tail) = match split_one(path) {
Ok(x) => x, Ok(x) => x,
Err(x) => return failed(x.into()), Err(x) => return failed(x.into()),
@ -58,7 +75,7 @@ fn asset_lookup(path: &str) -> FutureResult<Option<BoxResource>, Box<::std::erro
return finished(None); return finished(None);
} }
match ASSETS_MAP.get(head.as_ref()) { match map.get(head.as_ref()) {
Some(resource_fn) => finished(Some(resource_fn())), Some(resource_fn) => finished(Some(resource_fn())),
None => finished(None), None => finished(None),
} }
@ -129,34 +146,10 @@ impl WikiLookup {
match (head.as_ref(), tail) { match (head.as_ref(), tail) {
("_about", None) => ("_about", None) =>
Box::new(finished(Some(Box::new(AboutResource::new()) as BoxResource))), Box::new(finished(Some(Box::new(AboutResource::new()) as BoxResource))),
("_about", Some(tail)) => { ("_about", Some(license)) =>
let (head, tail) = match split_one(tail) { Box::new(map_lookup(&LICENSES_MAP, license)),
Ok(x) => x,
Err(x) => return Box::new(failed(x.into())),
};
match (head.as_ref(), tail) {
("bsd-3-clause", None) =>
Box::new(finished(Some(Box::new(
HtmlResource::new(Some("../"), "The 3-Clause BSD License", include_str!("licenses/bsd-3-clause.html"))
) as BoxResource))),
("gpl3", None) =>
Box::new(finished(Some(Box::new(
HtmlResource::new(Some("../"), "GNU General Public License", include_str!("licenses/gpl3.html"))
) as BoxResource))),
("mit", None) =>
Box::new(finished(Some(Box::new(
HtmlResource::new(Some("../"), "The MIT License", include_str!("licenses/mit.html"))
) as BoxResource))),
("mpl2", None) =>
Box::new(finished(Some(Box::new(
HtmlResource::new(Some("../"), "Mozilla Public License Version 2.0", include_str!("licenses/mpl2.html"))
) as BoxResource))),
_ => Box::new(finished(None)),
}
},
("_assets", Some(asset)) => ("_assets", Some(asset)) =>
Box::new(asset_lookup(asset)), Box::new(map_lookup(&ASSETS_MAP, asset)),
("_by_id", Some(tail)) => ("_by_id", Some(tail)) =>
self.by_id_lookup(tail, query), self.by_id_lookup(tail, query),
("_changes", None) => ("_changes", None) =>