Changeset 77238 in vbox

Timestamp:

Feb 10, 2019 1:48:07 PM (6 years ago)

Author:

vboxsync

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

128745

Message:

FE/Qt: bugref:9340. Trying make hdd and floppy disk names unique in creation dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• medium/UIFDCreationDialog.cpp (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -431 +431 @@
     QSettings settings(m_strBrandingConfigFilePath, QSettings::IniFormat);
     return settings.value(QString("%1").arg(strKey)).toString();
+}
+
+/*static */
+QString VBoxGlobal::findUniqueFileName(const QString &strFullFolderPath, const QString &strBaseFileName)
+{
+    QDir folder(strFullFolderPath);
+    if (!folder.exists())
+        return strBaseFileName;
+    QFileInfoList folderContent = folder.entryInfoList();
+    QSet<QString> fileNameSet;
+    foreach (const QFileInfo &fileInfo, folderContent)
+    {
+        /* Remove the extension : */
+        fileNameSet.insert(fileInfo.baseName());
+    }
+    int iSuffix = 0;
+    QString strNewName(strBaseFileName);
+    while (fileNameSet.contains(strNewName))
+    {
+        strNewName = strBaseFileName + QString("_") + QString::number(++iSuffix);
+    }
+    return strNewName;
 }
 
@@ -2793 +2815 @@
 
 QUuid VBoxGlobal::createHDWithNewHDWizard(QWidget *pParent, const QString &strMachineGuestOSTypeId,
+                                          const QString &strMachineName,
                                           const QString &strMachineFolder)
 {
     /* Initialize variables: */
     const CGuestOSType comGuestOSType = virtualBox().GetGuestOSType(strMachineGuestOSTypeId);
-    const QFileInfo fileInfo(strMachineFolder);
+    QString strDiskName = findUniqueFileName(strMachineFolder, strMachineName);
     /* Show New VD wizard: */
-    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(pParent, QString(), fileInfo.absolutePath(), comGuestOSType.GetRecommendedHDD());
+    UISafePointerWizardNewVD pWizard = new UIWizardNewVD(pParent, strDiskName, strMachineFolder, comGuestOSType.GetRecommendedHDD());
 
     if (!pWizard)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -185 +185 @@
         /** Returns value for certain branding @a strKey from custom.ini file. */
         QString brandingGetKey(QString strKey);
+        /** Returns a file name (unique up to extension) wrt. @a strFullFolderPath folder content. Starts
+          * searching strBaseFileName and adds suffixes until a unique file name is found. */
+        static QString findUniqueFileName(const QString &strFullFolderPath, const QString &strBaseFileName);
     /** @} */
 
@@ -528 +531 @@
           * @param  parent                    Passes the parent of the wizard,
           * @param  strMachineGuestOSTypeId   Passes the string of machine's guest OS type ID,
+          * @param  strMachineName            Passes the name of the machine,
           * @param  strMachineFolder          Passes the machine folder,
           * returns the ID of the  created hard disk if successful, a null QUuid otherwise.*/
-        QUuid createHDWithNewHDWizard(QWidget *pParent, const QString &strMachineGuestOSTypeId, const QString &strMachineFolder);
+        QUuid createHDWithNewHDWizard(QWidget *pParent, const QString &strMachineGuestOSTypeId,
+                                      const QString &strMachineName, const QString &strMachineFolder);
 
         /** Prepares storage menu according passed parameters.

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIFDCreationDialog.cpp

@@ -163 +163 @@
         return strInitialPath;
 
-    strInitialPath = QDir(strInitialPath).absoluteFilePath(m_strMachineName + "." + strPreferredExtension);
+    QString strDiskname = VBoxGlobal::findUniqueFileName(m_strMachineFolder, m_strMachineName);
+
+    strInitialPath = QDir(strInitialPath).absoluteFilePath(strDiskname + "." + strPreferredExtension);
     return strInitialPath;
 }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -449 +449 @@
         uMediumId = vboxGlobal().showCreateFloppyDiskDialog(this, m_strMachineName, m_strMachineFolder);
     else if (m_enmMediumType == UIMediumDeviceType_HardDisk)
-        uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineFolder);
+        uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineName, m_strMachineFolder);
     else if (m_enmMediumType == UIMediumDeviceType_DVD)
         uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineFolder);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3082 +3082 @@
 void UIMachineSettingsStorage::sltCreateNewHardDisk()
 {
-    const QUuid uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineSettingsFilePath);
+    const QUuid uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId,
+                                                                 m_strMachineName, m_strMachineSettingsFilePath);
 
     if (!uMediumId.isNull())