Changeset 75732 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 26, 2018 12:38:19 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Handle copy failures correctly

Location:

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

Files:

• UIGuestControlFileManager.cpp (modified) (1 diff)
• UIGuestControlFileManagerOperationsPanel.cpp (modified) (6 diffs)
• UIGuestControlFileManagerOperationsPanel.h (modified) (1 diff)
• UIGuestFileTable.cpp (modified) (5 diffs)
• UIGuestFileTable.h (modified) (1 diff)

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

@@ -292 +292 @@
         connect(m_pOperationsPanel, &UIGuestControlFileManagerOperationsPanel::sigFileOperationComplete,
                 this, &UIGuestControlFileManager::sltFileOperationComplete);
+        connect(m_pOperationsPanel, &UIGuestControlFileManagerOperationsPanel::sigFileOperationFail,
+                this, &UIGuestControlFileManager::sltReceieveLogOutput);
         m_panelActionMap.insert(m_pOperationsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
     }

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

@@ -30 +30 @@
 /* GUI includes: */
 # include "QIToolButton.h"
+# include "UIErrorString.h"
 # include "UIIconPool.h"
 # include "UIGuestControlFileManager.h"
@@ -60 +61 @@
 signals:
 
-    void sigProgressTaskComplete(QUuid progressId);
+    void sigProgressComplete(QUuid progressId);
+    void sigProgressFail(QString strErrorString, FileManagerLogType eLogType);
 
 protected:
@@ -69 +71 @@
 
     void sltHandleProgressPercentageChange(const QUuid &uProgressId, const int iPercent);
-    void sltHandleProgressTaskComplete(const QUuid &uProgressId);
+    void sltHandleProgressComplete(const QUuid &uProgressId);
     void sltCancelProgress();
 
@@ -176 +178 @@
             this, &UIFileOperationProgressWidget::sltHandleProgressPercentageChange);
     connect(m_pEventHandler, &UIProgressEventHandler::sigProgressTaskComplete,
-            this, &UIFileOperationProgressWidget::sltHandleProgressTaskComplete);
+            this, &UIFileOperationProgressWidget::sltHandleProgressComplete);
 }
 
@@ -192 +194 @@
 }
 
-void UIFileOperationProgressWidget::sltHandleProgressTaskComplete(const QUuid &uProgressId)
+void UIFileOperationProgressWidget::sltHandleProgressComplete(const QUuid &uProgressId)
 {
     Q_UNUSED(uProgressId);
     if (m_pCancelButton)
         m_pCancelButton->setEnabled(false);
-    emit sigProgressTaskComplete(m_comProgress.GetId());
+
+    if (!m_comProgress.isOk() || m_comProgress.GetResultCode() != 0)
+        emit sigProgressFail(UIErrorString::formatErrorInfo(m_comProgress), FileManagerLogType_Error);
+    else
+        emit sigProgressComplete(m_comProgress.GetId());
 }
 
@@ -229 +235 @@
     UIFileOperationProgressWidget *pOperationsWidget = new UIFileOperationProgressWidget(comProgress);
     m_pTableWidget->setCellWidget(m_pTableWidget->rowCount() - 1, 0, pOperationsWidget);
-    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressTaskComplete,
+    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressComplete,
             this, &UIGuestControlFileManagerOperationsPanel::sigFileOperationComplete);
+    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressFail,
+            this, &UIGuestControlFileManagerOperationsPanel::sigFileOperationFail);
 
     m_pTableWidget->resizeColumnsToContents();

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

@@ -42 +42 @@
 
     void sigFileOperationComplete(QUuid progressId);
+    void sigFileOperationFail(QString strErrorString, FileManagerLogType eLogType);
 
 public:

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

@@ -332 +332 @@
 void UIGuestFileTable::copyHostToGuest(const QStringList &hostSourcePathList, bool fDeleteAfterSuccessfulCopy /* = false */)
 {
+    if (!checkGuestSession())
+        return;
     QVector<QString> sourcePaths = hostSourcePathList.toVector();
     QVector<QString>  aFilters;
@@ -348 +350 @@
 
     CProgress progress = m_comGuestSession.CopyToGuest(sourcePaths, aFilters, aFlags, strDestinationPath);
-    if (!m_comGuestSession.isOk())
-    {
-        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error);
-        return;
-    }
+    if (!checkGuestSession())
+        return;
     emit sigNewFileOperation(progress);
     /* Cache the progress id and host source file objects' path in case of move operation. we will delete
@@ -362 +361 @@
 void UIGuestFileTable::copyGuestToHost(const QString& hostDestinationPath, bool fDeleteAfterSuccessfulCopy /* = false */)
 {
+    if (!checkGuestSession())
+        return;
     QVector<QString> sourcePaths = selectedItemPathList().toVector();
     QVector<QString>  aFilters;
@@ -378 +379 @@
 
     CProgress progress = m_comGuestSession.CopyFromGuest(sourcePaths, aFilters, aFlags, hostDestinationPath);
-    if (!m_comGuestSession.isOk())
-    {
-        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error);
-        return;
-    }
+    if (!checkGuestSession())
+        return;
     emit sigNewFileOperation(progress);
     /* Cache the progress id and source file objects' path in case of move operation. we will delete
@@ -651 +649 @@
 }
 
+bool UIGuestFileTable::checkGuestSession()
+{
+    if (!m_comGuestSession.isOk())
+    {
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error);
+        return false;
+    }
+    return true;
+}
 #include "UIGuestFileTable.moc"

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

@@ -71 +71 @@
 
     void prepareActionConnections();
+    bool checkGuestSession();
 
     mutable CGuestSession     m_comGuestSession;