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_;

22
include/TextInputWidget.h
View file

@ -27,12 +27,12 @@
#include "FlatButton.h"
#include "LoadingIndicator.h"
#include "dialogs/PreviewImageOverlay.h"
#include "dialogs/PreviewUploadOverlay.h"
#include "emoji/PickButton.h"
namespace dialogs {
class PreviewImageOverlay;
class PreviewUploadOverlay;
}
class FilteredTextEdit : public QTextEdit
@ -53,9 +53,13 @@ signals:
void heightChanged(int height);
void startedTyping();
void stoppedTyping();
void startedUpload();
void message(QString);
void command(QString name, QString args);
void image(const QSharedPointer<QIODevice> iodev, const QString &img_name);
void image(QSharedPointer<QIODevice> data, const QString &filename);
void audio(QSharedPointer<QIODevice> data, const QString &filename);
void video(QSharedPointer<QIODevice> data, const QString &filename);
void file(QSharedPointer<QIODevice> data, const QString &filename);
protected:
void keyPressEvent(QKeyEvent *event) override;
@ -67,11 +71,12 @@ private:
size_t history_index_;
QTimer *typingTimer_;
dialogs::PreviewImageOverlay previewDialog_;
dialogs::PreviewUploadOverlay previewDialog_;
void textChanged();
void receiveImage(const QByteArray img, const QString &img_name);
void uploadData(const QByteArray data, const QString &media, const QString &filename);
void afterCompletion(int);
void showPreview(const QMimeData *source, const QStringList &formats);
};
class TextInputWidget : public QWidget
@ -95,9 +100,10 @@ signals:
void sendTextMessage(QString msg);
void sendEmoteMessage(QString msg);
void uploadImage(QSharedPointer<QIODevice> data, const QString &filename);
void uploadFile(QSharedPointer<QIODevice> data, const QString &filename);
void uploadAudio(QSharedPointer<QIODevice> data, const QString &filename);
void uploadImage(const QSharedPointer<QIODevice> data, const QString &filename);
void uploadFile(const QSharedPointer<QIODevice> data, const QString &filename);
void uploadAudio(const QSharedPointer<QIODevice> data, const QString &filename);
void uploadVideo(const QSharedPointer<QIODevice> data, const QString &filename);
void sendJoinRoomRequest(const QString &room);

4
include/Utils.h
View file

@ -22,4 +22,8 @@ getMessageDescription(const TimelineEvent &event, const QString &localUser);
//! surrogate pairs might be in use.
QString
firstChar(const QString &input);
//! Get a human readable file size with the appropriate units attached.
QString
humanReadableFileSize(const uint64_t bytes);
}

22
include/dialogs/PreviewImageOverlay.h → include/dialogs/PreviewUploadOverlay.h
View file

