Merge lp:~carlos-mazieri/ubuntu-filemanager-app/open-remote-files-03 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

implemented a set of high level download functions.

implemented a set of high level download functions.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:495
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/26/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/95/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/26/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:495
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/571/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/193

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/571/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

review: Approve

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2015-10-01 00:04:00 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2015-11-02 19:19:16 +0000
@@ -149,6 +149,9 @@
     connect(m_fsAction, SIGNAL(recopy(QStringList,QString)),
             mClipboard, SLOT(copy(QStringList,QString)));
 
+    connect(m_fsAction, SIGNAL(downloadTemporaryComplete(QString)),
+            this,       SIGNAL(downloadTemporaryComplete(QString)));
+
     setCompareAndReorder();
 
     if (QIcon::themeName().isEmpty() && !FMUtil::hasTriedThemeName())
@@ -1825,6 +1828,43 @@
 }
 
 
+
+bool DirModel::download(int index)
+{
+    bool ret = false;
+    if (IS_VALID_ROW(index))
+    {
+        QString outputFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) +
+                            QDir::separator() + mDirectoryContents.at(index).fileName());
+        ret = downloadAndSaveAs(index, outputFile);
+    }
+    return ret;
+}
+
+
+bool DirModel::downloadAndSaveAs(int index, const QString &filename)
+{
+    bool ret = false;
+    if (IS_VALID_ROW(index))
+    {
+        ret = m_fsAction->downloadAndSaveAs(mDirectoryContents.at(index),
+                                            filename);
+    }
+    return ret;
+}
+
+
+bool DirModel::downloadAsTemporaryFile(int index)
+{
+    bool ret = false;
+    if (IS_VALID_ROW(index))
+    {
+        ret = m_fsAction->downloadAsTemporaryFile(mDirectoryContents.at(index));
+    }
+    return ret;
+}
+
+
 #ifndef DO_NOT_USE_TAG_LIB
 QVariant DirModel::getAudioMetaData(const QFileInfo& fi, int role) const
 {

=== modified file 'src/plugin/folderlistmodel/dirmodel.h'
--- src/plugin/folderlistmodel/dirmodel.h	2015-09-20 20:28:26 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2015-11-02 19:19:16 +0000
@@ -317,6 +317,31 @@
                                                  const QString& password,
                                                  bool  savePassword);
 
+    //download functions
+    //
+    /*! \brief download(int index) download file pointed by \a index into standard Download location
+     *
+     * \return true if the download could be started, othewise false
+     */
+    Q_INVOKABLE  bool download(int index);
+
+    /*! \brief downloadAndSaveAs(int index, const QString& filename) download file pointed by \a index and save it as \a filename
+     *
+     * \return true if the download could be started, othewise false
+     *
+     */
+    Q_INVOKABLE  bool downloadAndSaveAs(int index, const QString& filename);
+
+    /*! \brief downloadAsTemporaryFile(int index)  save download as temporary, useful to open remote files
+     *
+     *  At the end if download is OK the signal downloadTemporaryComplete(const QString& fullpathname) is emitted
+     *
+     * \return true if the download could be started, othewise false
+     *
+     */
+    Q_INVOKABLE  bool downloadAsTemporaryFile(int index);
+
+
 public slots:
   /*!
      * \brief copySelection() copy selected items to the clipboard
@@ -470,6 +495,12 @@
     void     clipboardChanged();
     void     enabledExternalFSWatcherChanged(bool);
 
+    /*!
+     * \brief downloadTemporaryComplete() says that download has been completed and
+     *    the \a filename is ready to be used, filename is a full pathname
+     */
+    void     downloadTemporaryComplete(const QString& filename);
+
 private slots:    
     void onItemRemoved(const DirItemInfo&);  
     void onItemAdded(const DirItemInfo&);