Changeset 100269 in vbox for trunk

Timestamp:

Jun 23, 2023 3:00:39 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. First steps for ISO import. Not complete.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (3 diffs)
• globals/UICustomFileSystemModel.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (14 diffs)
• medium/viso/UIVisoContentBrowser.h (modified) (2 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (2 diffs)

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

@@ -199 +199 @@
 QString UICustomFileSystemItem::path(bool fRemoveTrailingDelimiters /* = false */) const
 {
-    const QString &strPath = m_itemData.value(UICustomFileSystemModelData_ISOPath, QString()).toString();
+    const QString &strPath = m_itemData.value(UICustomFileSystemModelData_VISOPath, QString()).toString();
 
     if (fRemoveTrailingDelimiters)
@@ -211 +211 @@
     if (path.isNull() || path.isEmpty())
         return;
-    m_itemData[UICustomFileSystemModelData_ISOPath] = path;
+    m_itemData[UICustomFileSystemModelData_VISOPath] = path;
 }
 
@@ -623 +623 @@
     m_pRootItem->setData(UICustomFileSystemModel::tr("Permissions"), UICustomFileSystemModelData_Permissions);
     m_pRootItem->setData(UICustomFileSystemModel::tr("Local Path"), UICustomFileSystemModelData_LocalPath);
-    m_pRootItem->setData(UICustomFileSystemModel::tr("Path"), UICustomFileSystemModelData_ISOPath);
-}
+    m_pRootItem->setData(UICustomFileSystemModel::tr("Path"), UICustomFileSystemModelData_VISOPath);
+}

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

@@ -48 +48 @@
     UICustomFileSystemModelData_Owner,
     UICustomFileSystemModelData_Permissions,
-    UICustomFileSystemModelData_ISOPath,
+    UICustomFileSystemModelData_VISOPath,
     UICustomFileSystemModelData_LocalPath,
     UICustomFileSystemModelData_Max

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

@@ -864 +864 @@
         connect(m_pView, &UIGuestControlFileView::customContextMenuRequested,
                 this, &UIFileManagerTable::sltCreateFileViewContextMenu);
-        m_pView->hideColumn(UICustomFileSystemModelData_ISOPath);
+        m_pView->hideColumn(UICustomFileSystemModelData_VISOPath);
         m_pView->hideColumn(UICustomFileSystemModelData_LocalPath);
         m_sessionWidgets << m_pView;

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

@@ -208 +208 @@
 }
 
-void UIVisoContentBrowser::addObjectsToViso(QStringList pathList)
+void UIVisoContentBrowser::importISOContentToViso(const QString &strISOFilePath, const QStringList &pathList,
+                                                  const QList<KFsObjType> &fileObjectTypeList)
+{
+    //rootItem();
+    UICustomFileSystemItem *pParentItem = rootItem()->children()[0];
+    if (!m_pTableView || !pParentItem)
+        return;
+    if (pathList.size() != fileObjectTypeList.size())
+        return;
+
+    for (int i = 0; i < pathList.size(); ++i)
+    {
+        if (pathList[i] == "." || pathList[i] == "..")
+            continue;
+
+        QFileInfo fileInfo(pathList[i]);
+        if (pParentItem->child(fileInfo.fileName()))
+            continue;
+        printf("%s %s %s\n", qPrintable(fileInfo.fileName()), qPrintable(pathList[i]), qPrintable(pParentItem->data(UICustomFileSystemModelData_VISOPath).toString()));
+        UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(fileInfo.fileName(), pParentItem,
+                                                                        fileObjectTypeList[i]);
+        pAddedItem->setData(pathList[i], UICustomFileSystemModelData_LocalPath);
+        pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), fileInfo.fileName()),
+                           UICustomFileSystemModelData_VISOPath);
+        pAddedItem->setIsOpened(false);
+        // if (fileInfo.isSymLink())
+        // {
+        //     pAddedItem->setTargetPath(fileInfo.symLinkTarget());
+        //     pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
+        // }
+        createVisoEntry(pAddedItem);
+    }
+    if (m_pTableProxyModel)
+        m_pTableProxyModel->invalidate();
+    if (m_pTreeProxyModel)
+    {
+        m_pTreeProxyModel->invalidate();
+        m_pTreeView->setExpanded(m_pTreeView->currentIndex(), true);
+    }
+}
+
+
+void UIVisoContentBrowser::addObjectsToViso(const QStringList &pathList)
 {
     if (!m_pTableView)
@@ -232 +274 @@
         pAddedItem->setData(strPath, UICustomFileSystemModelData_LocalPath);
         pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), fileInfo.fileName()),
-                           UICustomFileSystemModelData_ISOPath);
+                           UICustomFileSystemModelData_VISOPath);
         pAddedItem->setIsOpened(false);
         if (fileInfo.isSymLink())
@@ -239 +281 @@
             pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
         }
