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

Fix uplaod item delete, pause and cancel bugs

Browse Source
This commit is contained in:
miruka 2019-12-06 08:59:35 -04:00
parent e51f1f2c79
commit 8ae4bbb6cf
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/python/matrix_client.py
View File

@ -234,8 +234,9 @@ class MatrixClient(nio.AsyncClient):
# This error will be caught again by the try block later below # This error will be caught again by the try block later below
size = 0 size = 0
task = asyncio.Task.current_task()
monitor = nio.TransferMonitor(size) monitor = nio.TransferMonitor(size)
upload_item = Upload(item_uuid, monitor, path, total_size=size) upload_item = Upload(item_uuid, task, monitor, path, total_size=size)
self.models[Upload, room_id][str(item_uuid)] = upload_item self.models[Upload, room_id][str(item_uuid)] = upload_item
def on_transfered(transfered: int) -> None: def on_transfered(transfered: int) -> None:
@ -370,7 +371,7 @@ class MatrixClient(nio.AsyncClient):
content["msgtype"] = "m.file" content["msgtype"] = "m.file"
content["filename"] = path.name content["filename"] = path.name
del self.models[Upload, room_id][upload_item.uuid] del self.models[Upload, room_id][str(upload_item.uuid)]
uuid = str(uuid4()) uuid = str(uuid4())

2
src/python/models/items.py
View File

@ -1,3 +1,4 @@
import asyncio
import re import re
from dataclasses import dataclass, field from dataclasses import dataclass, field
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -114,6 +115,7 @@ class UploadStatus(AutoStrEnum):
@dataclass @dataclass
class Upload(ModelItem): class Upload(ModelItem):
uuid: UUID = field() uuid: UUID = field()
task: asyncio.Task = field()
monitor: nio.TransferMonitor = field() monitor: nio.TransferMonitor = field()
filepath: Path = field() filepath: Path = field()

4
src/qml/Chat/UploadsBar.qml
View File

@ -61,7 +61,7 @@ Rectangle {
// immediate visual feedback // immediate visual feedback
hideBind.when = true hideBind.when = true
// Python will delete this model item on cancel // Python will delete this model item on cancel
py.setattr(model.monitor, "cancel", true) py.call(py.getattr(model.task, "cancel"))
} }
Layout.preferredWidth: theme.baseElementsHeight Layout.preferredWidth: theme.baseElementsHeight
@ -188,7 +188,7 @@ Rectangle {
onClicked: { onClicked: {
delegate.guiPaused = ! delegate.guiPaused delegate.guiPaused = ! delegate.guiPaused
py.setattr( py.setattr(
model.monitor, "pause", model.status !== "Paused", model.monitor, "pause", delegate.guiPaused,
) )
} }