Changeset 33438 in vbox

Timestamp:

Oct 25, 2010 5:45:24 PM (15 years ago)

Author:

vboxsync

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

67028

Message:

Main;FE/Qt4: implement Cd and CdUp in IVFSExplorer

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.h (modified) (1 diff)
• Main/VFSExplorerImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -552 +552 @@
         }
     }
-    CVFSExplorer explorer = appliance->CreateVFSExplorer(uri());
+    CVFSExplorer explorer = appliance->CreateVFSExplorer(uri(false /* fWithFile */));
     CProgress progress = explorer.Update();
     bool fResult = explorer.isOk();
@@ -631 +631 @@
 }
 
-QString UIExportApplianceWzdPage4::uri() const
+QString UIExportApplianceWzdPage4::uri(bool fWithFile) const
 {
     StorageType type = field("storageType").value<StorageType>();
+
+    QString path = field("path").toString();
+    if (!fWithFile)
+    {
+        QFileInfo fi(path);
+        path = fi.path();
+    }
     switch (type)
     {
         case Filesystem:
         {
-            return field("path").toString();
+            return path;
         }
         case SunCloud:
@@ -649 +656 @@
             if (!field("username").toString().isEmpty() || !field("username").toString().isEmpty())
                 uri = QString("%1@").arg(uri);
-            uri = QString("%1%2/%3/%4").arg(uri).arg("object.storage.network.com").arg(field("bucket").toString()).arg(field("path").toString());
+            uri = QString("%1%2/%3/%4").arg(uri).arg("object.storage.network.com").arg(field("bucket").toString()).arg(path);
             return uri;
         }
@@ -661 +668 @@
             if (!field("username").toString().isEmpty() || !field("password").toString().isEmpty())
                 uri = QString("%1@").arg(uri);
-            uri = QString("%1%2/%3/%4").arg(uri).arg(field("hostname").toString()).arg(field("bucket").toString()).arg(field("path").toString());
+            uri = QString("%1%2/%3/%4").arg(uri).arg(field("hostname").toString()).arg(field("bucket").toString()).arg(path);
             return uri;
         }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.h

@@ -188 +188 @@
     bool exportAppliance();
     bool exportVMs(CAppliance &appliance);
-    QString uri() const;
+    QString uri(bool fWithFile = true) const;
 
     ExportAppliancePointer applianceWidget() const { return m_pApplianceWidget; }

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -293 +293 @@
     try
     {
-        pszPath = RTStrDup(m->strPath.c_str());
-        RTPathStripFilename(pszPath);
-        int vrc = RTDirOpen(&pDir, pszPath);
+        int vrc = RTDirOpen(&pDir, m->strPath.c_str());
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_FILE_ERROR, tr ("Can't open directory '%s' (%Rrc)"), pszPath, vrc);
@@ -570 +568 @@
 {
     CheckComArgStrNotEmptyOrNull(aDir);
-    CheckComArgOutPointerValid(aProgress);
-
-    return E_NOTIMPL;
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+        m->strPath = aDir;
+    }
+
+    return Update(aProgress);
 }
 
 STDMETHODIMP VFSExplorer::CdUp(IProgress **aProgress)
 {
-    CheckComArgOutPointerValid(aProgress);
-
-    return E_NOTIMPL;
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    Utf8Str strUpPath;
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        /* Remove lowest dir entry in a platform neutral way. */
+        char *pszNewPath = RTStrDup(m->strPath.c_str());
+        RTPathStripTrailingSlash(pszNewPath);
+        RTPathStripFilename(pszNewPath);
+        strUpPath = pszNewPath;
+        RTStrFree(pszNewPath);
+    }
+
+    return Cd(Bstr(strUpPath).raw(), aProgress);
 }
 
@@ -626 +643 @@
     std::list<BSTR> listExists;
 
-    std::list<VFSExplorer::Data::DirEntry>::const_iterator it;
-    for (it = m->entryList.begin();
-         it != m->entryList.end();
-         ++it)
-    {
-        const VFSExplorer::Data::DirEntry &entry = (*it);
-        for (size_t a=0; a < sfaNames.size(); ++a)
-        {
+    for (size_t a=0; a < sfaNames.size(); ++a)
+    {
+        std::list<VFSExplorer::Data::DirEntry>::const_iterator it;
+        for (it = m->entryList.begin();
+             it != m->entryList.end();
+             ++it)
+        {
+            const VFSExplorer::Data::DirEntry &entry = (*it);
             if (entry.name == RTPathFilename(Utf8Str(sfaNames[a]).c_str()))
             {