thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support audio, video, generic file for pasting (#220)

Browse source 
* 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
This commit is contained in:
christarazi 2018-02-18 12:52:31 -08:00 • committed by mujx
parent c8bfb02211
commit cd9d1a2ec6
25 changed files with 552 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

42
include/MatrixClient.h
View file

@ -39,7 +39,8 @@ public:
int txnId,
const QString &roomid,
const QString &msg,
const QFileInfo &info,
const QString &mime,
const int64_t media_size,
const QString &url = "") noexcept;
void login(const QString &username, const QString &password) noexcept;
void registerUser(const QString &username,
@ -58,14 +59,17 @@ public:
void downloadFile(const QString &event_id, const QUrl &url);
void messages(const QString &room_id, const QString &from_token, int limit = 30) noexcept;
void uploadImage(const QString &roomid,
const QSharedPointer<QIODevice> data,
const QString &filename);
const QString &filename,
const QSharedPointer<QIODevice> data);
void uploadFile(const QString &roomid,
const QSharedPointer<QIODevice> data,
const QString &filename);
const QString &filename,
const QSharedPointer<QIODevice> data);
void uploadAudio(const QString &roomid,
const QSharedPointer<QIODevice> data,
const QString &filename);
const QString &filename,
const QSharedPointer<QIODevice> data);
void uploadVideo(const QString &roomid,
const QString &filename,
const QSharedPointer<QIODevice> data);
void uploadFilter(const QString &filter) noexcept;
void joinRoom(const QString &roomIdOrAlias);
void leaveRoom(const QString &roomId);
@ -108,12 +112,25 @@ signals:
const QString &token);
void versionSuccess();
void imageUploaded(const QString &roomid,
const QSharedPointer<QIODevice> data,
const QString &filename,
const QString &url);
void fileUploaded(const QString &roomid, const QString &filename, const QString &url);
void audioUploaded(const QString &roomid, const QString &filename, const QString &url);
const QString &url,
const QString &mime,
const int64_t size);
void fileUploaded(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
void audioUploaded(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
void videoUploaded(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t size);
void roomAvatarRetrieved(const QString &roomid,
const QPixmap &img,
const QString &url,
@ -143,6 +160,7 @@ signals:
private:
QNetworkReply *makeUploadRequest(QSharedPointer<QIODevice> iodev);
QJsonObject getUploadReply(QNetworkReply *reply);
// Client API prefix.
QString clientApiUrl_;