Merge lp:~diegosarmentero/ubuntuone-credentials/cover-download into lp:ubuntuone-credentials

[Diego Sarmentero]

- Support urls in the --picture argument, to handle download of the image from this application

Changing arguments to receive the url of the album cover and download it from this application.

[lp:~diegosarmentero/ubuntuone-credentials/cover-download]

22. By Diego Sarmentero on 2013-05-09

removing qdebug message

23. By Diego Sarmentero on 2013-05-09

changing Downloader slot to private

24. By Diego Sarmentero on 2013-05-13

merge

[dobey (dobey)]

What's the rationale for this? Wasn't this not needed, because the dash already downloaded the image, and we just pass that local file path to ubuntuone-music-login for display, so we don't have to download it from the server again?

124 - <string>img</string>
125 + <string> </string>

Also, why is this changed to be white space for the string, rather than just empty?

[lp:~diegosarmentero/ubuntuone-credentials/cover-download]

25. By Diego Sarmentero on 2013-05-15

merge

[dobey (dobey)]

review: Needs Information

[lp:~diegosarmentero/ubuntuone-credentials/cover-download]

26. By Diego Sarmentero on 2013-05-16

merge

[Diego Sarmentero (diegosarmentero)]

> What's the rationale for this? Wasn't this not needed, because the dash
> already downloaded the image, and we just pass that local file path to
> ubuntuone-music-login for display, so we don't have to download it from the
> server again?

No, we need to download the image in this app, also we had some complains about the scope downloading the image, so we need to do it here.

>
> 124 - <string>img</string>
> 125 + <string> </string>
>
> Also, why is this changed to be white space for the string, rather than just
> empty?

The image being downloaded can take a couple of seconds to appear in the app, so it's better to show an empty space until the image is loaded, instead of something that says "img" and then gets replaced by the actual image.

[lp:~diegosarmentero/ubuntuone-credentials/cover-download]

27. By Diego Sarmentero on 2013-05-17

merge

[Alejandro J. Cura (alecu)]

+1

review: Approve

[lp:~diegosarmentero/ubuntuone-credentials/cover-download]

28. By Diego Sarmentero on 2013-05-20

changing label image to have a fixed width

[dobey (dobey)]

review: Approve

=== modified file 'music-login/CMakeLists.txt'
--- music-login/CMakeLists.txt	2013-03-26 14:10:42 +0000
+++ music-login/CMakeLists.txt	2013-05-20 13:38:26 +0000
@@ -14,6 +14,7 @@
 FILE (GLOB LIB_SOURCES
   header.cpp
   footer.cpp
+  downloader.cpp
   loadingoverlay.cpp
   loginform.cpp
   mainwindow.cpp
@@ -42,8 +43,8 @@
   ${BUILT_RESOURCES}
 )
 
-qt5_use_modules (${MUSIC_LOGIN_LIB} Core DBus Gui Widgets)
-qt5_use_modules (${MUSIC_LOGIN_EXE} DBus Widgets)
+qt5_use_modules (${MUSIC_LOGIN_LIB} Core DBus Gui Widgets Network)
+qt5_use_modules (${MUSIC_LOGIN_EXE} DBus Widgets Network)
 target_link_libraries (${MUSIC_LOGIN_EXE}
   -Wl,-rpath,${CMAKE_BINARY_DIR}/lib
   -L${CMAKE_BINARY_DIR}/lib

=== added file 'music-login/downloader.cpp'
--- music-login/downloader.cpp	1970-01-01 00:00:00 +0000
+++ music-login/downloader.cpp	2013-05-20 13:38:26 +0000
@@ -0,0 +1,51 @@
+#include "downloader.h"
+#include <QUuid>
+#include <QFile>
+#include <QDebug>
+
+Downloader::Downloader(QObject *parent) :
+    QObject(parent)
+{
+    this->_nam = new QNetworkAccessManager(this);
+    this->_request = new QNetworkRequest();
+    this->createDownloadDir();
+
+    QObject::connect(this->_nam, SIGNAL(finished(QNetworkReply*)),
+                     this, SLOT(onReply(QNetworkReply*)));
+}
+
+void Downloader::onReply(QNetworkReply* reply)
+{
+    QVariant statusAttr = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+    if(!statusAttr.isValid()) {
+        qDebug() << "No image resource available!";
+        return;
+    }
+
+    QByteArray payload = reply->readAll();
+    if(!payload.isEmpty()) {
+        QUuid uuid = QUuid::createUuid();
+        QString imagePath = this->_downloadDir->filePath(uuid.toString());
+        QFile file(imagePath);
+        file.open(QIODevice::WriteOnly);
+        file.write(payload.data(), payload.size());
+        file.close();
+
+        emit fileDownloaded(imagePath);
+    }
+}
+
+void Downloader::startDownload(const QString& url)
+{
+    if(!url.isEmpty()){
+        this->_request->setUrl(url);
+        this->_nam->get(*this->_request);
+    }
+}
+
+void Downloader::createDownloadDir(){
+    this->_downloadDir = new QDir(QDir::temp().filePath("u1credentials"));
+    if(!this->_downloadDir->exists()){
+        this->_downloadDir->mkpath(this->_downloadDir->absolutePath());
+    }
+}

=== added file 'music-login/downloader.h'
--- music-login/downloader.h	1970-01-01 00:00:00 +0000
+++ music-login/downloader.h	2013-05-20 13:38:26 +0000
@@ -0,0 +1,32 @@
+#ifndef DOWNLOADER_H
+#define DOWNLOADER_H
+
+#include <QObject>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QDir>
+
+class Downloader : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Downloader(QObject *parent = 0);
+
+    void startDownload(const QString& url);
+
+private slots:
+    void onReply(QNetworkReply*);
+
+signals:
+    void fileDownloaded(QString&);
+
+private:
+    QNetworkAccessManager* _nam;
+    QNetworkRequest* _request;
+    QDir* _downloadDir;
+
+    void createDownloadDir();
+
+};
+
+#endif // DOWNLOADER_H

