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

python: support location markers

Browse Source
This commit is contained in:
link2xt
2021-02-10 10:24:19 +03:00
committed by holger krekel
parent c41f1b42df
commit e82ec23024
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/src/deltachat/chat.py
View File

@@ -502,18 +502,23 @@ class Chat(object):
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)
),
marker=from_dc_charpointer(lib.dc_array_get_marker(dc_array, i)),
)
for i in range(lib.dc_array_get_cnt(dc_array)) for i in range(lib.dc_array_get_cnt(dc_array))
] ]
class Location: class Location:
def __init__(self, latitude, longitude, accuracy, timestamp): def __init__(self, latitude, longitude, accuracy, timestamp, marker):
assert isinstance(timestamp, datetime) assert isinstance(timestamp, datetime)
self.latitude = latitude self.latitude = latitude
self.longitude = longitude self.longitude = longitude
self.accuracy = accuracy self.accuracy = accuracy
self.timestamp = timestamp self.timestamp = timestamp
self.marker = marker
def __eq__(self, other): def __eq__(self, other):
return self.__dict__ == other.__dict__ return self.__dict__ == other.__dict__

3
python/tests/test_account.py
View File

@@ -1876,7 +1876,7 @@ class TestOnlineAccount:
ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5) ac1.set_location(latitude=2.0, longitude=3.0, accuracy=0.5)
ac1._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED") ac1._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")
chat1.send_text("hello") chat1.send_text("🍞")
ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT") ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
lp.sec("ac2: wait for incoming location message") lp.sec("ac2: wait for incoming location message")
@@ -1890,6 +1890,7 @@ class TestOnlineAccount:
assert locations[0].longitude == 3.0 assert locations[0].longitude == 3.0
assert locations[0].accuracy == 0.5 assert locations[0].accuracy == 0.5
assert locations[0].timestamp > now assert locations[0].timestamp > now
assert locations[0].marker == "🍞"
contact = ac2.create_contact(ac1) contact = ac2.create_contact(ac1)
locations2 = chat2.get_locations(contact=contact) locations2 = chat2.get_locations(contact=contact)