-        createAnIsoEntry(pAddedItem);
+        createVisoEntry(pAddedItem);
     }
     if (m_pTableProxyModel)
@@ -250 +292 @@
 }
 
-void UIVisoContentBrowser::createAnIsoEntry(UICustomFileSystemItem *pItem, bool bRemove /* = false */)
+void UIVisoContentBrowser::createVisoEntry(UICustomFileSystemItem *pItem, bool bRemove /* = false */)
 {
     if (!pItem)
         return;
-    if (pItem->data(UICustomFileSystemModelData_ISOPath).toString().isEmpty())
+    if (pItem->data(UICustomFileSystemModelData_VISOPath).toString().isEmpty())
         return;
 
@@ -261 +303 @@
         return;
     if (!bRemove)
-        m_entryMap.insert(pItem->data(UICustomFileSystemModelData_ISOPath).toString(),
+        m_entryMap.insert(pItem->data(UICustomFileSystemModelData_VISOPath).toString(),
                           pItem->data(UICustomFileSystemModelData_LocalPath).toString());
     else
-        m_entryMap.insert(pItem->data(UICustomFileSystemModelData_ISOPath).toString(),
+        m_entryMap.insert(pItem->data(UICustomFileSystemModelData_VISOPath).toString(),
                           ":remove:");
 }
@@ -290 +332 @@
         pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Permissions"), UICustomFileSystemModelData_Permissions);
         pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Local Path"), UICustomFileSystemModelData_LocalPath);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "ISO Path"), UICustomFileSystemModelData_ISOPath);
+        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "VISO Path"), UICustomFileSystemModelData_VISOPath);
     }
 }
@@ -342 +384 @@
     UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(strNewDirectoryName, pParentItem,
                                                                     KFsObjType_Directory);
-    pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), strNewDirectoryName), UICustomFileSystemModelData_ISOPath);
+    pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), strNewDirectoryName), UICustomFileSystemModelData_VISOPath);
 
     pAddedItem->setIsOpened(false);
@@ -362 +404 @@
         if (!pItem)
             continue;
-        QString strIsoPath = pItem->data(UICustomFileSystemModelData_ISOPath).toString();
+        QString strIsoPath = pItem->data(UICustomFileSystemModelData_VISOPath).toString();
         if (strIsoPath.isEmpty())
             continue;
@@ -378 +420 @@
         }
         if (!bFoundInMap)
-            createAnIsoEntry(pItem, true /* bool bRemove */);
+            createVisoEntry(pItem, true /* bool bRemove */);
     }
 
@@ -426 +468 @@
         m_pTreeView->hideColumn(UICustomFileSystemModelData_Size);
         m_pTreeView->hideColumn(UICustomFileSystemModelData_ChangeTime);
-        m_pTreeView->hideColumn(UICustomFileSystemModelData_ISOPath);
+        m_pTreeView->hideColumn(UICustomFileSystemModelData_VISOPath);
         m_pTreeView->hideColumn(UICustomFileSystemModelData_LocalPath);
     }
@@ -549 +591 @@
         if (pItem)
         {
-            QString strPath = pItem->data(UICustomFileSystemModelData_ISOPath).toString();
+            QString strPath = pItem->data(UICustomFileSystemModelData_VISOPath).toString();
             updateLocationSelectorText(strPath);
         }
@@ -687 +729 @@
 
             newItem->setData(UIPathOperations::mergePaths(directoryItem->path(), fileInfo.fileName()),
-                             UICustomFileSystemModelData_ISOPath);
+                             UICustomFileSystemModelData_VISOPath);
             if (fileInfo.isSymLink())
             {
@@ -765 +807 @@
            VISO file for the old path since in some cases, when remaned item is not top level, it still
            appears in ISO. So we remove it explicitly: */
-        QString oldItemPath = pItem->data(UICustomFileSystemModelData_ISOPath).toString();
+        QString oldItemPath = pItem->data(UICustomFileSystemModelData_VISOPath).toString();
         m_entryMap.insert(strNewPath, pItem->data(UICustomFileSystemModelData_LocalPath).toString());
         m_entryMap.remove(oldItemPath);
@@ -772 +814 @@
     }
 
-    pItem->setData(strNewPath, UICustomFileSystemModelData_ISOPath);
+    pItem->setData(strNewPath, UICustomFileSystemModelData_VISOPath);
 
     if (m_pTableProxyModel)

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

@@ -62 +62 @@
     UIVisoContentBrowser(QWidget *pParent = 0);
     ~UIVisoContentBrowser();
+    /* Imports pathList (relative to ISO file's root) to VISO content. */
+    void importISOContentToViso(const QString &strISOFilePath, const QStringList &pathList,
+                                const QList<KFsObjType> &fileObjectTypeList);
     /** Adds file objests from the host file system. @p pathList consists of list of paths to there objects. */
