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

Remove all Backend "get_any_client"-using methods

Browse Source 
thumbnail() and download() were remaining.
Use a direct and carefully chosen MatrixClient's methods instead to
avoid problems mentioned in the previous commit 7502c1.
This commit is contained in:
miruka 2020-08-23 16:57:53 -04:00
parent 0f2efa9ba3
commit df3f1fb645
24 changed files with 117 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.md
View File

@ -1,5 +1,6 @@
# TODO
- composer state.json writingUserId problem?
- refresh server list button
- global presence control

103
src/backend/backend.py
View File

@ -349,46 +349,7 @@ class Backend:
failures += 1
async def get_any_client(self) -> MatrixClient:
"""Return any healthy syncing `MatrixClient` registered in model."""
failures = 0
while True:
for client in self.clients.values():
if client.healthy:
return client
if failures and failures % 300 == 0:
log.warn(
"No healthy client found after %ds, stack trace:\n%s",
failures / 10, traceback.format_stack(),
)
await asyncio.sleep(0.1)
failures += 1
# Client functions that don't need authentification
async def thumbnail(
self, server_name: str, media_id: str, width: int, height: int,
) -> nio.ThumbnailResponse:
"""Return thumbnail for a matrix media."""
args = (server_name, media_id, width, height)
client = await self.get_any_client()
return await client.thumbnail(*args)
async def download(
self, server_name: str, media_id: str,
) -> nio.DownloadResponse:
"""Return the content of a matrix media."""
client = await self.get_any_client()
return await client.download(server_name, media_id)
# Multi-client Matrix functions
async def update_room_read_marker(
self, room_id: str, event_id: str,
@ -416,6 +377,37 @@ class Backend:
await asyncio.gather(*[update(c) for c in self.clients.values()])
async def verify_device(
self, user_id: str, device_id: str, ed25519_key: str,
) -> None:
"""Mark a device as verified on all our accounts."""
for client in self.clients.values():
try:
device = client.device_store[user_id][device_id]
except KeyError:
continue
if device.ed25519 == ed25519_key:
client.verify_device(device)
async def blacklist_device(
self, user_id: str, device_id: str, ed25519_key: str,
) -> None:
"""Mark a device as blacklisted on all our accounts."""
for client in self.clients.values():
try:
# This won't include the client's current device, as expected
device = client.device_store[user_id][device_id]
except KeyError:
continue
if device.ed25519 == ed25519_key:
client.blacklist_device(device)
# General functions
async def get_config_dir(self) -> Path:
@ -463,37 +455,6 @@ class Backend:
self.models["all_rooms"].set_account_collapse(user_id, collapse)
async def verify_device(
self, user_id: str, device_id: str, ed25519_key: str,
) -> None:
"""Mark a device as verified on all our accounts."""
for client in self.clients.values():
try:
device = client.device_store[user_id][device_id]
except KeyError:
continue
if device.ed25519 == ed25519_key:
client.verify_device(device)
async def blacklist_device(
self, user_id: str, device_id: str, ed25519_key: str,
) -> None:
"""Mark a device as blacklisted on all our accounts."""
for client in self.clients.values():
try:
# This won't include the client's current device, as expected
device = client.device_store[user_id][device_id]
except KeyError:
continue
if device.ed25519 == ed25519_key:
client.blacklist_device(device)
async def _ping_homeserver(
self, session: aiohttp.ClientSession, homeserver_url: str,
) -> None:

15
src/backend/matrix_client.py
View File

@ -210,18 +210,6 @@ class MatrixClient(nio.AsyncClient):
)
@property
def healthy(self) -> bool:
"""Return whether we're syncing and last sync was successful."""
task = self.sync_task
if not task or not self.first_sync_date or self.last_sync_error:
return False
return not task.done()
@property
def default_device_name(self) -> str:
"""Device name to set at login if the user hasn't set a custom one."""
@ -734,7 +722,7 @@ class MatrixClient(nio.AsyncClient):
upload_item.status = UploadStatus.Caching
local_media = await Media.from_existing_file(
self.backend.media_cache, url, path,
self.backend.media_cache, self.user_id, url, path,
)
kind = (mime or "").split("/")[0]
@ -816,6 +804,7 @@ class MatrixClient(nio.AsyncClient):
await Thumbnail.from_bytes(
self.backend.media_cache,
self.user_id,
thumb_url,
path.name,
thumb_data,

29
src/backend/media_cache.py
View File

@ -49,17 +49,19 @@ class MediaCache:
async def get_media(
self,
client_user_id: str,
mxc: str,
title: str,
crypt_dict: CryptDict = None,
) -> Path:
"""Return `Media.get()`'s result. Intended for QML."""
return await Media(self, mxc, title, crypt_dict).get()
return await Media(self, client_user_id, mxc, title, crypt_dict).get()
async def get_thumbnail(
self,
client_user_id: str,
mxc: str,
title: str,
width: int,
@ -68,10 +70,10 @@ class MediaCache:
) -> Path:
"""Return `Thumbnail.get()`'s result. Intended for QML."""
thumb = Thumbnail(
# QML sometimes pass float sizes, which matrix API doesn't like.
self, mxc, title, crypt_dict, (round(width), round(height)),
)
size = (round(width), round(height))
thumb = Thumbnail(self, client_user_id, mxc, title, crypt_dict, size)
return await thumb.get()
@ -80,6 +82,7 @@ class Media:
"""A matrix media file."""
cache: "MediaCache" = field()
client_user_id: str = field()
mxc: str = field()
title: str = field()
crypt_dict: CryptDict = field(repr=False)
@ -154,7 +157,7 @@ class Media:
parsed = urlparse(self.mxc)
resp = await self.cache.backend.download(
resp = await self.cache.backend.clients[self.client_user_id].download(
server_name = parsed.netloc,
media_id = parsed.path.lstrip("/"),
)
@ -184,6 +187,7 @@ class Media:
async def from_existing_file(
cls,
cache: "MediaCache",
client_user_id: str,
mxc: str,
existing: Path,
overwrite: bool = False,
@ -191,7 +195,9 @@ class Media:
) -> "Media":
"""Copy an existing file to cache and return a `Media` for it."""
media = cls(cache, mxc, existing.name, {}, **kwargs) # type: ignore
media = cls(
cache, client_user_id, mxc, existing.name, {}, **kwargs,
) # type: ignore
media.local_path.parent.mkdir(parents=True, exist_ok=True)
if not media.local_path.exists() or overwrite:
@ -205,6 +211,7 @@ class Media:
async def from_bytes(
cls,
cache: "MediaCache",
client_user_id: str,
mxc: str,
filename: str,
data: bytes,
@ -213,7 +220,9 @@ class Media:
) -> "Media":
"""Create a cached file from bytes data and return a `Media` for it."""
media = cls(cache, mxc, filename, {}, **kwargs) # type: ignore
media = cls(
cache, client_user_id, mxc, filename, {}, **kwargs,
) # type: ignore
media.local_path.parent.mkdir(parents=True, exist_ok=True)
if not media.local_path.exists() or overwrite:
@ -231,6 +240,7 @@ class Thumbnail(Media):
"""The thumbnail of a matrix media, which is a media itself."""
cache: "MediaCache" = field()
client_user_id: str = field()
mxc: str = field()
title: str = field()
crypt_dict: CryptDict = field(repr=False)
@ -322,16 +332,17 @@ class Thumbnail(Media):
"""Return the (decrypted) media file's content from the server."""
parsed = urlparse(self.mxc)
client = self.cache.backend.clients[self.client_user_id]
if self.crypt_dict:
# Matrix makes encrypted thumbs only available through the download
# end-point, not the thumbnail one
resp = await self.cache.backend.download(
resp = await client.download(
server_name = parsed.netloc,
media_id = parsed.path.lstrip("/"),
)
else:
resp = await self.cache.backend.thumbnail(
resp = await client.thumbnail(
server_name = parsed.netloc,
media_id = parsed.path.lstrip("/"),
width = self.wanted_size[0],

1
src/backend/nio_callbacks.py
View File

@ -193,6 +193,7 @@ class NioCallbacks:
try:
media_local_path: Union[Path, str] = await Media(
cache = self.client.backend.media_cache,
client_user_id = self.user_id,
mxc = ev.url,
title = ev.body,
crypt_dict = media_crypt_dict,

4
src/gui/Base/HAvatar.qml
View File

@ -9,6 +9,7 @@ Rectangle {
property bool compact: false
property string name
property alias clientUserId: avatarImage.clientUserId
property alias mxc: avatarImage.mxc
property alias title: avatarImage.title
@ -60,11 +61,11 @@ Rectangle {
HMxcImage {
id: avatarImage
anchors.fill: parent
showProgressBar: false
visible: Boolean(sourceOverride || mxc)
z: 2
sourceSize.width: parent.width
sourceSize.height: parent.height
showProgressBar: false
fillMode: Image.PreserveAspectCrop
animatedFillMode: AnimatedImage.PreserveAspectCrop
animate: false
@ -95,6 +96,7 @@ Rectangle {
id: avatarToolTipImage
fillMode: Image.PreserveAspectCrop
animatedFillMode: AnimatedImage.PreserveAspectCrop
clientUserId: avatarImage.clientUserId
mxc: avatarImage.mxc
title: avatarImage.title

8
src/gui/Base/HMxcImage.qml
View File

@ -6,6 +6,7 @@ import "../PythonBridge"
HImage {
id: image
property string clientUserId
property string mxc
property string title
property string sourceOverride: ""
@ -38,9 +39,10 @@ HImage {
}
const method = image.thumbnail ? "get_thumbnail" : "get_media"
const args = image.thumbnail ?
[image.mxc, image.title, w, h, cryptDict] :
[image.mxc, image.title, cryptDict]
const args =
image.thumbnail ?
[clientUserId, image.mxc, image.title, w, h, cryptDict] :
[clientUserId, image.mxc, image.title, cryptDict]
getFuture = py.callCoro("media_cache." + method, args, path => {
if (! image) return

1
src/gui/MainPane/AccountDelegate.qml
View File

@ -57,6 +57,7 @@ HTile {
HUserAvatar {
id: avatar
clientUserId: model.id
userId: model.id
displayName: model.display_name
mxc: model.avatar_url

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

@ -48,6 +48,7 @@ HTile {
HRoomAvatar {
id: avatar
clientUserId: model.for_account
roomId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/Pages/AccountSettings/Account.qml
View File

@ -93,6 +93,7 @@ HFlickableColumnPage {
property bool changed: Boolean(sourceOverride)
clientUserId: page.userId
userId: page.userId
displayName: nameField.item.text
mxc: account ? account.avatar_url : ""

1
src/gui/Pages/AddChat/CreateRoom.qml
View File

@ -69,6 +69,7 @@ HFlickableColumnPage {
HRoomAvatar {
id: avatar
clientUserId: page.userId
roomId: ""
displayName: nameField.item.text

2
src/gui/Pages/AddChat/CurrentUserAvatar.qml
View File

@ -8,7 +8,7 @@ HUserAvatar {
property QtObject account
// userId: (set me)
clientUserId: userId
displayName: account ? account.display_name : ""
mxc: account ? account.avatar_url : ""

1
src/gui/Pages/Chat/AutoCompletion/CompletableUserDelegate.qml
View File

@ -16,6 +16,7 @@ HTile {
HUserAvatar {
id: avatar
clientUserId: chat.userId
userId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/Pages/Chat/Banners/Banner.qml
View File

@ -40,6 +40,7 @@ Rectangle {
HUserAvatar {
id: bannerAvatar
clientUserId: chat.userId
anchors.centerIn: parent
radius: 0
}

1
src/gui/Pages/Chat/Composer/Composer.qml
View File

@ -25,6 +25,7 @@ Rectangle {
HUserAvatar {
id: avatar
radius: 0
clientUserId: messageArea.writingUserId
userId: messageArea.writingUserId
mxc:

1
src/gui/Pages/Chat/RoomHeader.qml
View File

@ -52,6 +52,7 @@ Rectangle {
HRoomAvatar {
id: avatar
clientUserId: chat.userId
roomId: chat.roomId
displayName: chat.roomInfo.display_name
mxc: chat.roomInfo.avatar_url

1
src/gui/Pages/Chat/RoomPane/MemberView/MemberDelegate.qml
View File

@ -23,6 +23,7 @@ HTile {
HUserAvatar {
id: avatar
clientUserId: chat.userId
userId: model.id
displayName: model.display_name
mxc: model.avatar_url

1
src/gui/Pages/Chat/RoomPane/MemberView/MemberProfile.qml
View File

@ -61,6 +61,7 @@ HListView {
root.currentIndex = 0
HUserAvatar {
clientUserId: chat.userId
userId: member.id
displayName: member.display_name
mxc: member.avatar_url

1
src/gui/Pages/Chat/RoomPane/SettingsView.qml
View File

@ -82,6 +82,7 @@ HFlickableColumnPage {
HRoomAvatar {
id: avatar
clientUserId: chat.userId
roomId: chat.roomId
displayName: nameField.item.text || chat.roomInfo.display_name
mxc: chat.roomInfo.avatar_url

1
src/gui/Pages/Chat/Timeline/EventContent.qml
View File

@ -94,6 +94,7 @@ HRowLayout {
HUserAvatar {
id: avatar
clientUserId: chat.userId
userId: model.sender_id
displayName: model.sender_name
mxc: model.sender_avatar

1
src/gui/Pages/Chat/Timeline/EventImage.qml
View File

@ -60,6 +60,7 @@ HMxcImage {
height: fitSize.height
horizontalAlignment: Image.AlignLeft
clientUserId: chat.userId
title: thumbnail ? loader.thumbnailTitle : loader.title
animated: eventList.isAnimated(loader.singleMediaInfo)
thumbnail: ! animated && loader.thumbnailMxc

2
src/gui/Pages/Chat/Timeline/EventList.qml
View File

@ -416,6 +416,7 @@ Rectangle {
window.makePopup(
"Popups/ImageViewerPopup/ImageViewerPopup.qml",
{
clientUserId: chat.userId,
thumbnailTitle: getThumbnailTitle(event),
thumbnailMxc: event.thumbnail_url,
thumbnailPath: eventList.thumbnailCachedPaths[event.id],
@ -459,6 +460,7 @@ Rectangle {
print("Downloading " + event.media_url + " ...")
const args = [
chat.userId,
event.media_url,
event.media_title,
JSON.parse(event.media_crypt_dict),

4
src/gui/Popups/ImageViewerPopup/ImageViewerPopup.qml
View File

@ -8,14 +8,18 @@ import "../../Base"
HPopup {
id: popup
property string clientUserId
property string thumbnailTitle
property string thumbnailMxc
property string thumbnailPath: ""
property var thumbnailCryptDict
property string fullTitle
property string fullMxc
property var fullCryptDict
property int fullFileSize
property size overallSize
property bool alternateScaling: false

2
src/gui/Popups/ImageViewerPopup/ViewerCanvas.qml
View File

@ -107,6 +107,7 @@ HFlickable {
Math.min(window.height, viewer.overallSize.height)
clientUserId: viewer.clientUserId
showPauseButton: false
showProgressBar: false
pause: viewer.imagesPaused
@ -152,6 +153,7 @@ HFlickable {
HMxcImage {
id: full
anchors.fill: parent
clientUserId: viewer.clientUserId
thumbnail: false
showPauseButton: false
pause: viewer.imagesPaused