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

address @link2xt comments

Browse Source
This commit is contained in:
holger krekel
2019-11-03 00:06:30 +01:00
parent 4eb068613d
commit c5f64d2988
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python/src/deltachat/chatting.py
View File

@@ -404,15 +404,14 @@ class Chat(object):
contact_id = contact.id contact_id = contact.id
dc_array = lib.dc_get_locations(self._dc_context, self.id, contact_id, time_from, time_to) dc_array = lib.dc_get_locations(self._dc_context, self.id, contact_id, time_from, time_to)
locations = [] return [
for i in range(0, lib.dc_array_get_cnt(dc_array)): Location(
locations.append(Location(
latitude=lib.dc_array_get_latitude(dc_array, i), latitude=lib.dc_array_get_latitude(dc_array, i),
longitude=lib.dc_array_get_longitude(dc_array, i), longitude=lib.dc_array_get_longitude(dc_array, i),
accuracy=lib.dc_array_get_accuracy(dc_array, i), accuracy=lib.dc_array_get_accuracy(dc_array, i),
timestamp=datetime.utcfromtimestamp(lib.dc_array_get_timestamp(dc_array, i)), timestamp=datetime.utcfromtimestamp(lib.dc_array_get_timestamp(dc_array, i)))
)) for i in range(lib.dc_array_get_cnt(dc_array))
return locations ]
class Location: class Location:

4
python/tests/test_account.py
View File

@@ -843,7 +843,7 @@ class TestOnlineAccount:
ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG") # text message with location ac2._evlogger.get_matching("DC_EVENT_INCOMING_MSG") # text message with location
locations = chat2.get_locations() locations = chat2.get_locations()
assert len(locations) >= 1 assert len(locations) == 1
assert locations[0].latitude == 2.0 assert locations[0].latitude == 2.0
assert locations[0].longitude == 3.0 assert locations[0].longitude == 3.0
assert locations[0].accuracy == 0.5 assert locations[0].accuracy == 0.5
@@ -851,7 +851,7 @@ class TestOnlineAccount:
contact = ac2.create_contact(ac1.get_config("addr")) contact = ac2.create_contact(ac1.get_config("addr"))
locations2 = chat2.get_locations(contact=contact) locations2 = chat2.get_locations(contact=contact)
assert len(locations2) >= 1 assert len(locations2) == 1
assert locations2 == locations assert locations2 == locations
contact = ac2.create_contact("nonexisting@example.org") contact = ac2.create_contact("nonexisting@example.org")

9
src/dc_receive_imf.rs
View File

@@ -840,19 +840,12 @@ fn save_locations(
insert_msg_id: MsgId, insert_msg_id: MsgId,
hidden: i32, hidden: i32,
) { ) {
if chat_id <= DC_CHAT_ID_LAST_SPECIAL as libc::c_uint { if chat_id <= DC_CHAT_ID_LAST_SPECIAL {
return (); return ();
} }
let mut location_id_written = false; let mut location_id_written = false;
let mut send_event = false; let mut send_event = false;
info!(
context,
"saving locations chat_id={} insert_msg_id={}",
chat_id,
insert_msg_id.to_u32()
);
if mime_parser.message_kml.is_some() { if mime_parser.message_kml.is_some() {
let locations = &mime_parser.message_kml.as_ref().unwrap().locations; let locations = &mime_parser.message_kml.as_ref().unwrap().locations;
let newest_location_id = let newest_location_id =

6
src/location.rs
View File

@@ -63,7 +63,7 @@ impl Kml {
} }
pub fn parse(context: &Context, content: &[u8]) -> Result<Self, Error> { pub fn parse(context: &Context, content: &[u8]) -> Result<Self, Error> {
ensure!(content.len() <= (1024 * 1024), "kml-file too large"); ensure!(content.len() <= 1024 * 1024, "kml-file is too large");
let to_parse = String::from_utf8_lossy(content); let to_parse = String::from_utf8_lossy(content);
let mut reader = quick_xml::Reader::from_str(&to_parse); let mut reader = quick_xml::Reader::from_str(&to_parse);
@@ -669,9 +669,9 @@ mod tests {
let context = dummy_context(); let context = dummy_context();
let xml = let xml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>"; b"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n<Document addr=\"user@example.org\">\n<Placemark><Timestamp><when>2019-03-06T21:09:57Z</when></Timestamp><Point><coordinates accuracy=\"32.000000\">9.423110,53.790302</coordinates></Point></Placemark>\n<PlaceMARK>\n<Timestamp><WHEN > \n\t2018-12-13T22:11:12Z\t</WHEN></Timestamp><Point><coordinates aCCuracy=\"2.500000\"> 19.423110 \t , \n 63.790302\n </coordinates></Point></PlaceMARK>\n</Document>\n</kml>";
let kml = Kml::parse(&context.ctx, &(xml.as_bytes())).expect("parsing failed"); let kml = Kml::parse(&context.ctx, xml).expect("parsing failed");
assert!(kml.addr.is_some()); assert!(kml.addr.is_some());
assert_eq!(kml.addr.as_ref().unwrap(), "user@example.org",); assert_eq!(kml.addr.as_ref().unwrap(), "user@example.org",);