Notification when download finishes

diff --git a/src/downloaditem.cpp b/src/downloaditem.cpp
index 05995370968b5fa1b07aed5298e0c6a2971f5342..6baab761a1291ec4d542d69623bd6cef27b6bf65 100644 (file)
--- a/src/downloaditem.cpp
+++ b/src/downloaditem.cpp
@@ -71,6 +71,7 @@ void DownloadItem::init() {
             this, SLOT(requestFinished()));
 
     // start timer for the download estimation
+    m_totalTime = 0;
     m_downloadTime.start();
     speedCheckTimer->start();
 
@@ -298,6 +299,7 @@ void DownloadItem::requestFinished() {
     }
     m_file.close();
     m_status = Finished;
+    m_totalTime = m_downloadTime.elapsed() / 1000.0;
     emit statusChanged();
     emit finished();
     m_reply->deleteLater();
@@ -333,14 +335,15 @@ QString DownloadItem::formattedSpeed(double speed) {
     return QString(QLatin1String("%1 %2")).arg(speedInt).arg(unit);
 }
 
-QString DownloadItem::formattedTime(double timeRemaining) {
+QString DownloadItem::formattedTime(double timeRemaining, bool remaining) {
     QString timeRemainingString = tr("seconds");
     if (timeRemaining > 60) {
         timeRemaining = timeRemaining / 60;
         timeRemainingString = tr("minutes");
     }
     timeRemaining = floor(timeRemaining);
-    return tr("%4 %5 remaining")
+    QString msg = remaining ? tr("%4 %5 remaining") : "%4 %5";
+        return msg
             .arg(timeRemaining)
             .arg(timeRemainingString);
 }

diff --git a/src/downloaditem.h b/src/downloaditem.h
index 58bb49353e87d5dbbb5c567df9c461d2820d079d..bb9245f4ec615452d2f074ebd2499c17eb06eb7b 100644 (file)
--- a/src/downloaditem.h
+++ b/src/downloaditem.h
@@ -31,6 +31,7 @@ public:
     qint64 bytesTotal() const;
     qint64 bytesReceived() const;
     double remainingTime() const;
+    double totalTime() { return m_totalTime; }
     double currentSpeed() const;
     int currentPercent() const { return percent; }
     Video* getVideo() const { return video; }
@@ -38,7 +39,7 @@ public:
     DownloadItemStatus status() const { return m_status; }
     static QString formattedFilesize(qint64 size);
     static QString formattedSpeed(double speed);
-    static QString formattedTime(double time);
+    static QString formattedTime(double time, bool remaining = true);
     QString errorMessage() const;
 
 public slots:
@@ -67,6 +68,7 @@ private:
     bool m_finishedDownloading;
     QTime m_lastProgressTime;
     int percent;
+    double m_totalTime;
 
     QUrl m_url;
 

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index a4f1c495d60c9704123ab1e86f3600dc24325f06..ee597d899f3ba46ed44f510d17081edaf6a0590e 100644 (file)
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -8,8 +8,8 @@
 static DownloadManager *downloadManagerInstance = 0;
 
 DownloadManager::DownloadManager(QWidget *parent) :
-        QObject(parent),
-        downloadModel(new DownloadModel(this, this))
+    QObject(parent),
+    downloadModel(new DownloadModel(this, this))
 { }
 
 DownloadManager* DownloadManager::instance() {
@@ -47,8 +47,8 @@ void DownloadManager::addItem(Video *video) {
         msgBox.setIconPixmap(QPixmap(":/images/app.png").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
         msgBox.setText(tr("This is just the demo version of %1.").arg(Constants::NAME));
         msgBox.setInformativeText(
-                tr("It can only download videos shorter than %1 minutes so you can test the download functionality.")
-                .arg(4));
+                    tr("It can only download videos shorter than %1 minutes so you can test the download functionality.")
+                    .arg(4));
         msgBox.setModal(true);
         // make it a "sheet" on the Mac
         msgBox.setWindowModality(Qt::WindowModal);
@@ -130,6 +130,21 @@ void DownloadManager::gotStreamUrl(QUrl url) {
 
 void DownloadManager::itemFinished() {
     if (activeItems() == 0) emit finished();
+#ifdef Q_WS_MAC
+    if (mac::canNotify()) {
+        DownloadItem *item = static_cast<DownloadItem*>(sender());
+        if (!item) {
+            qDebug() << "Cannot get item in" << __FUNCTION__;
+            return;
+        }
+        Video *video = item->getVideo();
+        if (!video) return;
+        QString stats = tr("%1 downloaded in %2").arg(
+                    DownloadItem::formattedFilesize(item->bytesTotal()),
+                    DownloadItem::formattedTime(item->totalTime(), false));
+        mac::notify(tr("Download finished"), video->title(), stats);
+    }
+#endif
 }
 
 void DownloadManager::updateStatusMessage() {