Skip to content

media: always store media to temporary dir #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinetd merged 1 commit into from
Mar 30, 2025
Merged

media: always store media to temporary dir #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 28 additions & 42 deletions src/matrix/sync_room_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,49 +32,35 @@ pub trait SourceUri {
#[async_trait]
impl SourceUri for MediaSource {
async fn to_uri(&self, client: &Client, body: &str) -> Result<String> {
match self {
MediaSource::Plain(uri) => {
let homeserver = client.homeserver();
Ok(uri.as_str().replace(
"mxc://",
&format!(
"{}/_matrix/media/r0/download/",
homeserver.as_str().trim_end_matches('/')
),
))
}
_ => {
let Some(dir_path) = &args().media_dir else {
return Err(Error::msg("<encrypted, no media dir set>"));
};
let media_request = MediaRequestParameters {
source: self.clone(),
format: MediaFormat::File,
};
let content = client
.media()
.get_media_content(&media_request, false)
.await
.context("Could not get decrypted data")?;
let filename = body.rsplit_once('/').map(|(_, f)| f).unwrap_or(body);
let dir = PathBuf::from(dir_path);
if !dir.is_dir() {
fs::DirBuilder::new()
.mode(0o700)
.recursive(true)
.create(&dir)
.await?
}
let file = dir.join(filename);
fs::File::create(file).await?.write_all(&content).await?;
let url = args().media_url.as_ref().unwrap_or(dir_path);
Ok(format!(
"{}/{}",
url,
utf8_percent_encode(filename, FRAGMENT)
))
}
let Some(dir_path) = &args().media_dir else {
return Err(Error::msg("<no media dir set>"));
};
let media_request = MediaRequestParameters {
source: self.clone(),
format: MediaFormat::File,
};
let content = client
.media()
.get_media_content(&media_request, false)
.await
.context("Could not get decrypted data")?;
let filename = body.rsplit_once('/').map(|(_, f)| f).unwrap_or(body);
let dir = PathBuf::from(dir_path);
if !dir.is_dir() {
fs::DirBuilder::new()
.mode(0o700)
.recursive(true)
.create(&dir)
.await?
}
let file = dir.join(filename);
fs::File::create(file).await?.write_all(&content).await?;
let url = args().media_url.as_ref().unwrap_or(dir_path);
Ok(format!(
"{}/{}",
url,
utf8_percent_encode(filename, FRAGMENT)
))
}
}

Expand Down