Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-actions-15 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Qt QDir object is no longer used in Actions nor in DirModel class, instead inherited LocationItemDir classes are used

Qt QDir object is no longer used in Actions nor in DirModel class, instead inherited LocationItemDir classes are used

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

PASSED: Continuous integration, rev:446
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/520/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3105
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/236
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/142

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

One diff comment

review: Approve

[Carlos Jose Mazieri (carlos-mazieri)]

I was using QScopedPointer where it was really necessary, some new/delete were kept due to performance. I will change both dirmodel.cpp and filesystemaction.cpp to use only QScopedPointer instead of new/delete.

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/228/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3182
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-autolanding/130
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-autolanding/71

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:447
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/536/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3183
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/252
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/158

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

review: Approve

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2015-07-25 19:25:40 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2015-08-16 15:16:28 +0000
@@ -40,6 +40,7 @@
 #include "disklocation.h"
 #include "trashlocation.h"
 #include "netauthenticationdata.h"
+#include "locationitemdir.h"
 
 
 #ifndef DO_NOT_USE_TAG_LIB
@@ -64,6 +65,7 @@
 #include <QMimeType>
 #include <QStandardPaths>
 #include <QList>
+#include <QScopedPointer>
 
 #if defined(REGRESSION_TEST_FOLDERLISTMODEL)
 # include <QColor>
@@ -642,22 +644,24 @@
     return retval;
 }
 
-void DirModel::mkdir(const QString &newDir)
+
+bool DirModel::mkdir(const QString &newDir)
 {
-    if (!allowAccess(mCurrentDir)) {
-        qDebug() << Q_FUNC_INFO << "Access denied in current path" << mCurrentDir;
-        return;
-    }
-
-    QDir dir(mCurrentDir);
-    bool retval = dir.mkdir(newDir);
+    QScopedPointer<LocationItemDir> dir(mCurLocation->newDir(mCurrentDir));
+    bool retval = dir->mkdir(newDir);
     if (!retval) {
         const char *errorStr = strerror(errno);
         qDebug() << Q_FUNC_INFO << this << "Error creating new directory: " << errno << " (" << errorStr << ")";
         emit error(QObject::tr("Error creating new folder"), errorStr);
     } else {
-        onItemAdded(dir.filePath(newDir));
-    }
+        QScopedPointer<DirItemInfo> subItem(mCurLocation->newItemInfo(newDir));
+        if (subItem->isRelative())
+        {
+            subItem->setFile(mCurrentDir, newDir);
+        }
+        onItemAdded(*subItem);      
+    }   
+    return retval;
 }
 
 bool DirModel::showDirectories() const
