Merge lp:~carlos-mazieri/ubuntu-filemanager-app/trash-operations-3 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Code to complete Trash opearations: move into / restore from / restore all / empty trash

Code to complete Trash opearations: move into / restore from / restore all / empty trash

Removing items from trash is driven to DirModel::rm() as normal remove, the operation differs from a normal remove only that for each top level item the ".trashinfo" file is also removed, but removing sub items from Trash is not allowed.

All Trash operations in Trash sub items (not in top level) are not allowed, that means, items in Trash sub folders are not allowed to be restored neither removed, these actions are supported on the top Trash root only.

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

FAILED: Continuous integration, rev:187
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/trash-operations-3/+merge/219943/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/236/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2681
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/218
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/186
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/34

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

review: Needs Fixing (continuous-integration)

[Arto Jalkanen (ajalkane)]

1)

#define IS_BROWSING_TRASH() (mCurLocation && mCurLocation->type() == LocationsFactory::TrashDisk && mCurLocation->isRoot())

Wouldn't this be clearer if it was IS_BROWSING_TRASH_ROOTDIR or something like that?

2)
297 +void FileSystemAction::createTrashInfoFileFromEnry(ActionEntry *entry)
Typo: should be createTrashInfoFileFromEntry
310 +void FileSystemAction::removeTrashInfoFileFromEnry(ActionEntry *entry)
Typo: should be removeTrashInfoFileFromEntry

3)
This is not anything that should be changed, just a note if there's a problem later when doing QML work:
Q_INVOKABLE void moveIndexesToTrash(const QList<int>&);

And functions like this, that take const reference to a list. I have an impression these were a problem in Qt 4.8 for QML, and if I remember correctly QML needed a QVariantList pointer. But lots have changed for Qt5 so perhaps this cleaner way works now. Let's only do some QML specific functions if there is a problem.

So in summary, only the cosmetic change of 2) is needed, and I'd think 1) would be a change that would make the macro's intent clearer.

review: Needs Fixing

[Carlos Jose Mazieri (carlos-mazieri)]

Thanks,

All items have been addressed in revision 189.

I was not aware about item 3), Q_INVOKABLE was removed, it'd better to create a better QML interface for that.
The last MP has functions using selections like moveSelectionToTrash(), and restoreSelectionFromTrash().

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

FAILED: Continuous integration, rev:188
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/246/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2858
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2858/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/196
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/44

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

review: Needs Fixing (continuous-integration)

[Arto Jalkanen (ajalkane)]

Thank you, looks good.

review: Approve

[Arto Jalkanen (ajalkane)]

Ready to approve once Jenkins is not failing.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/82/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2885/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-autolanding/12

