arnekeller/KIT-ILIAS-downloader
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/KIT-ILIAS-downloader.git synced 2024-08-28 04:04:18 +00:00
Code Issues Projects Releases Wiki Activity

Handle objects in folders that do not have links

Browse Source
This commit is contained in:
FliegendeWurst 2020-04-25 08:42:05 +02:00
parent 2a4e7c7326
commit 137c1ff113
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.rs
View File

@ -373,13 +373,13 @@ impl ILIAS {
async fn personal_desktop(&self) -> Result<Dashboard> { async fn personal_desktop(&self) -> Result<Dashboard> {
let html = self.get_html("https://ilias.studium.kit.edu/ilias.php?baseClass=ilPersonalDesktopGUI&cmd=jumpToSelectedItems").await?; let html = self.get_html("https://ilias.studium.kit.edu/ilias.php?baseClass=ilPersonalDesktopGUI&cmd=jumpToSelectedItems").await?;
let items = ILIAS::get_items(&html)?; let items = ILIAS::get_items(&html).into_iter().flat_map(Result::ok).collect();
Ok(Dashboard { Ok(Dashboard {
items items
}) })
} }
fn get_items(html: &Html) -> Result<Vec<Object>> { fn get_items(html: &Html) -> Vec<Result<Object>> {
let container_items = Selector::parse("div.il_ContainerListItem").unwrap(); let container_items = Selector::parse("div.il_ContainerListItem").unwrap();
let container_item_title = Selector::parse("a.il_ContainerItemTitle").unwrap(); let container_item_title = Selector::parse("a.il_ContainerItemTitle").unwrap();
html.select(&container_items).map(|item| { html.select(&container_items).map(|item| {
@ -411,9 +411,9 @@ impl ILIAS {
} }
} }
async fn get_course_content(&self, url: &URL) -> Result<Vec<Object>> { async fn get_course_content(&self, url: &URL) -> Result<Vec<Result<Object>>> {
let html = self.get_html(&url.url).await?; let html = self.get_html(&url.url).await?;
Ok(ILIAS::get_items(&html)?) Ok(ILIAS::get_items(&html))
} }
async fn get_course_content_tree(&self, ref_id: &str, cmd_node: &str) -> Result<Vec<Object>> { async fn get_course_content_tree(&self, ref_id: &str, cmd_node: &str) -> Result<Vec<Object>> {
@ -579,11 +579,11 @@ fn process(ilias: Arc<ILIAS>, path: PathBuf, obj: Object) -> impl std::future::F
return Ok(()); // ignore groups we are not in return Ok(()); // ignore groups we are not in
} }
println!("Warning: {:?} falling back to incomplete course content extractor! {}", name, e.display_chain()); println!("Warning: {:?} falling back to incomplete course content extractor! {}", name, e.display_chain());
ilias.get_course_content(&url).await? // TODO: perhaps don't download almost the same content 3x ilias.get_course_content(&url).await?.into_iter().flat_map(Result::ok).collect() // TODO: perhaps don't download almost the same content 3x
} }
} }
} else { } else {
ilias.get_course_content(&url).await? ilias.get_course_content(&url).await?.into_iter().flat_map(Result::ok).collect()
}; };
for item in content { for item in content {
let mut path = path.clone(); let mut path = path.clone();
@ -602,6 +602,13 @@ fn process(ilias: Arc<ILIAS>, path: PathBuf, obj: Object) -> impl std::future::F
} }
let content = ilias.get_course_content(&url).await?; let content = ilias.get_course_content(&url).await?;
for item in content { for item in content {
if item.is_err() {
if ilias.opt.verbose > 0 {
println!("Ignoring: {}", item.err().unwrap().display_chain());
}
continue;
}
let item = item.unwrap();
let mut path = path.clone(); let mut path = path.clone();
path.push(item.name()); path.push(item.name());
let ilias = Arc::clone(&ilias); let ilias = Arc::clone(&ilias);