Garmelon/wikilyze
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move some functions to util

Browse source
This commit is contained in:
Joscha 2022-10-23 01:14:31 +02:00
parent a7b9849183
commit 1265dd4a41
2 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
brood/src/commands/path.rs
View file

@ -3,32 +3,9 @@ use std::fs::File;
use std::io::{self, BufReader}; use std::io::{self, BufReader};
use std::path::Path; use std::path::Path;
use crate::data::{AdjacencyList, LinkInfo, Page, PageInfo}; use crate::data::{AdjacencyList, LinkInfo, PageInfo};
use crate::util; use crate::util;
fn find_index_of_title(pages: &[Page<PageInfo>], title: &str) -> u32 {
let title = util::normalize_link(title);
pages
.iter()
.enumerate()
.find(|(_, p)| util::normalize_link(&p.data.title) == title)
.map(|(i, _)| i)
.expect("invalid title") as u32
}
fn resolve_redirects(data: &AdjacencyList<PageInfo, LinkInfo>, mut page_idx: u32) -> u32 {
loop {
if data.page(page_idx).data.redirect {
if let Some(link_idx) = data.link_redirect(page_idx) {
page_idx = data.link(link_idx).to;
continue;
}
}
return page_idx;
}
}
struct DijkstraPageInfo { struct DijkstraPageInfo {
cost: u32, cost: u32,
prev_page_idx: u32, prev_page_idx: u32,
@ -54,6 +31,7 @@ impl DijkstraLinkInfo {
Self { Self {
cost: 1, cost: 1,
// cost: 1000 + info.start, // cost: 1000 + info.start,
// cost: 10000 + info.start,
// cost: 1000 + info.start / 10, // cost: 1000 + info.start / 10,
} }
} }
@ -157,8 +135,8 @@ pub fn path(datafile: &Path, from: &str, to: &str) -> io::Result<()> {
let pages = data.pages.clone(); let pages = data.pages.clone();
println!(">> Locate from and to"); println!(">> Locate from and to");
let from_idx = resolve_redirects(&data, find_index_of_title(&pages, from)); let from_idx = util::resolve_redirects(&data, util::find_index_of_title(&pages, from));
let to_idx = resolve_redirects(&data, find_index_of_title(&pages, to)); let to_idx = util::resolve_redirects(&data, util::find_index_of_title(&pages, to));
println!("From: {:?}", data.page(from_idx).data.title); println!("From: {:?}", data.page(from_idx).data.title);
println!("To: {:?}", data.page(to_idx).data.title); println!("To: {:?}", data.page(to_idx).data.title);

25
brood/src/util.rs
View file

@ -1,3 +1,5 @@
use crate::data::{AdjacencyList, LinkInfo, Page, PageInfo};
pub fn normalize_link(link: &str) -> String { pub fn normalize_link(link: &str) -> String {
let link = link.trim().replace(' ', "_"); let link = link.trim().replace(' ', "_");
@ -9,3 +11,26 @@ pub fn normalize_link(link: &str) -> String {
.chain(link.chars().skip(1)) .chain(link.chars().skip(1))
.collect::<String>() .collect::<String>()
} }
pub fn find_index_of_title(pages: &[Page<PageInfo>], title: &str) -> u32 {
let title = normalize_link(title);
pages
.iter()
.enumerate()
.find(|(_, p)| normalize_link(&p.data.title) == title)
.map(|(i, _)| i)
.expect("invalid title") as u32
}
pub fn resolve_redirects(data: &AdjacencyList<PageInfo, LinkInfo>, mut page_idx: u32) -> u32 {
loop {
if data.page(page_idx).data.redirect {
if let Some(link_idx) = data.link_redirect(page_idx) {
page_idx = data.link(link_idx).to;
continue;
}
}
return page_idx;
}
}