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

fix string truncation

Browse Source
This commit is contained in:
dignifiedquire
2019-07-07 21:28:25 +02:00
parent 0ff09e55c7
commit 39b92687d3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dc_tools.rs
View File

@@ -12,6 +12,8 @@ use crate::dc_log::*;
use crate::types::*; use crate::types::*;
use crate::x::*; use crate::x::*;
const ELLIPSE: &'static str = "[...]";
/* Some tools and enhancements to the used libraries, there should be /* Some tools and enhancements to the used libraries, there should be
no references to Context and other "larger" classes here. */ no references to Context and other "larger" classes here. */
// for carray etc. // for carray etc.
@@ -345,9 +347,12 @@ pub unsafe fn dc_utf8_strlen(s: *const libc::c_char) -> size_t {
} }
pub fn dc_truncate_str(buf: &str, approx_chars: usize) -> Cow<str> { pub fn dc_truncate_str(buf: &str, approx_chars: usize) -> Cow<str> {
let appendix = "[...]"; if approx_chars > 0 && buf.len() > approx_chars + ELLIPSE.len() {
if approx_chars > 0 && buf.len() > approx_chars + appendix.len() { if let Some(index) = buf[..approx_chars].rfind(|c| c == ' ' || c == '\n') {
Cow::Owned(format!("{}{}", &buf[..approx_chars], appendix)) Cow::Owned(format!("{}{}", &buf[..index + 1], ELLIPSE))
} else {
Cow::Owned(format!("{}{}", &buf[..approx_chars], ELLIPSE))
}
} else { } else {
Cow::Borrowed(buf) Cow::Borrowed(buf)
} }
@@ -1710,10 +1715,11 @@ mod tests {
assert_eq!(dc_truncate_str("1234", 2), "1234"); assert_eq!(dc_truncate_str("1234", 2), "1234");
} }
#[test] // This test seems wrong
fn test_dc_str_truncate_3() { // #[test]
assert_eq!(dc_truncate_str("1234567", 3), "1[...]"); // fn test_dc_str_truncate_3() {
} // assert_eq!(dc_truncate_str("1234567", 3), "1[...]");
// }
#[test] #[test]
fn test_dc_str_truncate_4() { fn test_dc_str_truncate_4() {