@@ -728,19 +732,18 @@
 
 QString DirModel::parentPath() const
 {
-    QDir dir(mCurrentDir);
-    if (dir.isRoot()) {
+    const DirItemInfo *dir = mCurLocation->info();
+    if (dir->isRoot()) {
         qDebug() << Q_FUNC_INFO << this << "already at root";
         return mCurrentDir;
     }
 
-    bool success = dir.cdUp();
-    if (!success) {
+    if (!canReadDir(dir->absolutePath())) {
         qWarning() << Q_FUNC_INFO << this << "Failed to to go to parent of " << mCurrentDir;
         return mCurrentDir;
     }
-    qDebug() << Q_FUNC_INFO << this << "returning" << dir.absolutePath();
-    return dir.absolutePath();
+    qDebug() << Q_FUNC_INFO << this << "returning" << dir->absolutePath();
+    return dir->absolutePath();
 }
 
 QString DirModel::homePath() const
@@ -1259,6 +1262,14 @@
     return dirFilter;
 }
 
+/*!
+ * \brief DirModel::dirItems() Gets a Dir number of Items, used only for Local Disk
+ *
+ *    For remote Locations this function is not used
+ *
+ * \param fi
+ * \return A string saying how many items a directory has
+ */
 QString DirModel::dirItems(const DirItemInfo& fi) const
 {
     int counter = 0;
 
=== modified file 'src/plugin/folderlistmodel/dirmodel.h'
--- src/plugin/folderlistmodel/dirmodel.h	2015-07-13 17:29:25 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2015-08-16 15:16:28 +0000
@@ -132,7 +132,7 @@
     Q_INVOKABLE bool rename(const QString& oldName, const QString& newName);
     Q_INVOKABLE bool rename(int row, const QString &newName);
 
-    Q_INVOKABLE void mkdir(const QString &newdir);
+    Q_INVOKABLE bool mkdir(const QString &newdir);
 
     Q_PROPERTY(bool filterDirectories READ filterDirectories WRITE setFilterDirectories NOTIFY filterDirectoriesChanged)
     bool filterDirectories() const;
@@ -436,14 +436,15 @@
     void     needsAuthentication(const QString& user, const QString& urlPath);
     
     /*!
-     * \brief insertedItem()
+     * \brief insertedRow()
      *
      *  It happens when a new file is inserted in an existent view,
      *  for example from  \ref mkdir() or \ref paste()
      *
      *  It can be used to make the new row visible to the user doing a scroll to
-     */
+     */    
     void  insertedRow(int row);
+
     /*!
      * \brief progress()
      *  Sends status about recursive and multi-items remove/move/copy
 
=== modified file 'src/plugin/folderlistmodel/filesystemaction.cpp'
--- src/plugin/folderlistmodel/filesystemaction.cpp	2015-08-16 15:16:28 +0000
+++ src/plugin/folderlistmodel/filesystemaction.cpp	2015-08-16 15:16:28 +0000
@@ -41,6 +41,7 @@
 #include "locationsfactory.h"
 #include "locationitemdiriterator.h"
 #include "locationitemfile.h"
+#include "locationitemdir.h"
 
 #if defined(Q_OS_UNIX)
 #include <sys/statvfs.h>
@@ -371,16 +372,15 @@
     //ActionMove will perform a rename, so no Directory expanding is necessary
     if (entry->type != ActionMove && info->isDir() && !info->isSymLink())
     {
-        LocationItemDirIterator *it =
-        action->sourceLocation->newDirIterator(info->absoluteFilePath(),
-                        QDir::AllEntries | QDir::System |
-                              QDir::NoDotAndDotDot | QDir::Hidden,
-                        QDirIterator::Subdirectories);
+       QScopedPointer<LocationItemDirIterator>
+         it (action->sourceLocation->newDirIterator(info->absoluteFilePath(),
+             QDir::AllEntries     | QDir::System |
+             QDir::NoDotAndDotDot | QDir::Hidden,
+             QDirIterator::Subdirectories));
         while (it->hasNext() &&  !it->next().isEmpty())
         {
             entry->reversedOrder.prepend(it->fileInfo());
-        }
-        delete it;
+        }      
     }
 #if DEBUG_MESSAGES
     for (int counter = 0; counter < entry->reversedOrder.count(); counter++)
@@ -651,8 +651,7 @@
  * \param entry
  */
 void FileSystemAction::removeEntry(ActionEntry *entry)
-{
-    QDir dir;
+{   
     //do one step at least
     for(; !m_cancelCurrentAction                          &&
           entry->currStep       < STEP_FILES              &&
@@ -665,13 +664,13 @@
         const DirItemInfo &fi = entry->reversedOrder.at(entry->currItem);
         if (fi.isDir() && !fi.isSymLink())
         {
-            m_cancelCurrentAction = !dir.rmdir(fi.absoluteFilePath());
+            QScopedPointer<LocationItemDir> dir(m_curAction->sourceLocation->newDir());
+            m_cancelCurrentAction = !dir->rmdir(fi.absoluteFilePath());           
         }
         else
         {
-            LocationItemFile *qFile = m_curAction->sourceLocation->newFile(fi.absoluteFilePath());
-            m_cancelCurrentAction = !qFile->remove();
-            delete qFile;
+            QScopedPointer<LocationItemFile> qFile(m_curAction->sourceLocation->newFile(fi.absoluteFilePath()));
+            m_cancelCurrentAction = !qFile->remove();           
         }
 #if DEBUG_REMOVE
         qDebug() << Q_FUNC_INFO << "remove ret=" << !m_cancelCurrentAction << fi.absoluteFilePath();
@@ -765,16 +764,16 @@
            )
         {
             QString entryDir = targetFrom(entry->reversedOrder.last().absoluteFilePath(), entry);
-            QDir entryDirObj(entryDir);
-            if (!entryDirObj.exists() && entryDirObj.mkpath(entryDir))
+            QScopedPointer<LocationItemDir> entryDirObj(m_curAction->targetLocation->newDir(entryDir));
+            if (!entryDirObj->exists() && entryDirObj->mkpath(entryDir))
             {
                 QScopedPointer <DirItemInfo> item(m_curAction->targetLocation->newItemInfo(entryDir));
                 entry->added = true;
                 notifyActionOnItem(*item, ItemAdded);
-            }
-        }
-        QDir d(path);
-        if (!d.exists() && !d.mkpath(path))
+            }           
+        }      
+        QScopedPointer<LocationItemDir> d(m_curAction->targetLocation->newDir(path));
+        if (!d->exists() && !d->mkpath(path))
         {
             m_cancelCurrentAction = true;
             m_errorTitle = QObject::tr("Could not create the directory");
@@ -794,10 +793,8 @@
         else
         if (fi.isDir())
         {
-            LocationItemFile *qFile = m_curAction->targetLocation->newFile(target);
-            m_cancelCurrentAction = !
-                 qFile->setPermissions(fi.permissions());
-            delete qFile;
+            QScopedPointer<LocationItemFile> qFile(m_curAction->targetLocation->newFile(target));
+            m_cancelCurrentAction = !qFile->setPermissions(fi.permissions());
             if (m_cancelCurrentAction)
             {
                 m_errorTitle = QObject::tr("Could not set permissions to dir");
@@ -1393,9 +1390,8 @@
 #if defined(DEBUG_MESSAGES) || defined(REGRESSION_TEST_FOLDERLISTMODEL)
     qDebug() << Q_FUNC_INFO << dir <<  "being moved to" << tempDir;
 #endif
-    LocationItemFile *qFile = m_curAction->targetLocation->newFile(dir);
-    bool removed = qFile->rename(tempDir);
-    delete qFile;
+    QScopedPointer<LocationItemFile> qFile(m_curAction->targetLocation->newFile(dir));
+    bool removed = qFile->rename(tempDir);   
     if (removed)
     {
         if (m_curAction->auxAction == 0)