fix: wait until media is uploaded

This commit is contained in:
VC
2023-01-09 12:45:38 +01:00
parent 90a9df220a
commit a8a8f8c13f

View File

@@ -6,6 +6,7 @@ use futures::{stream, stream::StreamExt};
use log::{error, info, warn}; use log::{error, info, warn};
use megalodon::{ use megalodon::{
entities::UploadMedia::{AsyncAttachment, Attachment}, entities::UploadMedia::{AsyncAttachment, Attachment},
error,
mastodon::Mastodon, mastodon::Mastodon,
megalodon::Megalodon, megalodon::Megalodon,
}; };
@@ -55,7 +56,7 @@ pub async fn generate_media_ids(
let id = match mastodon_media { let id = match mastodon_media {
Attachment(m) => m.id, Attachment(m) => m.id,
AsyncAttachment(m) => m.id, AsyncAttachment(m) => wait_until_uploaded(&mastodon, &m.id).await?,
}; };
Ok::<String, ScootalooError>(id) Ok::<String, ScootalooError>(id)
@@ -81,6 +82,23 @@ pub async fn generate_media_ids(
(media_url, media_ids) (media_url, media_ids)
} }
/// Wait on uploaded medias when necessary
async fn wait_until_uploaded(client: &Mastodon, id: &str) -> Result<String, error::Error> {
loop {
let res = client.get_media(id.to_string()).await;
return match res {
Ok(res) => Ok(res.json.id),
Err(err) => match err {
error::Error::OwnError(ref own_err) => match own_err.kind {
error::Kind::HTTPPartialContentError => continue,
_ => Err(err),
},
_ => Err(err),
},
};
}
}
/// Transforms the media into a base64 equivalent /// Transforms the media into a base64 equivalent
pub async fn base64_media(u: &str) -> Result<String, Box<dyn Error>> { pub async fn base64_media(u: &str) -> Result<String, Box<dyn Error>> {
let mut response = reqwest::get(u).await?; let mut response = reqwest::get(u).await?;