mirror of
https://github.com/chatmail/core.git
synced 2026-05-07 17:06:35 +03:00
Fix dc_make_rel_path
This was not substituting $BLOBDIR correctly.
This commit is contained in:
committed by
holger krekel
parent
fd8d16a7db
commit
5001a0e37d
@@ -895,7 +895,7 @@ fn dc_make_rel_path(context: &Context, path: &mut String) {
|
|||||||
.map(|s| path.starts_with(s))
|
.map(|s| path.starts_with(s))
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
{
|
{
|
||||||
*path = path.replace("$BLOBDIR", context.get_blobdir().to_str().unwrap());
|
*path = path.replace(context.get_blobdir().to_str().unwrap(), "$BLOBDIR");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1246,8 +1246,11 @@ pub fn listflags_has(listflags: u32, bitindex: usize) -> bool {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
use std::ffi::CStr;
|
use std::ffi::CStr;
|
||||||
|
|
||||||
|
use crate::test_utils::*;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_dc_strdup() {
|
fn test_dc_strdup() {
|
||||||
unsafe {
|
unsafe {
|
||||||
@@ -1792,4 +1795,17 @@ mod tests {
|
|||||||
let res = dc_create_incoming_rfc724_mid(123, 45, &vec![6, 7]);
|
let res = dc_create_incoming_rfc724_mid(123, 45, &vec![6, 7]);
|
||||||
assert_eq!(res, Some("123-45-7@stub".into()));
|
assert_eq!(res, Some("123-45-7@stub".into()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_dc_make_rel_path() {
|
||||||
|
let t = dummy_context();
|
||||||
|
let mut foo: String = t
|
||||||
|
.ctx
|
||||||
|
.get_blobdir()
|
||||||
|
.join("foo")
|
||||||
|
.to_string_lossy()
|
||||||
|
.into_owned();
|
||||||
|
dc_make_rel_path(&t.ctx, &mut foo);
|
||||||
|
assert_eq!(foo, format!("$BLOBDIR{}foo", std::path::MAIN_SEPARATOR));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user