review: Needs Fixing (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

Can anyone help here?

I think that needs manual fixing in the build process,it has happened once more.

[Francis Ginther (fginther)]

The trusty testing has been disabled for dependency reasons. Re-approving to try autolanding again.

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

review: Approve (continuous-integration)

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2014-05-17 12:57:46 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2014-05-28 21:14:07 +0000
@@ -38,6 +38,7 @@
 #include "location.h"
 #include "locationurl.h"
 #include "disklocation.h"
+#include "trashlocation.h"
 
 
 #ifndef DO_NOT_USE_TAG_LIB
@@ -75,7 +76,7 @@
 
 #define IS_FILE_MANAGER_IDLE()            (!mAwaitingResults)
 
-
+#define IS_BROWSING_TRASH_ROOTDIR() (mCurLocation && mCurLocation->type() == LocationsFactory::TrashDisk && mCurLocation->isRoot())
 
 namespace {
     QHash<QByteArray, int> roleMapping;
@@ -482,7 +483,18 @@
 
 void DirModel::rm(const QStringList &paths)
 {
-   m_fsAction->remove(paths);
+    //if current location is Trash only in the root is allowed to remove Items
+    if (mCurLocation->type() == LocationsFactory::TrashDisk)
+    {
+        if (IS_BROWSING_TRASH_ROOTDIR())
+        {
+            m_fsAction->removeFromTrash(paths);
+        }
+    }
+    else
+    {
+        m_fsAction->remove(paths);
+    }
 }
 
 
@@ -1509,6 +1521,102 @@
 }
 
 
+void DirModel:: moveIndexesToTrash(const QList<int>& items)
+{ 
+    if (mCurLocation->type() == LocationsFactory::LocalDisk)
+    {
+        const TrashLocation *trashLocation = static_cast<const TrashLocation*>
+                   (mLocationFactory->getLocation(LocationsFactory::TrashDisk));
+        ActionPathList  itemsAndTrashPath;
+        int index = 0;
+        for (int counter=0; counter < items.count(); ++counter)
+        {
+            index = items.at(counter);
+            if (IS_VALID_ROW(index))
+            {
+                const DirItemInfo &it = mDirectoryContents.at(index);
+                itemsAndTrashPath.append(trashLocation->getMovePairPaths(it));
+            }
+        }
+        if (itemsAndTrashPath.count() > 0)
+        {         
+            m_fsAction->moveToTrash(itemsAndTrashPath);
+        }
+    }  
+}
+
+
+void DirModel:: moveIndexToTrash(int index)
+{
+    QList<int> list;
+    list.append(index);
+    return moveIndexesToTrash(list);
+}
+
+
+void DirModel::restoreTrash()
+{  
+    if ( IS_BROWSING_TRASH_ROOTDIR() )
+    {
+        QList<int> allItems;
+        for (int counter=0; counter < rowCount(); ++counter)
+        {
+            allItems.append(counter);
+        }
+        restoreIndexesFromTrash(allItems);
+    }
+}
+
+
+void DirModel::emptyTrash()
+{  
+    if ( IS_BROWSING_TRASH_ROOTDIR() )
+    {
+        QStringList allItems;
+        for (int counter=0; counter < rowCount(); ++counter)
+        {
+            allItems.append(mDirectoryContents.at(counter).absoluteFilePath());
+        }
+        if (allItems.count() > 0)
+        {
+            m_fsAction->removeFromTrash(allItems);
+        }
+    }
+}
+
+
+void DirModel::restoreIndexFromTrash(int index)
+{
+    QList<int>  item;
+    item.append(index);
+    restoreIndexesFromTrash(item);
+}
+
+
+void DirModel::restoreIndexesFromTrash(const QList<int> &items)
+{   
+    if ( IS_BROWSING_TRASH_ROOTDIR() )
+    {
+        TrashLocation *trashLocation = static_cast<TrashLocation*> (mCurLocation);
+        ActionPathList  itemsAndOriginalPaths;
+        int index = 0;
+        for (int counter=0; counter < items.count(); ++counter)
+        {
+            index = items.at(counter);
+            if (IS_VALID_ROW(index))
+            {
+                const DirItemInfo &it = mDirectoryContents.at(index);
+                itemsAndOriginalPaths.append(trashLocation->getRestorePairPaths(it));
+            }
+        }
+        if (itemsAndOriginalPaths.count() > 0)
+        {           
+            m_fsAction->restoreFromTrash(itemsAndOriginalPaths);
+        }
+    }   
+}
+
+
 #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	2014-05-02 12:22:11 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2014-05-28 21:14:07 +0000
@@ -289,7 +289,27 @@
     Q_INVOKABLE  bool  existsFile(const QString& fileName)   const;
     Q_INVOKABLE  bool  canReadFile(const QString& fileName)  const;
 
-public slots:
+    // Trash functions
+    Q_INVOKABLE  void  moveIndexToTrash(int index);
+                 void  moveIndexesToTrash(const QList<int>&);
+    Q_INVOKABLE  void  restoreIndexFromTrash(int index);
+                 void  restoreIndexesFromTrash(const QList<int>&);
+
+public slots:    
+    /*!
+     * \brief restoreTrash() restore all items being actually browsed in the Trash
+     *
+     */
+    void   restoreTrash();
+
+    /*!
+     * \brief emptyTrash() remove definitely all items being actually browsed in the Trash
+     *
+     *  \sa \ref removeSelection() and \ref rm()
+     *
+     */
+    void  emptyTrash();
+
     /*!
      * \brief goHome() goes to user home dir
      *  Go to user home dir, we may have a tab for places or something like that

=== modified file 'src/plugin/folderlistmodel/filesystemaction.cpp'
--- src/plugin/folderlistmodel/filesystemaction.cpp	2014-05-24 01:40:01 +0000
+++ src/plugin/folderlistmodel/filesystemaction.cpp	2014-05-28 21:14:07 +0000
@@ -36,6 +36,7 @@
 
 #include "filesystemaction.h"
 #include "clipboard.h"
+#include "qtrashutilinfo.h"
 
 #if defined(Q_OS_UNIX)
 #include <sys/statvfs.h>
@@ -264,8 +265,17 @@
                   );
         return false;
     }
-    //action->type is top level for all items, entry->type drives item behaviour  
-    entry->type = action->type; //normal behaviour
+    //action->type is top level for all items, entry->type drives item behaviour
+    switch(action->type)
+    {
+       case ActionMoveToTrash:
+       case ActionRestoreFromTrash:   entry->type = ActionMove;  //needs create .trashinfo file
+            break;
+       case ActionRemoveFromTrash:    entry->type = ActionRemove; //needs remove .trashinfo file
+            break;
+       default:                       entry->type = action->type; //normal behaviour
+            break;
+    }
     //this is the item being handled
     entry->reversedOrder.append(info);
     // verify if the destination item already exists and it the destination path is in other file system
@@ -447,9 +457,31 @@
         const DirItemInfo & mainItem = curEntry->reversedOrder.at(curEntry->currItem -1);
         m_curAction->currEntryIndex++;
 
+        //check Trash  operations
+        if ( (m_curAction->type == ActionMoveToTrash || m_curAction->type == ActionRestoreFromTrash)
+             && (curEntry->type == ActionMove || curEntry->type == ActionHardMoveRemove)
+           )
+        {                   
+            if ( m_curAction->type == ActionMoveToTrash )
+            {
+                createTrashInfoFileFromEntry(curEntry);
+            }
+            else
+            {
+                removeTrashInfoFileFromEntry(curEntry);
+            }
+            emit removed(mainItem);
+        }
+        else
+        {
            switch(curEntry->type)
            {
-            case ActionRemove:                
+            case ActionRemove:
+                if (m_curAction->type == ActionRemoveFromTrash)
+                {
+                     //it is necessary to remove also (file).trashinfo file
+                     removeTrashInfoFileFromEntry(curEntry);
+                }
                 emit removed(mainItem);
                 break;
             case ActionHardMoveRemove: // nothing to do
@@ -478,6 +510,7 @@
              default:
                 break;
            }//switch
+        }
     }//end if (curEntry->currItem == curEntry->reversedOrder.count())
 
     if (curEntry->currStep == STEP_FILES)
@@ -1403,3 +1436,70 @@
 {
     m_clipboardChanged = true;
 }
+
+
+//==================================================================
+/*!
+ * \brief FileSystemAction::moveToTrash() Move a set of files to Trash
+ * \param items files/dirs that belong to the same parent directory
+ */
+void FileSystemAction::moveToTrash(const ActionPathList &pairPaths)
+{
+    Action *moveAction = createAction(ActionMoveToTrash);
+    for (int counter=0; counter < pairPaths.count(); ++counter)
+    {
+        addEntry(moveAction, pairPaths.at(counter));
+    }
+    queueAction(moveAction);
+}
+
+//==================================================================
+/*!
+ * \brief FileSystemAction::restoreFromTrash() restore a set of Files to
+ *               their original path
+ * \param pairPaths
+ */
+void FileSystemAction::restoreFromTrash(const ActionPathList &pairPaths)
+{
+    Action *moveAction = createAction(ActionRestoreFromTrash);
+    for (int counter=0; counter < pairPaths.count(); ++counter)
+    {
+        addEntry(moveAction, pairPaths.at(counter));
+    }
+    queueAction(moveAction);
+}
+
+/*!
+ * \brief FileSystemAction::removeFromTrash
+ * \param paths
+ */
+void FileSystemAction::removeFromTrash(const QStringList &paths)
+{
+    createAndProcessAction(ActionRemoveFromTrash, paths);
+}
+
+
+void FileSystemAction::createTrashInfoFileFromEntry(ActionEntry *entry)
+{
+    QTrashUtilInfo trashUtil;
+    trashUtil.setInfoFromTrashItem(entry->itemPaths.target());
+    if (!trashUtil.createTrashInfoFile(entry->itemPaths.source()))
+    {
+        m_cancelCurrentAction = true;
+        m_errorTitle = QObject::tr("Could not create trash info file");
+        m_errorMsg   = trashUtil.absInfo;
+    }
+}
+
+
+void FileSystemAction::removeTrashInfoFileFromEntry(ActionEntry *entry)
+{
+    QTrashUtilInfo trashUtil;
+    trashUtil.setInfoFromTrashItem(entry->itemPaths.source());
+    if (!trashUtil.removeTrashInfoFile())
+    {
+         m_cancelCurrentAction = true;
+         m_errorTitle = QObject::tr("Could not remove the trash info file");
+         m_errorMsg   = trashUtil.absInfo;
+    }
+}

=== modified file 'src/plugin/folderlistmodel/filesystemaction.h'
--- src/plugin/folderlistmodel/filesystemaction.h	2014-05-24 01:40:01 +0000
+++ src/plugin/folderlistmodel/filesystemaction.h	2014-05-28 21:14:07 +0000
@@ -108,6 +108,9 @@
     void     pathChanged(const QString& path);   
     void     copyIntoCurrentPath(const QStringList& items);
     void     moveIntoCurrentPath(const QStringList& items);
+    void     moveToTrash(const ActionPathList& pairPaths );
+    void     restoreFromTrash(const ActionPathList& pairPaths);
+    void     removeFromTrash(const QStringList& paths);
     void     onClipboardChanged();
 
 
@@ -134,7 +137,10 @@
        ActionCopy,
        ActionMove,
        ActionHardMoveCopy,
-       ActionHardMoveRemove
+       ActionHardMoveRemove,
+       ActionMoveToTrash,
+       ActionRestoreFromTrash,
+       ActionRemoveFromTrash
    };
 
    void     createAndProcessAction(ActionType actionType, const QStringList& paths);
