Changeset 86678 in vbox for trunk

Timestamp:

Oct 22, 2020 7:06:17 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Make sure we don't already have cloud VM with certain id while registering it.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserAbstractModel.cpp (modified) (3 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -757 +757 @@
         return;
 
+    /* Compose corresponding group path: */
+    const QString strGroup = QString("/%1/%2").arg(strProviderShortName, strProfileName);
+    /* Make sure there is no VM with such ID already: */
+    QUuid uId;
+    if (!cloudMachineId(comMachine, uId))
+        return;
+    if (checkIfNodeContainChildWithId(pProfileNode, uId))
+        return;
     /* Add new machine-item: */
-    const QString strGroup = QString("/%1/%2").arg(strProviderShortName, strProfileName);
     addCloudMachineIntoTheTree(strGroup, comMachine, true /* make it visible? */);
 
@@ -774 +781 @@
         return;
 
-    /* Add new machine-items: */
+    /* Compose corresponding group path: */
     const QString strGroup = QString("/%1/%2").arg(strProviderShortName, strProfileName);
     foreach (const CCloudMachine &comMachine, machines)
+    {
+        /* Make sure there is no VM with such ID already: */
+        QUuid uId;
+        if (!cloudMachineId(comMachine, uId))
+            continue;
+        if (checkIfNodeContainChildWithId(pProfileNode, uId))
+            continue;
+        /* Add new machine-item: */
         addCloudMachineIntoTheTree(strGroup, comMachine, false /* make it visible? */);
+    }
 
     /* Delete fake node if present: */
@@ -1496 +1512 @@
 }
 
+bool UIChooserAbstractModel::checkIfNodeContainChildWithId(UIChooserNode *pParentNode, const QUuid &uId) const
+{
+    /* Check parent-node type: */
+    AssertPtrReturn(pParentNode, false);
+    switch (pParentNode->type())
+    {
+        case UIChooserNodeType_Machine:
+        {
+            /* Check if pParentNode has the passed uId itself: */
+            UIChooserNodeMachine *pMachineNode = pParentNode->toMachineNode();
+            AssertPtrReturn(pMachineNode, false);
+            if (pMachineNode->id() == uId)
+                return true;
+            break;
+        }
+        case UIChooserNodeType_Group:
+        {
+            /* Recursively iterate through children: */
+            foreach (UIChooserNode *pChildNode, pParentNode->nodes())
+                if (checkIfNodeContainChildWithId(pChildNode, uId))
+                    return true;
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* False by default: */
+    return false;
+}
+
 void UIChooserAbstractModel::saveGroupSettings()
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h

@@ -288 +288 @@
         /** Gathers a list of possible group node names for machine nodes listed in @a exceptions, starting from @a pCurrentNode. */
         QStringList gatherPossibleGroupNodeNames(UIChooserNode *pCurrentNode, QList<UIChooserNode*> exceptions) const;
+
+        /** Returns whether passed @a pParentNode contains child node with passed @a uId. */
+        bool checkIfNodeContainChildWithId(UIChooserNode *pParentNode, const QUuid &uId) const;
     /** @} */