Changeset 77286 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 12, 2019 3:51:01 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128802

Message:

FE/Qt: Guest Control file manager: Yet another fix for copying directories; follow-up fix for r128495.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• globals/UICustomFileSystemModel.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (1 diff)

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

@@ -186 +186 @@
 }
 
-QString UICustomFileSystemItem::path() const
-{
-    return UIPathOperations::removeTrailingDelimiters(m_itemData.value(UICustomFileSystemModelColumn_Path, QString()).toString());
+QString UICustomFileSystemItem::path(bool fRemoveTrailingDelimiters /* = false */) const
+{
+    const QString &strPath = m_itemData.value(UICustomFileSystemModelColumn_Path, QString()).toString();
+
+    if (fRemoveTrailingDelimiters)
+        return UIPathOperations::removeTrailingDelimiters(strPath);
+
+    return strPath;
 }
 

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

@@ -76 +76 @@
     void setIsOpened(bool flag);
 
-    /** Full absolute path of the item. Without the trailing '/' */
-    QString  path() const;
+    /** Full absolute path of the item. With or without the trailing '/' */
+    QString  path(bool fRemoveTrailingDelimiters = false) const;
     void setPath(const QString &path);
 

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

@@ -1085 +1085 @@
         if (!item)
             continue;
-        pathList.push_back(item->path());
+
+        /* 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 */));
     }
     return pathList;