Determine file path of mirror of remote image using the URI
This commit is contained in:
parent
37cbf537bb
commit
28380021a7
@ -10,7 +10,14 @@ use plume_common::{
|
|||||||
activity_pub::{inbox::FromId, Id},
|
activity_pub::{inbox::FromId, Id},
|
||||||
utils::MediaProcessor,
|
utils::MediaProcessor,
|
||||||
};
|
};
|
||||||
use std::{fs, path::Path};
|
use std::{
|
||||||
|
fs,
|
||||||
|
path::{Path, PathBuf},
|
||||||
|
};
|
||||||
|
use tracing::warn;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
const REMOTE_MEDIA_DIRECTORY: &str = "remote";
|
||||||
|
|
||||||
#[derive(Clone, Identifiable, Queryable)]
|
#[derive(Clone, Identifiable, Queryable)]
|
||||||
pub struct Media {
|
pub struct Media {
|
||||||
@ -198,16 +205,7 @@ impl Media {
|
|||||||
// TODO: merge with save_remote?
|
// TODO: merge with save_remote?
|
||||||
pub fn from_activity(conn: &DbConn, image: &Image) -> Result<Media> {
|
pub fn from_activity(conn: &DbConn, image: &Image) -> Result<Media> {
|
||||||
let remote_url = image.object_props.url_string().ok()?;
|
let remote_url = image.object_props.url_string().ok()?;
|
||||||
let ext = remote_url
|
let path = determine_mirror_file_path(&remote_url);
|
||||||
.rsplit('.')
|
|
||||||
.next()
|
|
||||||
.map(ToOwned::to_owned)
|
|
||||||
.unwrap_or_else(|| String::from("png"));
|
|
||||||
let path = Path::new(&super::CONFIG.media_directory).join(format!(
|
|
||||||
"{}.{}",
|
|
||||||
GUID::rand().to_string(),
|
|
||||||
ext
|
|
||||||
));
|
|
||||||
|
|
||||||
let mut dest = fs::File::create(path.clone()).ok()?;
|
let mut dest = fs::File::create(path.clone()).ok()?;
|
||||||
if let Some(proxy) = CONFIG.proxy() {
|
if let Some(proxy) = CONFIG.proxy() {
|
||||||
@ -262,6 +260,33 @@ impl Media {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn determine_mirror_file_path(url: &str) -> PathBuf {
|
||||||
|
let mut file_path = Path::new(&super::CONFIG.media_directory).join(REMOTE_MEDIA_DIRECTORY);
|
||||||
|
Url::parse(url)
|
||||||
|
.map(|url| {
|
||||||
|
if !url.has_host() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
file_path.push(url.host_str().unwrap());
|
||||||
|
for segment in url.path_segments().expect("FIXME") {
|
||||||
|
file_path.push(segment);
|
||||||
|
}
|
||||||
|
// TODO: handle query
|
||||||
|
// HINT: Use characters which must be percent-encoded in path as separator between path and query
|
||||||
|
// HINT: handle extension
|
||||||
|
})
|
||||||
|
.unwrap_or_else(|err| {
|
||||||
|
warn!("Failed to parse url: {} {}", &url, err);
|
||||||
|
let ext = url
|
||||||
|
.rsplit('.')
|
||||||
|
.next()
|
||||||
|
.map(ToOwned::to_owned)
|
||||||
|
.unwrap_or_else(|| String::from("png"));
|
||||||
|
file_path.push(format!("{}.{}", GUID::rand().to_string(), ext));
|
||||||
|
});
|
||||||
|
file_path
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
pub(crate) mod tests {
|
pub(crate) mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
Loading…
Reference in New Issue
Block a user