Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pass Python Future objects to QML

Browse Source 
Returning a Future doesn't work on Windows for some reason
(https://github.com/thp/pyotherside/issues/116).

Instead of using these objects from QML to cancel running coroutines,
call a Python QMLBridge function that takes a coroutine UUID and will
take care of the cancelling.
This commit is contained in:
miruka
2020-09-28 23:06:50 -04:00
parent 53d2ab17af
commit ee1091b4dc
20 changed files with 161 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/MainPane/RoomDelegate.qml
View File

@@ -7,13 +7,12 @@ import Clipboard 0.1
import ".."
import "../Base"
import "../Base/HTile"
import "../PythonBridge"
HTile {
id: room
property Future fetchProfilesFuture: null
property Future loadEventsFuture: null
property string fetchProfilesFutureId: ""
property string loadEventsFutureId: ""
property bool moreToLoad: true
readonly property bool joined: ! invited && ! parted
@@ -204,8 +203,8 @@ HTile {
}
Component.onDestruction: {
if (fetchProfilesFuture) fetchProfilesFuture.cancel()
if (loadEventsFuture) loadEventsFuture.cancel()
if (fetchProfilesFutureId) py.cancelCoro(fetchProfilesFutureId)
if (loadEventsFutureId) py.cancelCoro(loadEventsFutureId)
}
Timer {
@@ -217,15 +216,15 @@ HTile {
! lastEvent &&
moreToLoad
onTriggered: if (! loadEventsFuture) {
loadEventsFuture = py.callClientCoro(
onTriggered: if (! loadEventsFutureId) {
loadEventsFutureId = py.callClientCoro(
model.for_account,
"load_past_events",
[model.id],
more => {
if (! room) return // delegate was destroyed
loadEventsFuture = null
moreToLoad = more
loadEventsFutureId = ""
moreToLoad = more
}
)
}
@@ -242,13 +241,13 @@ HTile {
lastEvent.fetch_profile
onTriggered: {
if (fetchProfilesFuture) fetchProfilesFuture.cancel()
if (fetchProfilesFutureId) py.cancelCoro(fetchProfilesFutureId)
fetchProfilesFuture = py.callClientCoro(
fetchProfilesFutureId = py.callClientCoro(
model.for_account,
"get_event_profiles",
[model.id, lastEvent.id],
() => { if (room) fetchProfilesFuture = null },
() => { if (room) fetchProfilesFutureId = "" },
)
}
}