Changeset 102393 in vbox

Timestamp:

Nov 30, 2023 12:58:05 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10561. More fixes for copying and deleting file objects.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• globals/UICustomFileSystemModel.h (modified) (1 diff)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (5 diffs)
• guestctrl/UIFileManagerGuestTable.h (modified) (1 diff)
• guestctrl/UIFileManagerHostTable.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerHostTable.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (1 diff)
• guestctrl/UIFileManagerTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp

@@ -208 +208 @@
 }
 
-QString UICustomFileSystemItem::path(bool fRemoveTrailingDelimiters /* = false */) const
+QString UICustomFileSystemItem::path() const
 {
     const QChar delimiter('/');
-    Q_UNUSED(fRemoveTrailingDelimiters);
+
     const UICustomFileSystemItem *pParent = this;
     QStringList path;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.h

@@ -92 +92 @@
     void setIsOpened(bool flag);
 
-    /** Full absolute path of the item. With or without the trailing '/' */
-    QString  path(bool fRemoveTrailingDelimiters = false) const;
+    QString  path() const;
 
     /** Returns true if this is directory and file object name is ".." */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -610 +610 @@
     {
         QVector<KDirectoryRemoveRecFlag> aFlags(1, KDirectoryRemoveRecFlag_ContentAndDir);
-        m_comGuestSession.DirectoryRemoveRecursive(item->path(), aFlags);
+        m_comGuestSession.DirectoryRemoveRecursive(UIPathOperations::removeTrailingDelimiters(item->path()), aFlags);
     }
     else
-        m_comGuestSession.FsObjRemove(item->path());
+        m_comGuestSession.FsObjRemove(UIPathOperations::removeTrailingDelimiters(item->path()));
     if (!m_comGuestSession.isOk())
     {
         emit sigLogOutput(QString(item->path()).append(" could not be deleted"), m_strTableName, FileManagerLogType_Error);
         emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), m_strTableName, FileManagerLogType_Error);
-    }
-}
-
-void UIFileManagerGuestTable::deleteByPath(const QStringList &pathList)
-{
-    foreach (const QString &strPath, pathList)
-    {
-        CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(strPath, true);
-        KFsObjType eType = fileType(fileInfo);
-        if (eType == KFsObjType_File || eType == KFsObjType_Symlink)
-        {
-              m_comGuestSession.FsObjRemove(strPath);
-        }
-        else if (eType == KFsObjType_Directory)
-        {
-            QVector<KDirectoryRemoveRecFlag> aFlags(1, KDirectoryRemoveRecFlag_ContentAndDir);
-            m_comGuestSession.DirectoryRemoveRecursive(strPath, aFlags);
-        }
     }
 }
@@ -706 +688 @@
     QVector<QString> aFilters;
     QVector<QString> aFlags;
-    QString strDestinationPath = strDestination;
+    QString strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestination);
 
     /* Remove empty source paths. Typically happens when up directory is selected: */
@@ -726 +708 @@
     QString strDirectoryFlags("CopyIntoExisting,Recursive,FollowLinks");
     QString strFileFlags("FollowLinks");
-    foreach (const QString &strSource, sourcePaths)
-    {
-        KFsObjType enmFileType = UIFileManagerHostTable::fileType(strSource);
+
+    for (int i = 0; i < sourcePaths.size(); ++i)
+    {
+        sourcePaths[i] = UIPathOperations::removeTrailingDelimiters(sourcePaths[i]);
+        KFsObjType enmFileType = UIFileManagerHostTable::fileType(sourcePaths[i]);
         if (enmFileType == KFsObjType_Unknown)
-            emit sigLogOutput(QString("Querying information for host item %1 failed.").arg(strSource), m_strTableName, FileManagerLogType_Error);
+            emit sigLogOutput(QString("Querying information for host item %1 failed.").arg(sourcePaths[i]), m_strTableName, FileManagerLogType_Error);
         /* If the source is an directory, make sure to add the appropriate flag to make copying work
          * into existing directories on the guest. This otherwise would fail (default): */
         else if (enmFileType == KFsObjType_Directory)
-        {
-            /* Make sure that if the source is a directory, that we append a trailing delimiter to it,
-             * so that it gets copied *into* the destination directory as a whole, and not just it's contents. */
-            strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestinationPath);
             aFlags << strDirectoryFlags;
-        }
         else
-        {
-            /* Ditto goes for source files, as the destination always is a directory path. */
-            strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestinationPath);
             aFlags << strFileFlags;
-        }
     }
 
