Make media openable with the openLinks keybind

This involved a refactoring to move all the media handling functions
(downloading, opening externally, etc) out of the Event delegates and
into the EventList, which manage keybinds instead.

This should also be better for performance since all these functions are
no longer duplicated for every Event in view.

Other user-noticable change: clicking on non-image media will
always download and open them no matter if the room is encrypted or not,
instead of opening non-encrypted files in browser like before. It will
be possible to still do that with an "open externally" command later.
This commit is contained in:
miruka
2020-07-19 20:10:31 -04:00
parent fe08014697
commit de6d8fa59d
9 changed files with 207 additions and 169 deletions

View File

@@ -125,29 +125,43 @@ Rectangle {
}
HShortcut {
sequences: window.settings.keys.openMessagesLinks
sequences: window.settings.keys.openMessagesLinks // XXX: rename
onActivated: {
let events = []
let indice = []
if (eventList.selectedCount) {
events = eventList.getSortedChecked()
indice = eventList.checkedIndice
} else if (eventList.currentIndex !== -1) {
events = [eventList.model.get(eventList.currentIndex)]
indice = [eventList.currentIndex]
} else {
// Find most recent event containing links
// Find most recent event that's a media or contains links
for (let i = 0; i < eventList.model.count && i <= 1000; i++) {
const ev = eventList.model.get(i)
const ev = eventList.model.get(i)
const links = JSON.parse(ev.links)
if (JSON.parse(ev.links).length) {
events = [ev]
if (ev.media_url || ev.thumbnail_url || links.length) {
indice = [i]
break
}
}
}
for (const event of events) {
for (const link of JSON.parse(event.links))
Qt.openUrlExternally(link)
for (const i of indice.sort().reverse()) {
const event = eventList.model.get(i)
if (event.media_url || event.thumbnail_url) {
eventList.getMediaType(event) === Utils.Media.Image ?
eventList.openImageViewer(event) :
eventList.openMediaExternally(event)
continue
}
for (const url of JSON.parse(event.links)) {
utils.getLinkType(url) === Utils.Media.Image ?
eventList.openImageViewer(event, url) :
Qt.openUrlExternally(url)
}
}
}
}
@@ -198,6 +212,8 @@ Rectangle {
property alias cursorShape: cursorShapeArea.cursorShape
readonly property var thumbnailCachedPaths: ({}) // {event.id: path}
readonly property var redactableCheckedEvents:
getSortedChecked().filter(ev => eventList.canRedact(ev))
@@ -302,6 +318,106 @@ Rectangle {
}
}
function getMediaType(event) {
if (event.event_type === "RoomAvatarEvent")
return Utils.Media.Image
const mainType = event.media_mime.split("/")[0].toLowerCase()
const fileEvents = ["RoomMessageFile", "RoomEncryptedFile"]
return (
mainType === "image" ? Utils.Media.Image :
mainType === "video" ? Utils.Media.Video :
mainType === "audio" ? Utils.Media.Audio :
fileEvents.includes(event.event_type) ? Utils.Media.File :
null
)
}
function isAnimated(event) {
return (
event.media_mime === "image/gif" ||
utils.urlExtension(event.media_url).toLowerCase() === "gif"
)
}
function getThumbnailTitle(event) {
return event.media_title.replace(
/\.[^\.]+$/,
event.thumbnail_mime === "image/jpeg" ? ".jpg" :
event.thumbnail_mime === "image/png" ? ".png" :
event.thumbnail_mime === "image/gif" ? ".gif" :
event.thumbnail_mime === "image/tiff" ? ".tiff" :
event.thumbnail_mime === "image/svg+xml" ? ".svg" :
event.thumbnail_mime === "image/webp" ? ".webp" :
event.thumbnail_mime === "image/bmp" ? ".bmp" :
".thumbnail"
) || utils.urlFileName(event.media_url)
}
function openImageViewer(event, forLink="") {
// if forLink is empty, this must be a media event
const title =
event.media_title || utils.urlFileName(event.media_url)
// The thumbnail/cached path will be the full GIF
const fullMxc =
forLink || (isAnimated(event) ? "" : event.media_url)
utils.makePopup(
"Popups/ImageViewerPopup.qml",
{
thumbnailTitle: getThumbnailTitle(event),
thumbnailMxc: event.thumbnail_url,
thumbnailPath: eventList.thumbnailCachedPaths[event.id],
thumbnailCryptDict: JSON.parse(event.thumbnail_crypt_dict),
fullTitle: title,
fullMxc: fullMxc,
fullCryptDict: JSON.parse(event.media_crypt_dict),
overallSize: Qt.size(
event.media_width ||
event.thumbnail_width ||
implicitWidth || // XXX
800,
event.media_height ||
event.thumbnail_height ||
implicitHeight || // XXX
600,
)
},
obj => {
obj.openExternallyRequested.connect(() =>
forLink ?
Qt.openUrlExternally(forLink) :
eventList.openMediaExternally(event)
)
},
)
}
function getLocalOrDownloadMedia(event, callback) {
print("Downloading " + event.media_url + " ...")
const args = [
event.media_url,
event.media_title,
JSON.parse(event.media_crypt_dict),
]
py.callCoro("media_cache.get_media", args, path => {
print("Done: " + path)
callback(path)
})
}
function openMediaExternally(event) {
eventList.getLocalOrDownloadMedia(event, Qt.openUrlExternally)
}
anchors.fill: parent
clip: true
keyNavigationWraps: false