Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-09 01:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

let BlobObject::new_from_path() also accept , this allows to use the function for values from the database and from outside, which is handy in situations where you do not really know

Browse Source
This commit is contained in:
B. Petersen
2020-07-15 01:09:23 +02:00
committed by link2xt
parent 667364b90e
commit 7624e574bb
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blob.rs
View File

@@ -168,6 +168,9 @@ impl<'a> BlobObject<'a> {
/// subdirectory is used and [BlobObject::sanitise_name] does not /// subdirectory is used and [BlobObject::sanitise_name] does not
/// modify the filename. /// modify the filename.
/// ///
/// Paths into the blob directory may be either defined by an absolute path
/// or by the relative prefix `$BLOBDIR`.
///
/// # Errors /// # Errors
/// ///
/// This merely delegates to the [BlobObject::create_and_copy] and /// This merely delegates to the [BlobObject::create_and_copy] and
@@ -179,6 +182,11 @@ impl<'a> BlobObject<'a> {
) -> std::result::Result<BlobObject<'_>, BlobError> { ) -> std::result::Result<BlobObject<'_>, BlobError> {
if src.as_ref().starts_with(context.get_blobdir()) { if src.as_ref().starts_with(context.get_blobdir()) {
BlobObject::from_path(context, src) BlobObject::from_path(context, src)
} else if src.as_ref().starts_with("$BLOBDIR/") {
BlobObject::from_name(
context,
src.as_ref().to_str().unwrap_or_default().to_string(),
)
} else { } else {
BlobObject::create_and_copy(context, src).await BlobObject::create_and_copy(context, src).await
} }