@@ -227,7 +233,9 @@
    bool     makeBackupNameForCurrentItem(ActionEntry *entry);
    bool     endCopySingleFile();
    bool     isThereDiskSpace(const ActionEntry *entry, qint64 requiredSize);
-   void     queueAction(Action *myAction);  
+   void     queueAction(Action *myAction);
+   void     createTrashInfoFileFromEntry(ActionEntry *entry);
+   void     removeTrashInfoFileFromEntry(ActionEntry *entry);
 
 #if defined(REGRESSION_TEST_FOLDERLISTMODEL) //used in Unit/Regression tests
    bool     m_forceUsingOtherFS;

=== modified file 'src/plugin/folderlistmodel/trash/trashlocation.cpp'
--- src/plugin/folderlistmodel/trash/trashlocation.cpp	2014-05-17 11:47:11 +0000
+++ src/plugin/folderlistmodel/trash/trashlocation.cpp	2014-05-28 21:14:07 +0000
@@ -258,3 +258,31 @@
 {
    // do nothing, the startExternalFsWatcher() is called in fetchItems()
 }
+
+
+ActionPaths
+TrashLocation::getRestorePairPaths(const DirItemInfo& item)  const
+{
+    const TrashItemInfo* ptrash = static_cast<const TrashItemInfo*> (&item);
+    QTrashUtilInfo trashInfo;
+
+    trashInfo.setInfo(ptrash->getRootTrashDir(), ptrash->absoluteFilePath());
+
+    ActionPaths ret(ptrash->absoluteFilePath());
+    ret.setTargetFullName(trashInfo.getOriginalPathName());
+
+    return ret;
+}
+
+
+ActionPaths
+TrashLocation::getMovePairPaths(const DirItemInfo &item) const
+{
+    ActionPaths ret(item.absoluteFilePath());
+
+    QTrashUtilInfo trashInfo;
+    trashInfo.setInfo(suitableTrash(item.absoluteFilePath()), item.absoluteFilePath());
+
+    ret.setTargetFullName( trashInfo.absFile );
+    return ret;
+}

