Merge lp:~carlos-mazieri/ubuntu-filemanager-app/app-devel-pre3 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

it is the 3rd part of the https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/app-devel/+merge/216409

Disk loading classes modified to allow reusing code for Trash:

* introduced class IORequestLoader
* add ExternalFileSystemChangesWorker::compareItems()
* comparing moved from ExternalFileSystemChangesWorker::run() to ExternalFileSystemChangesWorker::compareItems()

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

PASSED: Continuous integration, rev:171
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/194/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2361
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/144

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I've asked Michael Spencer to take a look at this and the other related branches and review. If he has difficulty with that I've asked him to get back to me so we can find another reviewer.

[Arto Jalkanen (ajalkane)]

Looks good to me.

review: Approve

=== modified file 'src/plugin/folderlistmodel/iorequest.cpp'
--- src/plugin/folderlistmodel/iorequest.cpp	2014-02-05 15:31:44 +0000
+++ src/plugin/folderlistmodel/iorequest.cpp	2014-05-02 10:51:28 +0000
@@ -30,6 +30,7 @@
  */
 
 #include "iorequest.h"
+#include "diriteminfo.h"
 
 #include <QDirIterator>
 #include <QDebug>
@@ -48,11 +49,22 @@
     return m_type;
 }
 
-
+//----------------------------------------------------------------------------------
+IORequestLoader::IORequestLoader(const QString &pathName,
+                                 QDir::Filter filter,
+                                 bool isRecursive)
+      : IORequest()
+      , mLoaderType(NormalLoader)
+      , mPathName(pathName)
+      , mFilter(filter)
+      , mIsRecursive(isRecursive)
+{
+
+}
+
+//-----------------------------------------------------------------------------------------------
 DirListWorker::DirListWorker(const QString &pathName, QDir::Filter filter, const bool isRecursive)
-    : mPathName(pathName)
-    , mFilter(filter)
-    , mIsRecursive(isRecursive)
+    : IORequestLoader(pathName, filter, isRecursive)
 {
 
 }
@@ -71,8 +83,12 @@
     emit workerFinished();
 }
 
+DirItemInfoList  IORequestLoader::getContents()
+{
+   return  getNormalContent();
+}
 
-DirItemInfoList DirListWorker::getContents()
+DirItemInfoList  IORequestLoader::getNormalContent()
 {
 #if DEBUG_EXT_FS_WATCHER
     qDebug() << "[exfsWatcher]" << QDateTime::currentDateTime().toString("hh:mm:ss.zzz")
@@ -83,10 +99,9 @@
     return directoryContents;
 }
 
-
-DirItemInfoList DirListWorker::add(const QString &pathName,
+DirItemInfoList IORequestLoader::add(const QString &pathName,
                                       QDir::Filter filter,
-                                      const bool isRecursive,
+                                      bool isRecursive,
                                       DirItemInfoList directoryContents)
 {
     QDir tmpDir = QDir(pathName, QString(), QDir::NoSort, filter);
@@ -133,21 +148,28 @@
 void ExternalFileSystemChangesWorker::run()
 {
     DirItemInfoList directoryContents = getContents();
+    int remainingitemsCounter = compareItems(directoryContents);
+    emit finished(remainingitemsCounter);
+}
+
+
+int ExternalFileSystemChangesWorker::compareItems(const DirItemInfoList& contentNew)
+{
     int   addedCounter=0;
     int   removedCounter=0;
 #if DEBUG_EXT_FS_WATCHER
         qDebug() << "[exfsWatcher]" << QDateTime::currentDateTime().toString("hh:mm:ss.zzz")
                  << Q_FUNC_INFO
                  << "m_curContent.count():"      << m_curContent.count()
-                 << "directoryContents.count():" << directoryContents.count();
+                 << "contentNew.count():" << contentNew.count();
 #endif
-    int counter = directoryContents.count();
+    int counter = contentNew.count();
     if (counter > 0)
     {
         int tmpCounter = counter;
         while (tmpCounter--)
         {
-            const DirItemInfo& originalItem = directoryContents.at(tmpCounter);
+            const DirItemInfo& originalItem = contentNew.at(tmpCounter);
             const DirItemInfo  existItem    = m_curContent.value(originalItem.absoluteFilePath());
             if ( existItem.exists() )
             {
@@ -181,5 +203,8 @@
                  << "addedCounter:"   << addedCounter
                  << "removedCounter:" << removedCounter;
 #endif
-    emit finished(counter);
+
+   return counter;
 }
+
+

=== modified file 'src/plugin/folderlistmodel/iorequest.h'
--- src/plugin/folderlistmodel/iorequest.h	2014-02-05 15:31:44 +0000
+++ src/plugin/folderlistmodel/iorequest.h	2014-05-02 10:51:28 +0000
@@ -62,28 +62,50 @@
 
 
 
-class DirListWorker : public IORequest
+class IORequestLoader : public IORequest
 {
-    Q_OBJECT
+ Q_OBJECT
 public:
-    explicit DirListWorker(const QString &pathName, QDir::Filter filter, const bool isRecursive);
-    void run();
+    enum LoaderType
+    {
+        NormalLoader,
+        TrashLoader
+    };
+
+    IORequestLoader( const QString &pathName,
+                     QDir::Filter filter,
+                     bool isRecursive
+                   );    
+    DirItemInfoList     getContents();
+
 signals:
     void itemsAdded(const DirItemInfoList &files);
-    void workerFinished();
-
-protected:
-    DirItemInfoList     getContents();
 
 private:
+    DirItemInfoList getNormalContent();   
     DirItemInfoList add(const QString &pathName, QDir::Filter filter,
-                           const bool isRecursive, DirItemInfoList directoryContents);
-private:
+                        bool isRecursive, DirItemInfoList directoryContents);
+protected:
+    LoaderType    mLoaderType;
     QString       mPathName;
     QDir::Filter  mFilter;
-    bool          mIsRecursive;
-};
-
+    bool          mIsRecursive;   
+};
+
+
+
+
+class DirListWorker : public IORequestLoader
+{
+    Q_OBJECT
+public:
+    explicit DirListWorker(const QString &pathName, QDir::Filter filter, const bool isRecursive);    
+    void run();
+protected:
+signals:
+    void workerFinished();
+
+};
 
 
 class  ExternalFileSystemChangesWorker : public DirListWorker
@@ -95,6 +117,10 @@
                                       QDir::Filter filter,
                                       const bool isRecursive);
     void     run();
+
+protected:
+    int  compareItems(const DirItemInfoList& contentNew);
+
 signals:
     void     removed(const DirItemInfo&);
     void     changed(const DirItemInfo&);
@@ -106,4 +132,7 @@
 
 
 
+
+
+
 #endif // IOREQUEST_H