Changeset 97485 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

Timestamp:

Nov 9, 2022 6:01:39 PM (3 years ago)

Author:

vboxsync

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

154499

Message:

Guest Control/Main: More eye candy for (single file) progress descriptions. bugref:10286

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1460 +1460 @@
      */
 
-    if (mDest.isEmpty())
+    if (mSources.empty())
+    {
+        strErrorInfo.printf(tr("No guest sources specified"));
+        vrc = VERR_INVALID_PARAMETER;
+    }
+    else if (mDest.isEmpty())
     {
         strErrorInfo.printf(tr("Host destination must not be empty"));
@@ -1578 +1583 @@
     }
 
-    if (cOperations) /* Use the first element as description (if available). */
-    {
-        Assert(mVecLists.size());
-        Assert(mVecLists[0]->mVecEntries.size());
-
-        Utf8Str const &strFirstOp = mVecLists[0]->mVecEntries[0]->strPath;
+    if (RT_SUCCESS(vrc))
+    {
+        /* When there are no entries in the first source list, this means the source only contains a single file
+         * (see \a mSrcRootAbs of FsList). So use \a mSrcRootAbs directly. */
+        Utf8Str const &strFirstOp = mVecLists[0]->mVecEntries.size() > 0
+                                  ? mVecLists[0]->mVecEntries[0]->strPath : mVecLists[0]->mSrcRootAbs;
 
         /* Now that we know how many objects we're handling, tweak the progress description so that it
@@ -1598 +1603 @@
                               TRUE /* aCancelable */, cOperations + 1 /* Number of operations */, Bstr(strFirstOp).raw());
     }
-    else /* If no operations have been defined, go with an "empty" progress object when will be used for error handling. */
+    else /* On error we go with an "empty" progress object when will be used for error handling. */
         hrc = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
                               TRUE /* aCancelable */, 1 /* cOperations */, Bstr(mDesc).raw());
 
+    if (FAILED(hrc)) /* Progress object creation failed -- we're doomed. */
+        return hrc;
+
     if (RT_FAILURE(vrc))
     {
         if (strErrorInfo.isEmpty())
             strErrorInfo.printf(tr("Failed with %Rrc"), vrc);
-        setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
+        hrc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
     }
 
@@ -1916 +1924 @@
      */
 
-    if (mDest.isEmpty())
+    if (mSources.empty())
+    {
+        strErrorInfo.printf(tr("No host sources specified"));
+        vrc = VERR_INVALID_PARAMETER;
+    }
+    else if (mDest.isEmpty())
     {
         strErrorInfo.printf(tr("Guest destination must not be empty"));
@@ -1993 +2006 @@
                             vrc = pFsList->AddDirFromHost(strSrc /* strPath */, "" /* strSubDir */,
                                                           szPathReal, sizeof(szPathReal), &DirEntry);
+                            break;
                         }
 
@@ -2031 +2045 @@
     }
 
-    if (cOperations) /* Use the first element as description (if available). */
-    {
-        Assert(mVecLists.size());
-        Assert(mVecLists[0]->mVecEntries.size());
-
-        Utf8Str const &strFirstOp = mVecLists[0]->mVecEntries[0]->strPath;
+    if (RT_SUCCESS(vrc))
+    {
+        /* When there are no entries in the first source list, this means the source only contains a single file
+         * (see \a mSrcRootAbs of FsList). So use \a mSrcRootAbs directly. */
+        Utf8Str const &strFirstOp = mVecLists[0]->mVecEntries.size() > 0
+                                  ? mVecLists[0]->mVecEntries[0]->strPath : mVecLists[0]->mSrcRootAbs;
 
         /* Now that we know how many objects we're handling, tweak the progress description so that it
@@ -2049 +2063 @@
 
         hrc = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
-                              TRUE /* aCancelable */, cOperations + 1 /* Number of operations */,
+                              TRUE /* aCancelable */, cOperations + 1/* Number of operations */,
                               Bstr(strFirstOp).raw());
     }
-    else /* If no operations have been defined, go with an "empty" progress object when will be used for error handling. */
+    else /* On error we go with an "empty" progress object when will be used for error handling. */
         hrc = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
                               TRUE /* aCancelable */, 1 /* cOperations */, Bstr(mDesc).raw());
 
+    if (FAILED(hrc)) /* Progress object creation failed -- we're doomed. */
+        return hrc;
+
     if (RT_FAILURE(vrc))
     {
         if (strErrorInfo.isEmpty())
             strErrorInfo.printf(tr("Failed with %Rrc"), vrc);
-        setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
+        hrc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
     }