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

indexer: Fix bug in Contents file parsing + decrease cron verbosity

Browse source 
Turns out that not all Contents files heave a header.
This commit is contained in:
Yorhel 2016-11-27 10:48:32 +01:00
parent eb15b6e2c7
commit b79ecfb284
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
indexer/src/sys_deb.rs
View file

@ -18,21 +18,20 @@ fn get_contents(f: Option<open::Path>) -> Result<HashSet<String>> {
let rd = archive::Archive::open_raw(&mut fd)?; let rd = archive::Archive::open_raw(&mut fd)?;
let brd = BufReader::new(rd); let brd = BufReader::new(rd);
let mut pkgs = HashSet::new(); let mut pkgs = HashSet::new();
let mut filecnt = -1; let mut filecnt = 0;
let mut mancnt = 0; let mut mancnt = 0;
for line in brd.split(b'\n') { for line in brd.split(b'\n') {
let line = line?; let line = line?;
let line = match str::from_utf8(&line) { Ok(x) => x, _ => continue }; let line = match str::from_utf8(&line) { Ok(x) => x, _ => continue };
if line.starts_with("FILE ") { let mut it = line.split(' ');
filecnt = 0;
continue; let pkg = it.next_back().unwrap();
} else if filecnt < 0 { if !pkg.contains('/') || pkg == "LOCATION" {
continue; continue;
} }
filecnt += 1; filecnt += 1;
let mut it = line.split(' ');
let pkg = it.next_back().unwrap();
let path = it.fold(String::new(), |acc, x| acc + " " + x); let path = it.fold(String::new(), |acc, x| acc + " " + x);
if man::ismanpath(&path.trim()) { if man::ismanpath(&path.trim()) {
mancnt += 1; mancnt += 1;
@ -42,7 +41,7 @@ fn get_contents(f: Option<open::Path>) -> Result<HashSet<String>> {
} }
} }
debug!("Found {}/{} man files in {} relevant packages from {}", mancnt, filecnt, pkgs.len(), f.path); info!("Found {}/{} man files in {} relevant packages from {}", mancnt, filecnt, pkgs.len(), f.path);
Ok(pkgs) Ok(pkgs)
} }

4
util/common.sh
View file

@ -2,8 +2,8 @@ test -f .config && source ./.config
index() { index() {
echo "====> indexer -vv $@" echo "====> indexer -v $@"
./indexer -vv $@ 2>&1 ./indexer -v $@ 2>&1
echo echo
} }