@ -28,28 +28,32 @@ class QMimeData;
namespace dialogs {
class PreviewImageOverlay : public QWidget
class PreviewUploadOverlay : public QWidget
{
Q_OBJECT
public:
PreviewImageOverlay(QWidget *parent = nullptr);
PreviewUploadOverlay(QWidget *parent = nullptr);
void setImageAndCreate(const QByteArray data, const QString &type);
void setImageAndCreate(const QString &path);
void setPreview(const QByteArray data, const QString &mime);
void setPreview(const QString &path);
signals:
void confirmImageUpload(const QByteArray data, const QString &img_name);
void confirmUpload(const QByteArray data, const QString &media, const QString &filename);
private:
void init();
void setLabels(const QString &type, const QString &mime, const int upload_size);
bool isImage_;
QPixmap image_;
QByteArray imageData_;
QString imagePath_;
QByteArray data_;
QString filePath_;
QString mediaType_;
QLabel titleLabel_;
QLabel imageLabel_;
QLineEdit imageName_;
QLabel infoLabel_;
QLineEdit fileName_;
FlatButton upload_;
FlatButton cancel_;

22
include/timeline/TimelineView.h
View file

@ -44,6 +44,8 @@ struct PendingMessage
int txn_id;
QString body;
QString filename;
QString mime;
int64_t media_size;
QString event_id;
TimelineItem *widget;
@ -51,12 +53,16 @@ struct PendingMessage
int txn_id,
QString body,
QString filename,
QString mime,
int64_t media_size,
QString event_id,
TimelineItem *widget)
: ty(ty)
, txn_id(txn_id)
, body(body)
, filename(filename)
, mime(mime)
, media_size(media_size)
, event_id(event_id)
, widget(widget)
{}
@ -87,10 +93,10 @@ public:
void addUserMessage(mtx::events::MessageType ty, const QString &msg);
template<class Widget, mtx::events::MessageType MsgType>
void addUserMessage(
const QString &url,
const QString &filename,
const QSharedPointer<QIODevice> data = QSharedPointer<QIODevice>(nullptr));
void addUserMessage(const QString &url,
const QString &filename,
const QString &mime,
const int64_t size);
void updatePendingMessage(int txn_id, QString event_id);
void scrollDown();
QLabel *createDateSeparator(QDateTime datetime);
@ -236,11 +242,13 @@ template<class Widget, mtx::events::MessageType MsgType>
void
TimelineView::addUserMessage(const QString &url,
const QString &filename,
const QSharedPointer<QIODevice> data)
const QString &mime,
const int64_t size)
{
auto with_sender = lastSender_ != local_user_;
auto trimmed = QFileInfo{filename}.fileName(); // Trim file path.
auto widget = new Widget(client_, url, data, filename, this);
auto widget = new Widget(client_, url, trimmed, size, this);
TimelineItem *view_item =
new TimelineItem(widget, local_user_, with_sender, scroll_widget_);
@ -255,7 +263,7 @@ TimelineView::addUserMessage(const QString &url,
int txn_id = client_->incrementTransactionId();
PendingMessage message(MsgType, txn_id, url, filename, "", view_item);
PendingMessage message(MsgType, txn_id, url, trimmed, mime, size, "", view_item);
handleNewUserMessage(message);
}

22
include/timeline/TimelineViewManager.h
View file

@ -64,11 +64,25 @@ public slots:
void queueTextMessage(const QString &msg);
void queueEmoteMessage(const QString &msg);
void queueImageMessage(const QString &roomid,
const QSharedPointer<QIODevice> data,
const QString &filename,
const QString &url);
void queueFileMessage(const QString &roomid, const QString &filename, const QString &url);
void queueAudioMessage(const QString &roomid, const QString &filename, const QString &url);
const QString &url,
const QString &mime,
const int64_t dsize);
void queueFileMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
void queueAudioMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
void queueVideoMessage(const QString &roomid,
const QString &filename,
const QString &url,
const QString &mime,
const int64_t dsize);
private slots:
void messageSent(const QString &eventid, const QString &roomid, int txnid);

3
include/timeline/widgets/AudioItem.h
View file

@ -48,8 +48,8 @@ public:
AudioItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QSharedPointer<QIODevice> data,
const QString &filename,
const int64_t size,
QWidget *parent = nullptr);
QSize sizeHint() const override;
@ -76,7 +76,6 @@ private slots:
void fileDownloaded(const QString &event_id, const QByteArray &data);
private:
QString calculateFileSize(int nbytes) const;
void init();
enum class AudioState

3
include/timeline/widgets/FileItem.h
View file

@ -42,8 +42,8 @@ public:
FileItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QSharedPointer<QIODevice> data,
const QString &filename,
const int64_t size,
QWidget *parent = nullptr);
QSize sizeHint() const override;
@ -64,7 +64,6 @@ private slots:
void fileDownloaded(const QString &event_id, const QByteArray &data);
private:
QString calculateFileSize(int nbytes) const;
void openUrl();
void init();

2
include/timeline/widgets/ImageItem.h
View file

@ -36,8 +36,8 @@ public:
ImageItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QSharedPointer<QIODevice> data,
const QString &filename,
const int64_t size,
QWidget *parent = nullptr);
void setImage(const QPixmap &image);

3
include/timeline/widgets/VideoItem.h
View file

@ -37,13 +37,12 @@ public:
VideoItem(QSharedPointer<MatrixClient> client,
const QString &url,
const QSharedPointer<QIODevice> data,
const QString &filename,
const int64_t size,
QWidget *parent = nullptr);
private:
void init();
QString calculateFileSize(int nbytes) const;
QUrl url_;
QString text_;