From cd9d1a2ec69bf4c459f9e845293d5fd7dc1398d4 Mon Sep 17 00:00:00 2001
From: christarazi <christarazi@users.noreply.github.com>
Date: Sun, 18 Feb 2018 12:52:31 -0800
Subject:  Support audio, video, generic file for pasting  (#220)

* Refactor widget items to use same interface

* Support audio, video, generic file for pasting

* Add utils function for human readable file sizes

* Set correct MIME type for media messages

This change also determines the size of the upload once from the
ContentLengthHeader, rather than seeking the QIODevice and asking for
its size. This prevents any future trouble in case the QIODevice is
sequential (cannot be seeked). The MIME type is also determined at
upload once, rather than using the QIODevice and the underlying data
inside.

* Allow for file urls to be used as fall-back

This fixes an issue on macOS which uses `text/uri-list` for copying
files to the clipboard.

fixes #228
---
 src/ChatPage.cc | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'src/ChatPage.cc')

diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index ace201eb..9ec377e8 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -230,21 +230,27 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
                 &TextInputWidget::uploadImage,
                 this,
                 [=](QSharedPointer<QIODevice> data, const QString &fn) {
-                        client_->uploadImage(current_room_, data, fn);
+                        client_->uploadImage(current_room_, fn, data);
                 });
 
         connect(text_input_,
                 &TextInputWidget::uploadFile,
                 this,
                 [=](QSharedPointer<QIODevice> data, const QString &fn) {
-                        client_->uploadFile(current_room_, data, fn);
+                        client_->uploadFile(current_room_, fn, data);
                 });
 
         connect(text_input_,
                 &TextInputWidget::uploadAudio,
                 this,
                 [=](QSharedPointer<QIODevice> data, const QString &fn) {
-                        client_->uploadAudio(current_room_, data, fn);
+                        client_->uploadAudio(current_room_, fn, data);
+                });
+        connect(text_input_,
+                &TextInputWidget::uploadVideo,
+                this,
+                [=](QSharedPointer<QIODevice> data, const QString &fn) {
+                        client_->uploadVideo(current_room_, fn, data);
                 });
 
         connect(
@@ -253,23 +259,30 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
         connect(client_.data(),
                 &MatrixClient::imageUploaded,
                 this,
-                [=](QString roomid, QSharedPointer<QIODevice> data, QString filename, QString url) {
+                [=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
                         text_input_->hideUploadSpinner();
-                        view_manager_->queueImageMessage(roomid, data, filename, url);
+                        view_manager_->queueImageMessage(roomid, filename, url, mime, dsize);
                 });
         connect(client_.data(),
                 &MatrixClient::fileUploaded,
                 this,
-                [=](QString roomid, QString filename, QString url) {
+                [=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
                         text_input_->hideUploadSpinner();
-                        view_manager_->queueFileMessage(roomid, filename, url);
+                        view_manager_->queueFileMessage(roomid, filename, url, mime, dsize);
                 });
         connect(client_.data(),
                 &MatrixClient::audioUploaded,
                 this,
-                [=](QString roomid, QString filename, QString url) {
+                [=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
+                        text_input_->hideUploadSpinner();
+                        view_manager_->queueAudioMessage(roomid, filename, url, mime, dsize);
+                });
+        connect(client_.data(),
+                &MatrixClient::videoUploaded,
+                this,
+                [=](QString roomid, QString filename, QString url, QString mime, int64_t dsize) {
                         text_input_->hideUploadSpinner();
-                        view_manager_->queueAudioMessage(roomid, filename, url);
+                        view_manager_->queueVideoMessage(roomid, filename, url, mime, dsize);
                 });
 
         connect(room_list_, &RoomList::roomAvatarChanged, this, &ChatPage::updateTopBarAvatar);
-- 
cgit 1.5.1