@@ -796 +771 @@
     }
 
-    QString strDestinationPath = hostDestinationPath;
+    QString strDestinationPath = UIPathOperations::addTrailingDelimiters(hostDestinationPath);
     QString strDirectoryFlags("CopyIntoExisting,Recursive,FollowLinks");
     QString strFileFlags;
-    foreach (const QString &strSource, sourcePaths)
-    {
+    //foreach (const QString &strSource, sourcePaths)
+    for (int i = 0; i < sourcePaths.size(); ++i)
+    {
+        sourcePaths[i] = UIPathOperations::removeTrailingDelimiters(sourcePaths[i]);
         /** @todo Cache this info and use the item directly, which has this info already? */
 
         /* If the source is an directory, make sure to add the appropriate flag to make copying work
          * into existing directories on the guest. This otherwise would fail (default). */
-        CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(strSource, true);
+        CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(sourcePaths[i], true);
         if (!m_comGuestSession.isOk())
         {
@@ -813 +790 @@
 
         if (fileType(fileInfo) == KFsObjType_Directory)
-        {
-            /* Make sure that if the source is a directory, that we append a trailing delimiter to the destination,
-             * so that the source directory gets copied *into* the destination directory as a whole, and not
-             * just it's contents. */
-            strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestinationPath);
             aFlags << strDirectoryFlags;
-        }
         else
-        {
-            /* Ditto goes for source files, as the destination always is a directory path. */
-            strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestinationPath);
             aFlags << strFileFlags;
-        }
+
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h

@@ -83 +83 @@
     virtual void    readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) override final;
     virtual void    deleteByItem(UICustomFileSystemItem *item) override final;
-    virtual void    deleteByPath(const QStringList &pathList) override final;
     virtual void    goToHomeDirectory() override final;
     virtual bool    renameItem(UICustomFileSystemItem *item, const QString &strOldPath) override final;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp

@@ -284 +284 @@
     {
         QDir itemToDelete;
-        itemToDelete.remove(item->path());
+        itemToDelete.remove(UIPathOperations::removeTrailingDelimiters(item->path()));
     }
     QDir itemToDelete(item->path());
@@ -297 +297 @@
     if (!deleteSuccess)
         emit sigLogOutput(QString(item->path()).append(" could not be deleted"), m_strTableName, FileManagerLogType_Error);
-}
-
-void UIFileManagerHostTable::deleteByPath(const QStringList &pathList)
-{
-    foreach (const QString &strPath, pathList)
-    {
-        bool deleteSuccess = true;
-        KFsObjType eType = fileType(QFileInfo(strPath));
-        if (eType == KFsObjType_File || eType == KFsObjType_Symlink)
-        {
-            deleteSuccess = QDir().remove(strPath);
-        }
-        else if (eType == KFsObjType_Directory)
-        {
-            QDir itemToDelete(strPath);
-            itemToDelete.setFilter(QDir::NoDotAndDotDot);
-            deleteSuccess = itemToDelete.removeRecursively();
-        }
-        if (!deleteSuccess)
-            emit sigLogOutput(QString(strPath).append(" could not be deleted"), m_strTableName, FileManagerLogType_Error);
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h

@@ -63 +63 @@
     virtual void    readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) override final;
     virtual void    deleteByItem(UICustomFileSystemItem *item) override final;
-    virtual void    deleteByPath(const QStringList &pathList) override final;
     virtual void    goToHomeDirectory() override final;
     virtual bool    renameItem(UICustomFileSystemItem *item, const QString &strOldPath) override final;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -1120 +1120 @@
         if (!item)
             continue;
-
-        /* Make sure to remove any trailing delimiters for directory paths here (e.g. "C:\foo\bar\" -> "C:\foo\bar"),
-         * as we want to copy entire directories, not only its contents (see Guest Control SDK docs). */
-        pathList.push_back(item->path(true /* fRemoveTrailingDelimiters */));
+        pathList.push_back(item->path());
     }
     return pathList;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -213 +213 @@
     virtual void     readDirectory(const QString& strPath, UICustomFileSystemItem *parent, bool isStartDir = false) = 0;
     virtual void     deleteByItem(UICustomFileSystemItem *item) = 0;
-    virtual void     deleteByPath(const QStringList &pathList) = 0;
     virtual void     goToHomeDirectory() = 0;
     virtual bool     renameItem(UICustomFileSystemItem *item, const QString &strOldPath) = 0;