Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 23:06:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Vec instead of dc_array_t in search_chat_ids_by_contact_ids

Browse Source
This commit is contained in:
Alexander Krotov
2019-08-13 18:08:07 +03:00
committed by holger krekel
parent 6067160582
commit d46a5345d2
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/dc_receive_imf.rs
View File

@@ -1,3 +1,5 @@
use itertools::join;
use mmime::mailimf::*; use mmime::mailimf::*;
use mmime::mailimf_types::*; use mmime::mailimf_types::*;
use mmime::mailmime::*; use mmime::mailmime::*;
@@ -1548,9 +1550,8 @@ unsafe fn search_chat_ids_by_contact_ids(
unsorted_contact_ids: *const dc_array_t, unsorted_contact_ids: *const dc_array_t,
) -> *mut dc_array_t { ) -> *mut dc_array_t {
/* searches chat_id's by the given contact IDs, may return zero, one or more chat_id's */ /* searches chat_id's by the given contact IDs, may return zero, one or more chat_id's */
let contact_ids: *mut dc_array_t = dc_array_new(23 as size_t); let mut contact_ids = Vec::with_capacity(23);
let mut contact_ids_str: *mut libc::c_char = 0 as *mut libc::c_char; let mut chat_ids = Vec::with_capacity(23);
let chat_ids: *mut dc_array_t = dc_array_new(23 as size_t);
/* copy array, remove duplicates and SELF, sort by ID */ /* copy array, remove duplicates and SELF, sort by ID */
let mut i: libc::c_int; let mut i: libc::c_int;
@@ -1559,22 +1560,18 @@ unsafe fn search_chat_ids_by_contact_ids(
i = 0; i = 0;
while i < iCnt { while i < iCnt {
let curr_id: uint32_t = dc_array_get_id(unsorted_contact_ids, i as size_t); let curr_id: uint32_t = dc_array_get_id(unsorted_contact_ids, i as size_t);
if curr_id != 1 as libc::c_uint if curr_id != 1 as libc::c_uint && !contact_ids.contains(&curr_id) {
&& !dc_array_search_id(contact_ids, curr_id, 0 as *mut size_t) contact_ids.push(curr_id);
{
dc_array_add_id(contact_ids, curr_id);
} }
i += 1 i += 1
} }
if !(dc_array_get_cnt(contact_ids) == 0) { if !contact_ids.is_empty() {
(*contact_ids).sort_ids(); contact_ids.sort();
contact_ids_str = let contact_ids_str = join(contact_ids.iter().map(|x| x.to_string()), ",");
dc_array_get_string(contact_ids, b",\x00" as *const u8 as *const libc::c_char);
context.sql.query_map( context.sql.query_map(
format!( format!(
"SELECT DISTINCT cc.chat_id, cc.contact_id FROM chats_contacts cc LEFT JOIN chats c ON c.id=cc.chat_id WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({})) AND c.type=120 AND cc.contact_id!=1 ORDER BY cc.chat_id, cc.contact_id;", "SELECT DISTINCT cc.chat_id, cc.contact_id FROM chats_contacts cc LEFT JOIN chats c ON c.id=cc.chat_id WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({})) AND c.type=120 AND cc.contact_id!=1 ORDER BY cc.chat_id, cc.contact_id;",
as_str(contact_ids_str) contact_ids_str
), ),
params![], params![],
|row| Ok((row.get::<_, i32>(0)?, row.get::<_, i32>(1)?)), |row| Ok((row.get::<_, i32>(0)?, row.get::<_, i32>(1)?)),
@@ -1586,32 +1583,30 @@ unsafe fn search_chat_ids_by_contact_ids(
for row in rows { for row in rows {
let (chat_id, contact_id) = row?; let (chat_id, contact_id) = row?;
if chat_id as u32 != last_chat_id { if chat_id as u32 != last_chat_id {
if matches == dc_array_get_cnt(contact_ids) && mismatches == 0 { if matches == contact_ids.len() && mismatches == 0 {
dc_array_add_id(chat_ids, last_chat_id); chat_ids.push(last_chat_id);
} }
last_chat_id = chat_id as u32; last_chat_id = chat_id as u32;
matches = 0; matches = 0;
mismatches = 0; mismatches = 0;
} }
if contact_id as u32 == dc_array_get_id(contact_ids, matches as size_t) { if contact_id as u32 == contact_ids[matches] {
matches += 1; matches += 1;
} else { } else {
mismatches += 1; mismatches += 1;
} }
} }
if matches == dc_array_get_cnt(contact_ids) && mismatches == 0 { if matches == contact_ids.len() && mismatches == 0 {
dc_array_add_id(chat_ids, last_chat_id); chat_ids.push(last_chat_id);
} }
Ok(()) Ok(())
} }
).unwrap(); // TODO: better error handling ).unwrap(); // TODO: better error handling
} }
} }
free(contact_ids_str as *mut libc::c_void);
dc_array_unref(contact_ids);
chat_ids dc_array_t::from(chat_ids).into_raw()
} }
unsafe fn check_verified_properties( unsafe fn check_verified_properties(