Changeset 71325 in vbox

Timestamp:

Mar 14, 2018 2:21:14 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Working on copy to/from guest and go to guest home directory functionalities

Location:

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

Files:

• UIGuestControlFileManager.cpp (modified) (4 diffs)
• UIGuestControlFileTable.cpp (modified) (12 diffs)
• UIGuestControlFileTable.h (modified) (6 diffs)

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

@@ -190 +190 @@
     if (m_pCloseButton)
         m_pCloseButton->setText(UIVMInformationDialog::tr("Close Session"));
-
 }
 
@@ -361 +360 @@
                 m_pToolBar->addWidget(bottomSpacerWidget);
 
-
                 containerLayout->addWidget(m_pToolBar);
             }
@@ -486 +484 @@
         return;
     QString hostDestinationPath = m_pHostFileTable->currentDirectoryPath();
-    printf("current host path %s\n", hostDestinationPath.toStdString().c_str());
     m_pGuestFileTable->copyGuestToHost(hostDestinationPath);
+    m_pHostFileTable->refresh();
 }
 
@@ -495 +493 @@
         return;
     QStringList hostSourcePathList = m_pHostFileTable->selectedItemPathList();
-    for(int i = 0; i < hostSourcePathList.size(); ++i)
-        printf("%s\n", hostSourcePathList[i].toStdString().c_str());
     m_pGuestFileTable->copyHostToGuest(hostSourcePathList);
+    m_pGuestFileTable->refresh();
 }
 

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

@@ -56 +56 @@
     static QString removeTrailingDelimiters(const QString &path);
     static QString addStartDelimiter(const QString &path);
-    static QString removeAllDelimiters(const QString &path);
-
-    //    static QString removeTrailingDelimiters(const QString &path);
+
     static QString sanitize(const QString &path);
     /** Merge prefix and suffix by making sure they have a single '/' in between */
@@ -356 +354 @@
     , m_pModel(0)
     , m_pLocationLabel(0)
-    , m_pGoHome(0)
     , m_pMainLayout(0)
     , m_pCurrentLocationEdit(0)
     , m_pToolBar(0)
     , m_pGoUp(0)
+    , m_pGoHome(0)
     , m_pRefresh(0)
     , m_pDelete(0)
@@ -511 +509 @@
         m_pCopy->setIcon(UIIconPool::iconSet(QString(":/fd_copy_22px.png")));
         m_pToolBar->addAction(m_pCopy);
-        m_pCopy->setEnabled(false);
+        //m_pCopy->setEnabled(false);
     }
 
@@ -655 +653 @@
 }
 
-void UIGuestControlFileTable::goIntoDirectory(const QVector<QString> &pathTrail)
+void UIGuestControlFileTable::goIntoDirectory(const QList<QString> &pathTrail)
 {
     UIFileTableItem *parent = getStartDirectoryItem();
@@ -766 +764 @@
         sltRefresh();
     }
-
-}
-
+}
 
 void UIGuestControlFileTable::deleteByIndex(const QModelIndex &itemIndex)
@@ -928 +924 @@
 }
 
+CGuestFsObjInfo UIGuestControlFileTable::guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const
+{
+    if (comGuestSession.isNull())
+        return CGuestFsObjInfo();
+    CGuestFsObjInfo comFsObjInfo = comGuestSession.FsObjQueryInfo(path, true /*aFollowSymlinks*/);
+    if (!comFsObjInfo.isOk())
+        return CGuestFsObjInfo();
+    return comFsObjInfo;
+}
+
 
 /*********************************************************************************************************************************
@@ -936 +942 @@
     :UIGuestControlFileTable(pParent)
 {
-    configureObjects();
     retranslateUi();
 }
@@ -1029 +1034 @@
 void UIGuestFileTable::goToHomeDirectory()
 {
-    /** @todo not implemented in guest control yet: */
+    if (m_comGuestSession.isNull())
+        return;
+    if (!m_pRootItem || m_pRootItem->childCount() <= 0)
+        return;
+    UIFileTableItem *startDirItem = m_pRootItem->child(0);
+    if (!startDirItem)
+        return;
+
+    QString userHome = UIPathOperations::sanitize(m_comGuestSession.GetUserHome());
+    QList<QString> pathTrail = userHome.split(UIPathOperations::delimiter);
+
+    goIntoDirectory(pathTrail);
 }
 
@@ -1047 +1063 @@
 }
 
