Add read support for m.file messages (#24)
This commit is contained in:
Konstantinos Sideris
parent
f1eb0bbac0
commit
b21942a3e3
16 changed files with 457 additions and 4 deletions
220
src/FileItem.cc
Normal file
220
src/FileItem.cc
Normal file
|
|
@ -0,0 +1,220 @@
|
|||
/*
|
||||
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <QBrush>
|
||||
#include <QDebug>
|
||||
#include <QDesktopServices>
|
||||
#include <QFile>
|
||||
#include <QFileDialog>
|
||||
#include <QFileInfo>
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
|
||||
#include "FileItem.h"
|
||||
#include "ImageOverlayDialog.h"
|
||||
|
||||
namespace events = matrix::events;
|
||||
namespace msgs = matrix::events::messages;
|
||||
|
||||
FileItem::FileItem(QSharedPointer<MatrixClient> client,
|
||||
const events::MessageEvent<msgs::File> &event,
|
||||
QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, event_{event}
|
||||
, client_{client}
|
||||
{
|
||||
setMouseTracking(true);
|
||||
setCursor(Qt::PointingHandCursor);
|
||||
setAttribute(Qt::WA_Hover, true);
|
||||
|
||||
url_ = event.msgContent().url();
|
||||
text_ = event.content().body();
|
||||
readableFileSize_ = calculateFileSize(event.msgContent().info().size);
|
||||
|
||||
icon_.addFile(":/icons/icons/ui/arrow-pointing-down.png");
|
||||
|
||||
QList<QString> url_parts = url_.toString().split("mxc://");
|
||||
|
||||
if (url_parts.size() != 2) {
|
||||
qDebug() << "Invalid format for image" << url_.toString();
|
||||
return;
|
||||
}
|
||||
|
||||
QString media_params = url_parts[1];
|
||||
url_ = QString("%1/_matrix/media/r0/download/%2")
|
||||
.arg(client_.data()->getHomeServer().toString(), media_params);
|
||||
|
||||
connect(client_.data(), &MatrixClient::fileDownloaded, this, &FileItem::fileDownloaded);
|
||||
}
|
||||
|
||||
FileItem::FileItem(QSharedPointer<MatrixClient> client,
|
||||
const QString &url,
|
||||
const QString &filename,
|
||||
QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, url_{url}
|
||||
, text_{QFileInfo(filename).fileName()}
|
||||
, client_{client}
|
||||
{
|
||||
setMouseTracking(true);
|
||||
setCursor(Qt::PointingHandCursor);
|
||||
setAttribute(Qt::WA_Hover, true);
|
||||
|
||||
// TODO: calculateFileSize
|
||||
/* readableFileSize_ = calculateFileSize(event.msgContent().info().size); */
|
||||
|
||||
QList<QString> url_parts = url_.toString().split("mxc://");
|
||||
|
||||
icon_.addFile(":/icons/icons/ui/arrow-pointing-down.png");
|
||||
|
||||
if (url_parts.size() != 2) {
|
||||
qDebug() << "Invalid format for image" << url_.toString();
|
||||
return;
|
||||
}
|
||||
|
||||
QString media_params = url_parts[1];
|
||||
url_ = QString("%1/_matrix/media/r0/download/%2")
|
||||
.arg(client_.data()->getHomeServer().toString(), media_params);
|
||||
}
|
||||
|
||||
QString
|
||||
FileItem::calculateFileSize(int nbytes) const
|
||||
{
|
||||
if (nbytes < 1024)
|
||||
return QString("%1 B").arg(nbytes);
|
||||
|
||||
if (nbytes < 1024 * 1024)
|
||||
return QString("%1 KB").arg(nbytes / 1024);
|
||||
|
||||
return QString("%1 MB").arg(nbytes / 1024 / 1024);
|
||||
}
|
||||
|
||||
void
|
||||
FileItem::openUrl()
|
||||
{
|
||||
if (url_.toString().isEmpty())
|
||||
return;
|
||||
|
||||
if (!QDesktopServices::openUrl(url_))
|
||||
qWarning() << "Could not open url" << url_.toString();
|
||||
}
|
||||
|
||||
QSize
|
||||
FileItem::sizeHint() const
|
||||
{
|
||||
return QSize(MaxWidth, Height);
|
||||
}
|
||||
|
||||
void
|
||||
FileItem::mousePressEvent(QMouseEvent *event)
|
||||
{
|
||||
if (event->button() != Qt::LeftButton)
|
||||
return;
|
||||
|
||||
auto point = event->pos();
|
||||
|
||||
// Click on the download icon.
|
||||
if (QRect(HorizontalPadding, VerticalPadding / 2, IconDiameter, IconDiameter)
|
||||
.contains(point)) {
|
||||
filenameToSave_ = QFileDialog::getSaveFileName(this, tr("Save File"), text_);
|
||||
|
||||
if (filenameToSave_.isEmpty())
|
||||
return;
|
||||
|
||||
client_->downloadFile(event_.eventId(), url_);
|
||||
} else {
|
||||
openUrl();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
FileItem::fileDownloaded(const QString &event_id, const QByteArray &data)
|
||||
{
|
||||
if (event_id != event_.eventId())
|
||||
return;
|
||||
|
||||
try {
|
||||
QFile file(filenameToSave_);
|
||||
|
||||
if (!file.open(QIODevice::WriteOnly))
|
||||
return;
|
||||
|
||||
file.write(data);
|
||||
file.close();
|
||||
} catch (const std::exception &ex) {
|
||||
qDebug() << "Error while saving file to:" << ex.what();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
FileItem::paintEvent(QPaintEvent *event)
|
||||
{
|
||||
Q_UNUSED(event);
|
||||
|
||||
QPainter painter(this);
|
||||
painter.setRenderHint(QPainter::Antialiasing);
|
||||
|
||||
QFont font("Open Sans");
|
||||
font.setPixelSize(12);
|
||||
font.setWeight(80);
|
||||
|
||||
QFontMetrics fm(font);
|
||||
|
||||
int computedWidth = std::min(
|
||||
fm.width(text_) + 2 * IconRadius + VerticalPadding * 2 + TextPadding, (double)MaxWidth);
|
||||
|
||||
QPainterPath path;
|
||||
path.addRoundedRect(QRectF(0, 0, computedWidth, Height), 10, 10);
|
||||
|
||||
painter.setPen(Qt::NoPen);
|
||||
painter.fillPath(path, backgroundColor_);
|
||||
painter.drawPath(path);
|
||||
|
||||
QPainterPath circle;
|
||||
circle.addEllipse(QPoint(IconXCenter, IconYCenter), IconRadius, IconRadius);
|
||||
|
||||
painter.setPen(Qt::NoPen);
|
||||
painter.fillPath(circle, iconColor_);
|
||||
painter.drawPath(circle);
|
||||
|
||||
icon_.paint(&painter,
|
||||
QRect(IconXCenter - DownloadIconRadius / 2,
|
||||
IconYCenter - DownloadIconRadius / 2,
|
||||
DownloadIconRadius,
|
||||
DownloadIconRadius),
|
||||
Qt::AlignCenter,
|
||||
QIcon::Normal);
|
||||
|
||||
const int textStartX = HorizontalPadding + 2 * IconRadius + TextPadding;
|
||||
const int textStartY = VerticalPadding + fm.ascent() / 2;
|
||||
|
||||
// Draw the filename.
|
||||
QString elidedText =
|
||||
fm.elidedText(text_,
|
||||
Qt::ElideRight,
|
||||
computedWidth - HorizontalPadding * 2 - TextPadding - 2 * IconRadius);
|
||||
|
||||
painter.setFont(font);
|
||||
painter.setPen(QPen(textColor_));
|
||||
painter.drawText(QPoint(textStartX, textStartY), elidedText);
|
||||
|
||||
// Draw the filesize.
|
||||
font.setWeight(50);
|
||||
painter.setFont(font);
|
||||
painter.setPen(QPen(textColor_));
|
||||
painter.drawText(QPoint(textStartX, textStartY + 1.5 * fm.ascent()), readableFileSize_);
|
||||
}
|
||||
|
|
@ -586,6 +586,32 @@ MatrixClient::downloadImage(const QString &event_id, const QUrl &url)
|
|||
});
|
||||
}
|
||||
|
||||
void
|
||||
MatrixClient::downloadFile(const QString &event_id, const QUrl &url)
|
||||
{
|
||||
QNetworkRequest fileRequest(url);
|
||||
|
||||
auto reply = get(fileRequest);
|
||||
connect(reply, &QNetworkReply::finished, this, [this, reply, event_id]() {
|
||||
reply->deleteLater();
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
if (status == 0 || status >= 400) {
|
||||
// TODO: Handle error
|
||||
qWarning() << reply->errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
auto data = reply->readAll();
|
||||
|
||||
if (data.size() == 0)
|
||||
return;
|
||||
|
||||
emit fileDownloaded(event_id, data);
|
||||
});
|
||||
}
|
||||
|
||||
void
|
||||
MatrixClient::fetchOwnAvatar(const QUrl &avatar_url)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "Avatar.h"
|
||||
#include "AvatarProvider.h"
|
||||
#include "Config.h"
|
||||
#include "FileItem.h"
|
||||
#include "ImageItem.h"
|
||||
#include "Sync.h"
|
||||
#include "TimelineItem.h"
|
||||
|
|
@ -186,6 +187,46 @@ TimelineItem::TimelineItem(ImageItem *image,
|
|||
mainLayout_->addLayout(imageLayout);
|
||||
}
|
||||
|
||||
TimelineItem::TimelineItem(FileItem *file,
|
||||
const events::MessageEvent<msgs::File> &event,
|
||||
bool with_sender,
|
||||
QWidget *parent)
|
||||
: QWidget(parent)
|
||||
{
|
||||
init();
|
||||
|
||||
event_id_ = event.eventId();
|
||||
|
||||
auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp());
|
||||
auto displayName = TimelineViewManager::displayName(event.sender());
|
||||
|
||||
QSettings settings;
|
||||
descriptionMsg_ = {event.sender() == settings.value("auth/user_id") ? "You" : displayName,
|
||||
event.sender(),
|
||||
" sent a file",
|
||||
descriptiveTime(QDateTime::fromMSecsSinceEpoch(event.timestamp()))};
|
||||
|
||||
generateTimestamp(timestamp);
|
||||
|
||||
auto fileLayout = new QHBoxLayout();
|
||||
fileLayout->setContentsMargins(0, 5, 0, 0);
|
||||
fileLayout->addWidget(file);
|
||||
fileLayout->addStretch(1);
|
||||
|
||||
if (with_sender) {
|
||||
generateBody(displayName, "");
|
||||
setupAvatarLayout(displayName);
|
||||
|
||||
mainLayout_->addLayout(headerLayout_);
|
||||
|
||||
AvatarProvider::resolve(event.sender(), this);
|
||||
} else {
|
||||
setupSimpleLayout();
|
||||
}
|
||||
|
||||
mainLayout_->addLayout(fileLayout);
|
||||
}
|
||||
|
||||
/*
|
||||
* Used to display remote notice messages.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include <QSettings>
|
||||
#include <QTimer>
|
||||
|
||||
#include "FileItem.h"
|
||||
#include "FloatingButton.h"
|
||||
#include "ImageItem.h"
|
||||
#include "RoomMessages.h"
|
||||
|
|
@ -331,6 +332,34 @@ TimelineView::parseMessageEvent(const QJsonObject &event, TimelineDirection dire
|
|||
updateLastSender(emote.sender(), direction);
|
||||
|
||||
return createTimelineItem(emote, with_sender);
|
||||
} else if (msg_type == events::MessageEventType::File) {
|
||||
events::MessageEvent<msgs::File> file;
|
||||
|
||||
try {
|
||||
file.deserialize(event);
|
||||
} catch (const DeserializationException &e) {
|
||||
qWarning() << e.what() << event;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (isDuplicate(file.eventId()))
|
||||
return nullptr;
|
||||
|
||||
eventIds_[file.eventId()] = true;
|
||||
|
||||
QString txnid = file.unsignedData().transactionId();
|
||||
|
||||
if (!txnid.isEmpty() &&
|
||||
isPendingMessage(txnid, file.sender(), local_user_)) {
|
||||
removePendingMessage(txnid);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto withSender = isSenderRendered(file.sender(), direction);
|
||||
|
||||
updateLastSender(file.sender(), direction);
|
||||
|
||||
return createTimelineItem(file, withSender);
|
||||
} else if (msg_type == events::MessageEventType::Unknown) {
|
||||
// TODO Handle redacted messages.
|
||||
// Silenced for now.
|
||||
|
|
@ -469,6 +498,15 @@ TimelineView::createTimelineItem(const events::MessageEvent<msgs::Image> &event,
|
|||
return item;
|
||||
}
|
||||
|
||||
TimelineItem *
|
||||
TimelineView::createTimelineItem(const events::MessageEvent<msgs::File> &event, bool withSender)
|
||||
{
|
||||
auto file = new FileItem(client_, event);
|
||||
auto item = new TimelineItem(file, event, withSender, scroll_widget_);
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
TimelineItem *
|
||||
TimelineView::createTimelineItem(const events::MessageEvent<msgs::Notice> &event, bool with_sender)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,13 +25,11 @@ File::deserialize(const QJsonObject &object)
|
|||
if (!object.contains("url"))
|
||||
throw DeserializationException("messages::File url key is missing");
|
||||
|
||||
if (!object.contains("filename"))
|
||||
throw DeserializationException("messages::File filename key is missing");
|
||||
|
||||
if (object.value("msgtype") != "m.file")
|
||||
throw DeserializationException("invalid msgtype for file");
|
||||
|
||||
url_ = object.value("url").toString();
|
||||
url_ = object.value("url").toString();
|
||||
filename_ = object.value("filename").toString();
|
||||
|
||||
if (object.contains("info")) {
|
||||
auto file_info = object.value("info").toObject();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue