adam/publicise-rs
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

[wip] Committing now when down to one error

Browse source 
Committing now when down to one error, and before zapping a bunch of
ampersands.
This commit is contained in:
Adam Cooper 2022-02-13 21:01:33 -05:00
parent 3b69ca58cd
commit 1c8e868afd
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main.rs
View file

@ -126,17 +126,17 @@ async fn get_folder_contents(url_tail: &String) -> Result<String, Box<dyn std::e
} }
#[tokio::main] #[tokio::main]
async fn traverse(mut queue: Vec<NextcloudResponse>) { async fn traverse(result: &Multistatus) {
debug!("Entering: traverse()"); debug!("Entering: traverse()");
// Initialize the indexed "pointer" // Initialize the indexed "pointer"
let mut current_index: usize = 0; let mut current_index: usize = 0;
let mut already_visited: bool; let mut already_visited: bool;
// Initialize the hashmap of visited items (by etag?) // Initialize the hashmap of visited items (by etag?)
let mut visited_items = HashMap::new(); let mut visited_items = HashMap::new();
// match queue[0].propstat[0].prop { // match result.response[0].propstat[0].prop {
match queue.into_iter().nth(0).unwrap() match result.response.into_iter().nth(0).unwrap()
.propstat.into_iter().nth(0).unwrap().prop { .propstat.into_iter().nth(0).unwrap().prop {
Some(prop) => match &prop.get_etag { Some(prop) => match prop.get_etag {
Some(etag) => { Some(etag) => {
visited_items.insert(etag, true); visited_items.insert(etag, true);
() ()
@ -146,12 +146,12 @@ async fn traverse(mut queue: Vec<NextcloudResponse>) {
_ => current_index += 1, _ => current_index += 1,
} }
// Depth first traversal // Depth first traversal
while !queue.is_empty() { while !result.response.is_empty() {
match &queue[current_index].propstat[0].prop { match &result.response[current_index].propstat[0].prop {
Some(prop) => { Some(prop) => {
match &prop.get_etag { match &prop.get_etag {
Some(etag) => { Some(etag) => {
// If queue[current_index] has not been visited // If result.response[current_index] has not been visited
if !visited_items.contains_key(etag) { if !visited_items.contains_key(etag) {
// If item is a collection // If item is a collection
// TODO(amcooper): Again, replace unwrap with the match implementation, // TODO(amcooper): Again, replace unwrap with the match implementation,
@ -161,15 +161,15 @@ async fn traverse(mut queue: Vec<NextcloudResponse>) {
if !resource_type.collection.is_empty() { if !resource_type.collection.is_empty() {
// Get the contents XML // Get the contents XML
let folder_contents: String = get_folder_contents( let folder_contents: String = get_folder_contents(
&queue[current_index].href, &result.response[current_index].href,
) )
.await .await
.unwrap(); .unwrap();
debug!("{:?}", folder_contents); debug!("{:?}", folder_contents);
// Parse the contents XML into Multistatus // Parse the contents XML into Multistatus
let mut result: Multistatus = from_str(&String::from(folder_contents)).unwrap(); let mut new_result: Multistatus = from_str(&String::from(folder_contents)).unwrap();
// Append the NextcloudResponse vector to queue // Append the NextcloudResponse vector to result.response
queue.append(&mut result.response); result.response.append(&new_result.response);
} }
} }
_ => current_index += 1, _ => current_index += 1,
@ -228,6 +228,6 @@ async fn main() -> std::io::Result<()> {
let mut result: Multistatus = from_str(&folder_contents).unwrap(); let mut result: Multistatus = from_str(&folder_contents).unwrap();
println!("{:?}", result); println!("{:?}", result);
// traverse(result.response); traverse(&result);
Ok(()) Ok(())
} }