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

Output saved attachments

Browse Source
This commit is contained in:
FliegendeWurst 2021-06-11 15:01:09 +02:00
parent 1a95ad6f59
commit e4015e723d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ilias/thread.rs
View File

@ -113,16 +113,19 @@ pub async fn download(path: &Path, relative_path: &Path, ilias: Arc<ILIAS>, url:
let src = URL::from_href(&image)?; let src = URL::from_href(&image)?;
let dl = ilias.download(&src.url).await?; let dl = ilias.download(&src.url).await?;
let mut path = path.to_owned(); let mut path = path.to_owned();
if let Some(m) = IMAGE_SRC_REGEX.captures(&image) { let file_name = if let Some(m) = IMAGE_SRC_REGEX.captures(&image) {
// image uploaded to ILIAS // image uploaded to ILIAS
let (media_id, filename) = (m.get(1).unwrap().as_str(), m.get(2).unwrap().as_str()); let (media_id, filename) = (m.get(1).unwrap().as_str(), m.get(2).unwrap().as_str());
path.push(file_escape(&format!("{}_{}_{}", id, media_id, filename))); file_escape(&format!("{}_{}_{}", id, media_id, filename))
} else { } else {
// external image // external image
path.push(file_escape(&format!("{}_{}", id, image))); file_escape(&format!("{}_{}", id, image))
} };
path.push(&file_name);
let relative_path = relative_path.join(file_name);
spawn(handle_gracefully(async move { spawn(handle_gracefully(async move {
let bytes = dl.bytes().await?; let bytes = dl.bytes().await?;
log!(0, "Writing {}", relative_path.display());
write_file_data(&path, &mut &*bytes) write_file_data(&path, &mut &*bytes)
.await .await
.context("failed to write forum post image attachment") .context("failed to write forum post image attachment")
@ -133,9 +136,12 @@ pub async fn download(path: &Path, relative_path: &Path, ilias: Arc<ILIAS>, url:
let src = URL::from_href(&url)?; let src = URL::from_href(&url)?;
let dl = ilias.download(&src.url).await?; let dl = ilias.download(&src.url).await?;
let mut path = path.to_owned(); let mut path = path.to_owned();
path.push(file_escape(&format!("{}_{}", id, name))); let file_name = file_escape(&format!("{}_{}", id, name));
path.push(&file_name);
let relative_path = relative_path.join(file_name);
spawn(handle_gracefully(async move { spawn(handle_gracefully(async move {
let bytes = dl.bytes().await?; let bytes = dl.bytes().await?;
log!(0, "Writing {}", relative_path.display());
write_file_data(&path, &mut &*bytes) write_file_data(&path, &mut &*bytes)
.await .await
.context("failed to write forum post file attachment") .context("failed to write forum post file attachment")