-    void addObjectsToViso(QStringList pathList);
+    void addObjectsToViso(const QStringList &pathList);
     /** Returns the content of the VISO as a string list. Each element of the list becomes a line in the
       * .viso file. */
@@ -120 +123 @@
     void                    renameFileObject(UICustomFileSystemItem *pItem);
     void                    removeItems(const QList<UICustomFileSystemItem*> itemList);
-    /** Creates and entry for pItem consisting of a map item (key is iso path and value is host file system path)
+    /** Creates and entry for pItem consisting of a map item (key is viso path and value is host file system path)
      *  if @p bRemove is true then the value is the string ":remove:" which effectively removes the file object
      *  from the iso image. */
-    void                    createAnIsoEntry(UICustomFileSystemItem *pItem, bool bRemove = false);
+    void                    createVisoEntry(UICustomFileSystemItem *pItem, bool bRemove = false);
     void                    reset();
     /** Returns a list of items which are currecntly selected

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

@@ -62 +62 @@
 #include <iprt/getopt.h>
 #include <iprt/path.h>
-
+#include <iprt/vfs.h>
+#include <iprt/file.h>
+#include <iprt/fsvfs.h>
 
 /*********************************************************************************************************************************
@@ -443 +445 @@
     if (!m_pHostBrowser)
         return;
-    // QStringList selectedObjectPaths = m_pHostBrowser->selectedPathList();
-    // printf("dddd %d\n", findISOFiles(selectedObjectPaths).size());
+    QStringList selectedObjectPaths = m_pHostBrowser->selectedPathList();
+    if (selectedObjectPaths.isEmpty())
+        return;
+    QList<KFsObjType> fileObjectTypeList;
+    QStringList pathList;
+
+    int iIndex = 0;
+
+    RTVFSFILE hVfsFileIso;
+    int vrc = RTVfsFileOpenNormal(selectedObjectPaths[iIndex].toUtf8().constData(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hVfsFileIso);
+    if (RT_SUCCESS(vrc))
+    {
+        RTERRINFOSTATIC ErrInfo;
+        RTVFS hVfsIso;
+        vrc = RTFsIso9660VolOpen(hVfsFileIso, 0 /*fFlags*/, &hVfsIso, RTErrInfoInitStatic(&ErrInfo));
+        if (RT_SUCCESS(vrc))
+        {
+            RTVFSDIR hVfsSrcRootDir;
+            vrc = RTVfsOpenRoot(hVfsIso, &hVfsSrcRootDir);
+            if (RT_SUCCESS(vrc))
+            {
+                size_t cbDirEntry = sizeof(RTDIRENTRYEX);
+                PRTDIRENTRYEX pDirEntry = (PRTDIRENTRYEX)RTMemTmpAlloc(cbDirEntry);
+                size_t cbDirEntryAlloced = cbDirEntry;
+                for(;;)
+                {
+                    if (pDirEntry)
+                    {
+                        vrc = RTVfsDirReadEx(hVfsSrcRootDir, pDirEntry, &cbDirEntry, RTFSOBJATTRADD_UNIX);
+                        if (RT_FAILURE(vrc))
+                        {
+                            if (vrc == VERR_BUFFER_OVERFLOW)
+                            {
+                                RTMemTmpFree(pDirEntry);
+                                cbDirEntryAlloced = RT_ALIGN_Z(RT_MIN(cbDirEntry, cbDirEntryAlloced) + 64, 64);
+                                pDirEntry  = (PRTDIRENTRYEX)RTMemTmpAlloc(cbDirEntryAlloced);
+                                if (pDirEntry)
+                                    continue;
+                                /// @todo log error
+                                //rcExit = RTMsgErrorExitFailure("Out of memory (direntry buffer)");
+                            }
+                            /// @todo log error
+                            // else if (rc != VERR_NO_MORE_FILES)
+                            //     rcExit = RTMsgErrorExitFailure("RTVfsDirReadEx failed: %Rrc\n", rc);
+                            break;
+                        }
+                        else
+                        {
+                            if (RTFS_IS_DIRECTORY(pDirEntry->Info.Attr.fMode))
+                                fileObjectTypeList << KFsObjType_Directory;
+                            else
+                                fileObjectTypeList << KFsObjType_File;
+                            pathList << pDirEntry->szName;
+                        }
+                    }
+                }
+                RTMemTmpFree(pDirEntry);
+            }
+            RTVfsRelease(hVfsIso);
+        }
+        RTVfsFileRelease(hVfsFileIso);
+    }
+    if (!pathList.isEmpty() && pathList.size() == fileObjectTypeList.size() && m_pVISOContentBrowser)
+        m_pVISOContentBrowser->importISOContentToViso(selectedObjectPaths[iIndex], pathList, fileObjectTypeList);
+    //     return setErrorBoth(E_NOTIMPL, vrc, tr("Failed to open '%s' (%Rrc)"), mStrIsoPath.c_str(), vrc);
+
 }