Changeset 100389 in vbox

Timestamp:

Jul 5, 2023 1:26:22 PM (19 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. A first attempt for loading file entries from a Viso file.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (7 diffs)
• medium/viso/UIVisoContentBrowser.h (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (2 diffs)

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

@@ -1427 +1427 @@
 }
 
+bool UIMessageCenter::confirmVisoDiscard(QWidget *pParent /* = 0*/) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>To open a Viso file you will have to discard the current content.</p>"
+                             "<p>Are you sure you want to proceed?</p>"),
+                          0 /* auto-confirm id */,
+                          tr("&Discard") /* ok button text */,
+                          QString() /* cancel button text */,
+                          false /* ok button by default? */);
+}
+
 bool UIMessageCenter::confirmCloudNetworkRemoval(const QString &strName, QWidget *pParent /* = 0*/) const
 {

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

@@ -363 +363 @@
         bool confirmMediumRelease(const UIMedium &medium, bool fInduced, QWidget *pParent = 0) const;
         bool confirmMediumRemoval(const UIMedium &medium, QWidget *pParent = 0) const;
-        int confirmDeleteHardDiskStorage(const QString &strLocation, QWidget *pParent = 0) const;
+        int  confirmDeleteHardDiskStorage(const QString &strLocation, QWidget *pParent = 0) const;
         bool confirmInaccesibleMediaClear(const QStringList &mediaNameList, UIMediumDeviceType enmType, QWidget *pParent = 0);
+        bool confirmVisoDiscard(QWidget *pParent = 0) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -35 +35 @@
 #include <QMimeData>
 #include <QTableView>
+#include <QTextStream>
 
 /* GUI includes: */
@@ -51 +52 @@
 #include <iprt/mem.h>
 #include <iprt/err.h>
+
+const ULONG uAllowedFileSize = _4K;
 
 struct ISOFileObject
@@ -351 +354 @@
         return;
 
+    /* Insert items to the current directory shown in the table view: */
     QModelIndex parentIndex = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
     if (!parentIndex.isValid())
@@ -358 +362 @@
     if (!pParentItem)
         return;
+
     foreach (const QString &strPath, pathList)
     {
@@ -777 +782 @@
 void UIVisoContentBrowser::parseVisoFileContent(const QString &strFileName)
 {
-    Q_UNUSED(strFileName);
+    sltResetAction();
+    QFile file(strFileName);
+    if (!file.exists() || !file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return;
+    if (file.size() > uAllowedFileSize)
+        return;
+    QTextStream stream(&file);
+    QString strFileContent = stream.readAll();
+    strFileContent.replace(' ', '\n');
+    QStringList list = strFileContent.split("\n", Qt::SkipEmptyParts);
+    QMap<QString, QString> fileEntries;
+    foreach (const QString &strPart, list)
+    {
+        /* We currently do not support different on-ISO names for different namespaces. */
+        if (strPart.startsWith("/") && strPart.count('=') <= 1)
+        {
+            QStringList fileEntry = strPart.split("=", Qt::SkipEmptyParts);
+            if (fileEntry.size() == 1)
+            {
+                QFileInfo fileInfo(fileEntry[0]);
+                if (fileInfo.exists())
+                {
+                    QString isoName = QString("/%1").arg(fileInfo.fileName());
+                    fileEntries[isoName] = fileEntry[0];
+                }
+            }
+            else if (fileEntry.size() == 2)
+            {
+                if (QFileInfo(fileEntry[1]).exists())
+                    fileEntries[fileEntry[0]] = fileEntry[1];
+            }
+        }
+    }
+    file.close();
 }
 
@@ -925 +963 @@
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();
+    m_strImportedISOPath.clear();
 }
 
@@ -948 +987 @@
 {
     goUp();
-}
-
-void UIVisoContentBrowser::reset()
-{
-    m_entryMap.clear();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -128 +128 @@
      *  from the iso image. */
     void                    createVisoEntry(UICustomFileSystemItem *pItem, bool bRemove = false);
-    void                    reset();
     QString                 currentPath() const;
     /** Returns a list of items which are currecntly selected

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -44 +44 @@
 #include "QILabel.h"
 #include "QILineEdit.h"
+#include "UIMessageCenter.h"
 #include "QIToolBar.h"
 #include "UIActionPool.h"
@@ -407 +408 @@
 void UIVisoCreatorWidget::sltOpenAction()
 {
+    if (!msgCenter().confirmVisoDiscard(this))
+        return;
+
     QString strFileName =  QIFileDialog::getOpenFileName(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD),
                                                          "VISO files (*.viso)", this, UIVisoCreatorWidget::tr("Select a VISO file to load"));