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 

4 files changed, 25 insertions, 75 deletions

diff --git a/src/timeline/widgets/AudioItem.cc b/src/timeline/widgets/AudioItem.cc

index e84cbb3a..9075bc55 100644
--- a/src/timeline/widgets/AudioItem.cc
+++ b/src/timeline/widgets/AudioItem.cc
@@ -20,10 +20,11 @@
 #include <QDesktopServices>
 #include <QFile>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QPainter>
 #include <QPixmap>
 
+#include "Utils.h"
+
 #include "timeline/widgets/AudioItem.h"
 
 constexpr int MaxWidth          = 400;
@@ -82,42 +83,26 @@ AudioItem::AudioItem(QSharedPointer<MatrixClient> client,
   , event_{event}
   , client_{client}
 {
-        readableFileSize_ = calculateFileSize(event.content.info.size);
+        readableFileSize_ = utils::humanReadableFileSize(event.content.info.size);
 
         init();
 }
 
 AudioItem::AudioItem(QSharedPointer<MatrixClient> client,
                      const QString &url,
-                     const QSharedPointer<QIODevice> data,
                      const QString &filename,
+                     const int64_t size,
                      QWidget *parent)
   : QWidget(parent)
   , url_{url}
-  , text_{QFileInfo{filename}.fileName()}
+  , text_{filename}
   , client_{client}
 {
-        Q_UNUSED(data);
-        readableFileSize_ = calculateFileSize(QFileInfo{filename}.size());
+        readableFileSize_ = utils::humanReadableFileSize(size);
 
         init();
 }
 
-QString
-AudioItem::calculateFileSize(int nbytes) const
-{
-        if (nbytes == 0)
-                return QString("");
-
-        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);
-}
-
 QSize
 AudioItem::sizeHint() const
 {
diff --git a/src/timeline/widgets/FileItem.cc b/src/timeline/widgets/FileItem.cc

index a6159309..eda6e835 100644
--- a/src/timeline/widgets/FileItem.cc
+++ b/src/timeline/widgets/FileItem.cc
@@ -20,10 +20,11 @@
 #include <QDesktopServices>
 #include <QFile>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QPainter>
 #include <QPixmap>
 
+#include "Utils.h"
+
 #include "timeline/widgets/FileItem.h"
 
 constexpr int MaxWidth           = 400;
@@ -69,42 +70,26 @@ FileItem::FileItem(QSharedPointer<MatrixClient> client,
   , event_{event}
   , client_{client}
 {
-        readableFileSize_ = calculateFileSize(event.content.info.size);
+        readableFileSize_ = utils::humanReadableFileSize(event.content.info.size);
 
         init();
 }
 
 FileItem::FileItem(QSharedPointer<MatrixClient> client,
                    const QString &url,
-                   const QSharedPointer<QIODevice> data,
                    const QString &filename,
+                   const int64_t size,
                    QWidget *parent)
   : QWidget(parent)
   , url_{url}
-  , text_{QFileInfo{filename}.fileName()}
+  , text_{filename}
   , client_{client}
 {
-        Q_UNUSED(data);
-        readableFileSize_ = calculateFileSize(QFileInfo{filename}.size());
+        readableFileSize_ = utils::humanReadableFileSize(size);
 
         init();
 }
 
-QString
-FileItem::calculateFileSize(int nbytes) const
-{
-        if (nbytes == 0)
-                return QString("");
-
-        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()
 {
diff --git a/src/timeline/widgets/ImageItem.cc b/src/timeline/widgets/ImageItem.cc

index f713989e..f91799c3 100644
--- a/src/timeline/widgets/ImageItem.cc
+++ b/src/timeline/widgets/ImageItem.cc
@@ -61,14 +61,16 @@ ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
 
 ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
                      const QString &url,
-                     const QSharedPointer<QIODevice> data,
                      const QString &filename,
+                     const int64_t size,
                      QWidget *parent)
   : QWidget(parent)
   , url_{url}
   , text_{filename}
   , client_{client}
 {
+        Q_UNUSED(size);
+
         setMouseTracking(true);
         setCursor(Qt::PointingHandCursor);
         setAttribute(Qt::WA_Hover, true);
@@ -84,19 +86,12 @@ ImageItem::ImageItem(QSharedPointer<MatrixClient> client,
         url_                 = QString("%1/_matrix/media/r0/download/%2")
                  .arg(client_.data()->getHomeServer().toString(), media_params);
 
-        if (data.isNull()) {
-                qWarning() << "No image data to display";
-                return;
-        }
+        client_.data()->downloadImage(QString::fromStdString(event_.event_id), url_);
 
-        if (data->reset()) {
-                QPixmap p;
-                p.loadFromData(data->readAll());
-                setImage(p);
-        } else {
-                qWarning() << "Failed to seek to beginning of device:" << data->errorString();
-                return;
-        }
+        connect(client_.data(),
+                SIGNAL(imageDownloaded(const QString &, const QPixmap &)),
+                this,
+                SLOT(imageDownloaded(const QString &, const QPixmap &)));
 }
 
 void
diff --git a/src/timeline/widgets/VideoItem.cc b/src/timeline/widgets/VideoItem.cc

index b46dff7b..34c0a643 100644
--- a/src/timeline/widgets/VideoItem.cc
+++ b/src/timeline/widgets/VideoItem.cc
@@ -20,6 +20,7 @@
 #include <QVBoxLayout>
 
 #include "Config.h"
+#include "Utils.h"
 #include "timeline/widgets/VideoItem.h"
 
 void
@@ -45,7 +46,7 @@ VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
   , event_{event}
   , client_{client}
 {
-        readableFileSize_ = calculateFileSize(event.content.info.size);
+        readableFileSize_ = utils::humanReadableFileSize(event.content.info.size);
 
         init();
 
@@ -66,31 +67,15 @@ VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
 
 VideoItem::VideoItem(QSharedPointer<MatrixClient> client,
                      const QString &url,
-                     const QSharedPointer<QIODevice> data,
                      const QString &filename,
+                     const int64_t size,
                      QWidget *parent)
   : QWidget(parent)
   , url_{url}
-  , text_{QFileInfo(filename).fileName()}
+  , text_{filename}
   , client_{client}
 {
-        Q_UNUSED(data);
-        readableFileSize_ = calculateFileSize(QFileInfo(filename).size());
+        readableFileSize_ = utils::humanReadableFileSize(size);
 
         init();
 }
-
-QString
-VideoItem::calculateFileSize(int nbytes) const
-{
-        if (nbytes == 0)
-                return QString("");
-
-        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);
-}