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

Timestamp:

Apr 4, 2018 1:26:06 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Some corrections to file copying stuff

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl

Files:

• UIGuestControlFileManager.h (modified) (1 diff)
• UIGuestControlFileTable.cpp (modified) (1 diff)
• UIGuestControlFileTable.h (modified) (2 diffs)
• UIGuestFileTable.cpp (modified) (1 diff)
• UIGuestFileTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.h

@@ -129 +129 @@
 
 #endif /* !___UIGuestControlFileManager_h___ */
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.cpp

@@ -187 +187 @@
         return QString();
     QString newPath(path);
-    /* Make sure for we dont have any trailing slashes: */
+    /* Make sure for we dont have any trailing delimiters: */
     while (newPath.length() > 1 && newPath.at(newPath.length() - 1) == UIPathOperations::delimiter)
         newPath.chop(1);
+    return newPath;
+}
+
+/* static */ QString UIPathOperations::addTrailingDelimiters
+(const QString &path)
+{
+    if (path.isNull() || path.isEmpty())
+        return QString();
+    QString newPath(path);
+    while (newPath.length() > 1 && newPath.at(newPath.length() - 1) != UIPathOperations::delimiter)
+        newPath += UIPathOperations::delimiter;
     return newPath;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.h

@@ -133 +133 @@
     static QString removeMultipleDelimiters(const QString &path);
     static QString removeTrailingDelimiters(const QString &path);
+    static QString addTrailingDelimiters(const QString &path);
     static QString addStartDelimiter(const QString &path);
 
@@ -334 +335 @@
 
 #endif /* !___UIGuestControlFileTable_h___ */
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

@@ -347 +347 @@
     {
         QVector<KFileCopyFlag> flags(KFileCopyFlag_FollowLinks);
-        /* API expects a full file path as destionation: */
-        QString destinationFilePath =  UIPathOperations::mergePaths(guestDestinationPath, UIPathOperations::getObjectName(hostSourcePath));
+        QString destinationFilePath =  UIPathOperations::addTrailingDelimiters(guestDestinationPath);
         /** @todo listen to CProgress object to monitor copy operation: */
-        /*CProgress comProgress =*/ m_comGuestSession.FileCopyToGuest(hostSourcePath, destinationFilePath, flags);
+        /*CProgress comProgress =*/ m_comGuestSession.FileCopyToGuest(hostSourcePath, "/home/vbox/temp/", flags);
     }
     else if(hostFileInfo.isDir())
     {
-        QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_None/*CopyIntoExisting*/);
+
+        QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
         /** @todo listen to CProgress object to monitor copy operation: */
         /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, guestDestinationPath, aFlags);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.h

@@ -63 +63 @@
 
 #endif /* !___UIGuestControlFileTable_h___ */
+