Changeset 46615 in vbox for trunk

Timestamp:

Jun 18, 2013 10:36:12 AM (12 years ago)

Author:

vboxsync

Message:

pr5429. Improvement the logic related to the OVA import.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (11 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -2686 +2686 @@
                 ovf::DiskImage diCurrent = oit->second;
                 ovf::VirtualDisksMap::const_iterator itVDisk = vsysThis.mapVirtualDisks.begin();
-                bool fFoundInCurrentPosition = false;
 
                 VirtualSystemDescriptionEntry *vsdeTargetHD = 0;
@@ -2735 +2734 @@
                 if (strncmp(pStorage->pVDImageIfaces->pszInterfaceName, name.c_str(), name.length()) == 0)
                 {
+                    /* It means that we possibly have imported the storage earlier on the previous loop steps*/
+                    std::set<RTCString>::const_iterator h = disksResolvedNames.find(diCurrent.strHref);
+                    if (h != disksResolvedNames.end())
+                    {
+                        /* Yes, disk name was found, we can skip it*/
+                        ++oit;
+                        continue;
+                    }
+
                     RTCString availableImage(diCurrent.strHref);
 
@@ -2746 +2754 @@
                         if(availableImage.compare(diCurrent.strHref, Utf8Str::CaseInsensitive) != 0)
                         {
-
-                            if (RTPathHaveExt(availableImage.c_str()))
-                            {
-                                /* Figure out which format the user have. */
-                                char *pszExt = RTPathExt(availableImage.c_str());
-                                /* Get the system properties. */
-                                SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
-                                ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(&pszExt[1]);
-                                if (trgFormat.isNull())
-                                {
-                                    ++oit;
-                                    continue;
-                                }
-                            }
-
                             /* 
                              * 
@@ -2819 +2812 @@
                         else
                         {
-                            fFoundInCurrentPosition = true;
                             ++oit;
                         }
@@ -2832 +2824 @@
                 {
                     /* just continue with normal files*/
-                    fFoundInCurrentPosition = true;
                     ++oit;
-                }
-
-                /* It means that we possibly have imported the storage earlier on the previous loop steps*/
-                if (!fFoundInCurrentPosition)
-                {
-                    std::set<RTCString>::const_iterator h = disksResolvedNames.find(diCurrent.strHref);
-                    if (h != disksResolvedNames.end())
-                    {
-                        /* Yes, disk name was found, we can skip it*/
-                        continue;
-                    }
                 }
 
@@ -3140 +3120 @@
     while(oit != stack.mapDisks.end())
     {
-        if (RTPathHaveExt(oit->first.c_str()))
+        if (RTPathHaveExt(oit->second.strHref.c_str()))
         {
             /* Figure out which format the user have. */
@@ -3155 +3135 @@
 
         ovf::DiskImage diCurrent = oit->second;
-        bool fFoundInCurrentPosition = false;
 
         VirtualSystemDescriptionEntry *vsdeTargetHD = 0;
@@ -3192 +3171 @@
         if (strncmp(pStorage->pVDImageIfaces->pszInterfaceName, name.c_str(), name.length()) == 0)
         {
+            /* It means that we possibly have imported the storage earlier on the previous loop steps*/
+            std::set<RTCString>::const_iterator h = disksResolvedNames.find(diCurrent.strHref);
+            if (h != disksResolvedNames.end())
+            {
+                /* Yes, disk name was found, we can skip it*/
+                ++oit;
+                continue;
+            }
+
             RTCString availableImage(diCurrent.strHref);
 
@@ -3203 +3191 @@
                 if(availableImage.compare(diCurrent.strHref, Utf8Str::CaseInsensitive) != 0)
                 {
-                    if (RTPathHaveExt(availableImage.c_str()))
-                    {
-                        /* Figure out which format the user have. */
-                        char *pszExt = RTPathExt(availableImage.c_str());
-                        /* Get the system properties. */
-                        SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
-                        ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(&pszExt[1]);
-                        if (trgFormat.isNull())
-                        {
-                            ++oit;
-                            continue;
-                        }
-                    }
-
                     // availableImage contains the disk identifier (e.g. "vmdisk1"), which should exist
                     // in the virtual system's disks map under that ID and also in the global images map
@@ -3258 +3232 @@
                 else
                 {
-                    fFoundInCurrentPosition = true;
                     ++oit;
                 }
@@ -3271 +3244 @@
         {
             /* just continue with normal files*/
-            fFoundInCurrentPosition = true;
             ++oit;
-        }
-
-        /* It means that we possibly have imported the storage earlier on the previous loop steps*/
-        if (!fFoundInCurrentPosition)
-        {
-            std::set<RTCString>::const_iterator h = disksResolvedNames.find(diCurrent.strHref);
-            if (h != disksResolvedNames.end())
-            {
-                /* Yes, disk name was found, we can skip it*/
-                continue;
-            }
         }