=== modified file 'music-login/header.ui'
--- music-login/header.ui	2013-04-26 14:01:29 +0000
+++ music-login/header.ui	2013-05-20 13:38:26 +0000
@@ -28,6 +28,12 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>75</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="maximumSize">
       <size>
        <width>75</width>
@@ -35,7 +41,7 @@
       </size>
      </property>
      <property name="text">
-      <string>img</string>
+      <string/>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>

=== modified file 'music-login/ssowizard.cpp'
--- music-login/ssowizard.cpp	2013-05-16 14:28:36 +0000
+++ music-login/ssowizard.cpp	2013-05-20 13:38:26 +0000
@@ -72,11 +72,13 @@
         }
     }
 
-    this->setHeader(artist, album, price, picture);
+    this->setHeader(artist, album, price);
 
     // Connect signals
+    QObject::connect(&(this->downloader), SIGNAL(fileDownloaded(QString&)),
+                     this, SLOT(imageDownloaded(QString&)));
     QObject::connect(&(this->_service), SIGNAL(sessionActivated()), this, SLOT(sessionDetected()));
-    this->_service.init_service();
+                    this->_service.init_service();
     QObject::connect(&(this->_service), SIGNAL(credentialsFound(QString,QString,QString,QString,QString)),
                      this, SLOT(accountAuthenticated()));
     QObject::connect(&(this->_service), SIGNAL(requestFailed(const ErrorResponse&)),
@@ -90,6 +92,8 @@
     QObject::connect(this->ui->pageRegister, SIGNAL(registerCheckout(QString,QString,QString)),
                      this, SLOT(registerAndBuy(QString, QString, QString)));
 
+    this->downloader.startDownload(picture);
+
     // Set the error messages depending the code.
     this->_codeMessages[ErrorCodes::CODE_CAPTCHA_REQUIRED] = "A captcha challenge is required to complete the request.";
     this->_codeMessages[ErrorCodes::CODE_INVALID_CREDENTIALS] = "That's not your password. Please try again.";
@@ -179,12 +183,16 @@
     this->ui->lblError->setEnabled(false);
 }
 
-void SSOWizard::setHeader(QString artist, QString album, QString price, QString picture_path)
+void SSOWizard::setHeader(QString artist, QString album, QString price)
 {
     this->ui->header->setAlbum(album);
     this->ui->header->setArtist(artist);
     this->ui->header->setPrice(price);
-    this->ui->header->setPicture(picture_path);
+}
+
+void SSOWizard::imageDownloaded(QString& path)
+{
+    this->ui->header->setPicture(path);
 }
 
 void SSOWizard::resizeEvent(QResizeEvent * event)

=== modified file 'music-login/ssowizard.h'
--- music-login/ssowizard.h	2013-05-16 14:28:36 +0000
+++ music-login/ssowizard.h	2013-05-20 13:38:26 +0000
@@ -34,6 +34,7 @@
 #include <QHash>
 #include <ssoservice.h>
 #include "loadingoverlay.h"
+#include "downloader.h"
 
 using namespace SSO;
 
@@ -60,6 +61,7 @@
     virtual void resizeEvent(QResizeEvent *);
 
 private slots:
+    void imageDownloaded(QString& path);
     void showRegisterPage(QString email, QString password);
     void loginAndBuy(QString email, QString password);
     void registerAndBuy(QString email, QString password, QString name);
@@ -71,6 +73,7 @@
 
 private:
     Ui::SSOWizard *ui;
+    Downloader downloader;
     QString purchaseUrl;
     SSOService _service;
     LoadingOverlay* _overlay;
@@ -79,7 +82,7 @@
     QString cleanArgument(QString& arg);
     void showError(const ErrorResponse& error);
     void hideError();
-    void setHeader(QString artist, QString album, QString price, QString picture_path);
+    void setHeader(QString artist, QString album, QString price);
 
 #ifdef TESTS
     friend class TestSSOWizard;