=== modified file 'src/plugin/folderlistmodel/trash/trashlocation.h'
--- src/plugin/folderlistmodel/trash/trashlocation.h	2014-05-15 00:18:54 +0000
+++ src/plugin/folderlistmodel/trash/trashlocation.h	2014-05-28 21:14:07 +0000
@@ -45,10 +45,32 @@
 
     virtual DirItemInfo *validateUrlPath(const QString& urlPath);
 
+    /*!
+     * \brief getMovePairPaths() Get: original path and destination trash path
+     *
+     *
+     * \param item desired item to be moved into Trash
+     *
+     * \return an \ref ActionPaths that contains the source orginal file and
+     *                 the suitable Trash path where the source will moved into
+     */
+    ActionPaths         getMovePairPaths(const DirItemInfo& item) const;
+
+    /*!
+     * \brief getRestorePairPaths() Get: Trash path as source and item original path as destination
+     *
+     * \param item desired to be restored from Trash
+     *
+     * \return n \ref ActionPaths that contains the thash item and
+     *                 the original source path as destionation
+     */
+    ActionPaths         getRestorePairPaths(const DirItemInfo& item) const;
+
 private:
     void               addTrashFetchRequest(TrashListWorker *workerObject);
 
 private:
+    ActionPathList     m_actionPathList;
     QStringList        m_currentPaths;  //!< also used in the startExternalFsWatcher(), it can br activated any time
 };