-void UIGuestFileTable::configureObjects()
-{
-    if (m_pGoHome)
-        m_pGoHome->setEnabled(false);
-}
-
 bool UIGuestFileTable::createDirectory(const QString &path, const QString &directoryName)
 {
@@ -1090 +1100 @@
 
     /* Currently API expects a path including a file name for file copy*/
-    KFsObjType objectType = fsObjectType(guestSourcePath);
+    CGuestFsObjInfo fileInfo = guestFsObjectInfo(guestSourcePath, m_comGuestSession);
+    KFsObjType objectType = fileInfo.GetType();
     if (objectType == KFsObjType_File)
     {
-        // QString destinatioFilePath =  mergePaths(hostDestinationPath, const QString &Path, const QString &baseName);
-
-    }
-
-    QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
-    /** @todo listen to CProgress object to monitor copy operation: */
-    /*CProgress comProgress = */m_comGuestSession.DirectoryCopyFromGuest(guestSourcePath, hostDestinationPath, aFlags);
+        QVector<KFileCopyFlag> flags(KFileCopyFlag_FollowLinks);
+        /* API expects a full file path as destionation: */
+        QString destinatioFilePath =  UIPathOperations::mergePaths(hostDestinationPath, UIPathOperations::getObjectName(guestSourcePath));
+        /** @todo listen to CProgress object to monitor copy operation: */
+        /*CProgress comProgress =*/ m_comGuestSession.FileCopyFromGuest(guestSourcePath, destinatioFilePath, flags);
+
+    }
+    else if (objectType == KFsObjType_Directory)
+    {
+        QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
+        /** @todo listen to CProgress object to monitor copy operation: */
+        /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyFromGuest(guestSourcePath, hostDestinationPath, aFlags);
+    }
     if (!m_comGuestSession.isOk())
         return false;
@@ -1109 +1126 @@
     if (m_comGuestSession.isNull())
         return false;
-    QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
-    /** @todo listen to CProgress object to monitor copy operation: */
-    /*CProgress comProgress = */m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, guestDestinationPath, aFlags);
+    QFileInfo hostFileInfo(hostSourcePath);
+    if (!hostFileInfo.exists())
+        return false;
+
+    /* Currently API expects a path including a file name for file copy*/
+    if (hostFileInfo.isFile() || hostFileInfo.isSymLink())
+    {
+    }
+    else if(hostFileInfo.isDir())
+    {
+    }
+    // {
+    //     QVector<KFileCopyFlag> flags(KFileCopyFlag_FollowLinks);
+    //     /* API expects a full file path as destionation: */
+    //     QString destinatioFilePath =  UIPathOperations::mergePaths(guestDestinationPath,
+    //                                                                UIPathOperations::getObjectName(hostSourcePath));
+    //     /** @todo listen to CProgress object to monitor copy operation: */
+    //     /*CProgress comProgress =*/ m_comGuestSession.FileCopyToGuest(hostSourcePath, destinatioFilePath, flags);
+
+    // }
+    // else if (objectType == KFsObjType_Directory)
+    // {
+    //     QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
+    //     /** @todo listen to CProgress object to monitor copy operation: */
+    //     /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, guestDestinationPath, aFlags);
+    // }
+    // if (!m_comGuestSession.isOk())
+    //     return false;
     return true;
-}
-
-KFsObjType UIGuestFileTable::fsObjectType(const QString& path)
-{
-    if (m_comGuestSession.isNull())
-        return KFsObjType_Unknown;
-    CGuestFsObjInfo comFsObjInfo = m_comGuestSession.FsObjQueryInfo(path, false /*aFollowSymlinks*/);
-    if (!comFsObjInfo.isOk() || m_comGuestSession.isOk())
-        return KFsObjType_Unknown;
-    return comFsObjInfo.GetType();
 }
 
@@ -1212 +1244 @@
     // UIFileTableItem *rootDirectoryItem
     QDir homeDirectory(QDir::homePath());
-    QVector<QString> pathTrail;//(QDir::rootPath());
+    QList<QString> pathTrail;//(QDir::rootPath());
     do{
 

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

@@ -110 +110 @@
     /** Returns the paths of the selected items (if any) as a list */
     QStringList selectedItemPathList();
+    virtual void refresh();
 
 protected:
@@ -120 +121 @@
                            bool isDirectoryMap, bool isStartDir);
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) = 0;
-    virtual void refresh();
     virtual void deleteByItem(UIFileTableItem *item) = 0;
     virtual void goToHomeDirectory() = 0;
@@ -127 +127 @@
     void             goIntoDirectory(const QModelIndex &itemIndex);
     /** Follow the path trail, open directories as we go and descend */
-    void             goIntoDirectory(const QVector<QString> &pathTrail);
+    void             goIntoDirectory(const QList<QString> &pathTrail);
     /** Go into directory pointed by the @p item */
     void             goIntoDirectory(UIFileTableItem *item);
     UIFileTableItem* indexData(const QModelIndex &index) const;
     void keyPressEvent(QKeyEvent * pEvent);
-
+    CGuestFsObjInfo guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
 
 
@@ -143 +143 @@
     UIGuestControlFileModel *m_pModel;
     QILabel                 *m_pLocationLabel;
-    QAction                  *m_pGoHome;
 
 protected slots:
@@ -168 +167 @@
     UIToolBar       *m_pToolBar;
     QAction         *m_pGoUp;
-
+    QAction         *m_pGoHome;
     QAction         *m_pRefresh;
     QAction         *m_pDelete;
     QAction         *m_pRename;
     QAction         *m_pCreateNewDirectory;
+
 
     QAction         *m_pCopy;
@@ -205 +205 @@
 private:
 
-    KFsObjType fsObjectType(const QString& path);
     bool copyGuestToHost(const QString &guestSourcePath, const QString& hostDestinationPath);
     bool copyHostToGuest(const QString& hostSourcePath, const QString &guestDestinationPath);
 
-    void configureObjects();
-    CGuestSession m_comGuestSession;
+    mutable CGuestSession m_comGuestSession;
 
 };