vndb/manned
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

indexer: Update crates to latest version

Browse source 
With the exception of Hyper, because the new tokio-based version is...
different.
This commit is contained in:
Yorhel 2018-03-25 10:36:26 +02:00
parent 8487d37aad
commit 2c7bf1507a
5 changed files with 801 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

14
indexer/src/main.rs
View file

@ -93,15 +93,15 @@ fn main() {
unsafe { pkg::DRY_RUN = arg.is_present("dry") };
let verbose = arg.occurrences_of("v");
env_logger::LogBuilder::new()
env_logger::Builder::new()
.filter(Some("indexer"), match verbose {
0 => log::LogLevelFilter::Warn,
1 => log::LogLevelFilter::Info,
2 => log::LogLevelFilter::Debug,
_ => log::LogLevelFilter::Trace,
0 => log::LevelFilter::Warn,
1 => log::LevelFilter::Info,
2 => log::LevelFilter::Debug,
_ => log::LevelFilter::Trace,
})
.filter(Some("postgres"), if verbose >= 4 { log::LogLevelFilter::Trace } else { log::LogLevelFilter::Info })
.init().unwrap();
.filter(Some("postgres"), if verbose >= 4 { log::LevelFilter::Trace } else { log::LevelFilter::Info })
.init();
if let Err(e) = open::clear_cache() {
error!("Error clearing cache: {}", e);

1
indexer/src/sys_freebsd1.rs
View file

@ -1,5 +1,4 @@
use std::collections::HashSet;
use std::ascii::AsciiExt;
use std::io::Result;
use regex::Regex;
use postgres;

97
indexer/src/sys_rpm.rs
View file

@ -2,9 +2,11 @@ use std::collections::HashSet;
use std::io::BufReader;
use std::str::FromStr;
use std::error::Error;
use std::fmt;
use chrono::NaiveDateTime;
use postgres;
use quick_xml as xml;
use quick_xml::events::Event;
use archive;
use open;
@ -12,14 +14,29 @@ use pkg;
use man;
fn xml_getattr(e: &xml::Element, attr: &str) -> Result<String,Box<Error>> {
for kv in e.unescaped_attributes() {
let (key, val) = kv.map_err(|(e,_)| e)?;
if key == attr.as_bytes() {
return Ok(String::from_utf8(val.into_owned())?);
// Ugh, quick-xml's Error type does not implement Error.
#[derive(Debug)]
struct XmlError(String);
impl fmt::Display for XmlError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{}", self.0) }
}
impl Error for XmlError {
fn description(&self) -> &str { self.0.as_ref() }
}
fn to_err(e: xml::Error) -> XmlError {
XmlError(format!("{}", e))
}
fn xml_getattr(e: &xml::events::BytesStart, attr: &str) -> Result<String,Box<Error>> {
for kv in e.attributes().with_checks(false) {
let kv = kv.map_err(to_err)?;
if kv.key == attr.as_bytes() {
return Ok(String::from_utf8(kv.value.into_owned())?);
}
}
Err(Box::new(xml::error::Error::EOL))
Err(Box::new(XmlError(format!("Attribute '{}' not found", attr))))
}
@ -41,23 +58,28 @@ fn readpkgs<F>(url: String, mut cb: F) -> Result<(),Box<Error>>
{
debug!("Reading {}", url);
let mut fd = open::Path{path: &url, cache: true, canbelocal: false}.open()?;
let xml = xml::XmlReader::from_reader(
let mut xml = xml::Reader::from_reader(
BufReader::new(
archive::Archive::open_raw(&mut fd)?
)
).trim_text(true);
);
xml.trim_text(true);
let mut savestr = false;
let mut saved = None;
let mut pkg = PkgInfo::default();
let mut buf = Vec::new();
let arch_src = Some("src".to_string());
for event in xml {
let event = event.map_err(|(e,_)| e)?;
loop {
let event = xml.read_event(&mut buf);
let event = event.map_err(to_err)?;
match event {
xml::Event::Start(ref e) =>
Event::Start(ref e) |
Event::Empty(ref e) =>
match e.name() {
b"name" |
b"file" |
@ -72,13 +94,13 @@ fn readpkgs<F>(url: String, mut cb: F) -> Result<(),Box<Error>>
_ => (),
},
xml::Event::Text(e) =>
Event::Text(e) =>
if savestr {
saved = Some(e.into_unescaped_string()?);
saved = Some(e.unescape_and_decode(&xml).map_err(to_err)?);
savestr = false
},
xml::Event::End(ref e) => {
Event::End(ref e) => {
savestr = false;
match e.name() {
b"name" => pkg.name = Some(saved.take().unwrap()),
@ -94,6 +116,7 @@ fn readpkgs<F>(url: String, mut cb: F) -> Result<(),Box<Error>>
};
},
Event::Eof => break,
_ => (),
}
}
@ -105,35 +128,43 @@ fn readpkgs<F>(url: String, mut cb: F) -> Result<(),Box<Error>>
fn repomd(url: String) -> Result<(String,String),Box<Error>> {
debug!("Reading {}", url);
let mut fd = open::Path{path: &url, cache: true, canbelocal: false}.open()?;
let xml = xml::XmlReader::from_reader(
let mut xml = xml::Reader::from_reader(
BufReader::new(
archive::Archive::open_raw(&mut fd)?
)
).trim_text(true);
);
xml.trim_text(true);
let mut primary = String::new();
let mut filelists = String::new();
let mut datatype = 0;
let mut buf = Vec::new();
for event in xml {
if let xml::Event::Start(ref e) = event.map_err(|(e,_)| e)? {
match e.name() {
b"data" =>
datatype = match &xml_getattr(e, "type")? as &str {
"primary" => 1,
"filelists" => 2,
_ => 0,
},
loop {
let event = xml.read_event(&mut buf).map_err(to_err)?;
match event {
Event::Start(ref e) |
Event::Empty(ref e) => {
match e.name() {
b"data" =>
datatype = match &xml_getattr(e, "type")? as &str {
"primary" => 1,
"filelists" => 2,
_ => 0,
},
b"location" =>
match datatype {
1 => primary = xml_getattr(e, "href")?,
2 => filelists = xml_getattr(e, "href")?,
_ => (),
},
b"location" =>
match datatype {
1 => primary = xml_getattr(e, "href")?,
2 => filelists = xml_getattr(e, "href")?,
_ => (),
},
_ => (),
}
_ => (),
}
},
Event::Eof => break,
_ => (),
}
}
Ok((primary, filelists))