Index: /trunk/src/VBox/Main/ApplianceImpl.cpp =================================================================== --- /trunk/src/VBox/Main/ApplianceImpl.cpp (revision 20044) +++ /trunk/src/VBox/Main/ApplianceImpl.cpp (revision 20045) @@ -21,15 +21,11 @@ */ +#include #include #include #include #include -#include - -#include -#include #include "ApplianceImpl.h" -#include "VFSExplorerImpl.h" #include "VirtualBoxImpl.h" #include "GuestOSTypeImpl.h" @@ -464,4 +460,5 @@ * @return */ + HRESULT Appliance::init(VirtualBox *aVirtualBox) { @@ -2504,218 +2501,70 @@ struct Appliance::TaskWriteOVF { - enum OVFFormat - { - unspecified, - OVF_0_9, - OVF_1_0 - }; - enum TaskType - { - Write - }; - - TaskWriteOVF(OVFFormat aFormat, Appliance *aThat) - : taskType(Write), - storageType(VFSType_File), - enFormat(aFormat), - pAppliance(aThat), + TaskWriteOVF(Appliance *aThat, Progress *aProgress) + : pAppliance(aThat), + enFormat(unspecified), + progress(aProgress), rc(S_OK) {} ~TaskWriteOVF() {} - int startThread(); - static int uploadProgress(unsigned uPercent, void *pvUser); - - TaskType taskType; - VFSType_T storageType; - Utf8Str filepath; - Utf8Str hostname; - Utf8Str username; - Utf8Str password; - OVFFormat enFormat; + HRESULT startThread(); + Appliance *pAppliance; + enum { unspecified, OVF_0_9, OVF_1_0 } + enFormat; + ComObjPtr progress; HRESULT rc; }; -int Appliance::TaskWriteOVF::startThread() +HRESULT Appliance::TaskWriteOVF::startThread() { int vrc = RTThreadCreate(NULL, Appliance::taskThreadWriteOVF, this, 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, "Appliance::Task"); - ComAssertMsgRCRet(vrc, - ("Could not create taskThreadWriteOVF (%Rrc)\n", vrc), E_FAIL); - - return vrc; + ("Could not create taskThreadExportOVF (%Rrc)\n", vrc), E_FAIL); + + return S_OK; } -/* static */ -int Appliance::TaskWriteOVF::uploadProgress(unsigned uPercent, void *pvUser) -{ - Appliance::TaskWriteOVF* pTask = *(Appliance::TaskWriteOVF**)pvUser; - - if (pTask && - !pTask->progress.isNull()) - { - BOOL fCanceled; - pTask->progress->COMGETTER(Canceled)(&fCanceled); - if (fCanceled) - return -1; - pTask->progress->setCurrentOperationProgress(uPercent); - } - RTPrintf ("%u%%\n", uPercent); - return VINF_SUCCESS; -} - -STDMETHODIMP Appliance::CreateVFSExplorer(IN_BSTR aURI, IVFSExplorer **aExplorer) +STDMETHODIMP Appliance::Write(IN_BSTR format, IN_BSTR path, IProgress **aProgress) { HRESULT rc = S_OK; - CheckComArgOutPointerValid(aExplorer); + CheckComArgOutPointerValid(aProgress); AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock(this); - - Utf8Str uri(aURI); - /* Check which kind of export the user has requested */ - VFSType_T type = VFSType_File; - Utf8Str strProtocol = ""; - /* Check the URI for the target format */ - if (uri.startsWith("SunCloud://", Utf8Str::CaseInsensitive)) /* Sun Cloud service */ - { - type = VFSType_S3; - strProtocol = "SunCloud://"; - } - else if (uri.startsWith("S3://", Utf8Str::CaseInsensitive)) /* S3 service */ - { - type = VFSType_S3; - strProtocol = "S3://"; - } - else if (uri.startsWith("webdav://", Utf8Str::CaseInsensitive)) /* webdav service */ - throw E_NOTIMPL; - - Utf8Str strFilepath; - Utf8Str strHostname; - Utf8Str strUsername; - Utf8Str strPassword; - parseURI(uri, strProtocol, strFilepath, strHostname, strUsername, strPassword); - - ComObjPtr explorer; - explorer.createObject(); - - rc = explorer->init(type, strFilepath, strHostname, strUsername, strPassword, mVirtualBox); - - if (SUCCEEDED(rc)) - /* Return explorer to the caller */ - explorer.queryInterfaceTo(aExplorer); - - return rc; -} - -STDMETHODIMP Appliance::Write(IN_BSTR format, IN_BSTR path, IProgress **aProgress) -{ - HRESULT rc = S_OK; - - CheckComArgOutPointerValid(aProgress); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); + if (FAILED(rc = autoCaller.rc())) return rc; AutoWriteLock(this); // see if we can handle this file; for now we insist it has an ".ovf" extension - Utf8Str strPath = path; - if (!strPath.endsWith(".ovf", Utf8Str::CaseInsensitive)) + m->strPath = path; + if (!m->strPath.endsWith(".ovf", Utf8Str::CaseInsensitive)) return setError(VBOX_E_FILE_ERROR, tr("Appliance file must have .ovf extension")); ComObjPtr progress; - Utf8Str strFormat(format); - TaskWriteOVF::OVFFormat ovfF; - if (strFormat == "ovf-0.9") - ovfF = TaskWriteOVF::OVF_0_9; - else if (strFormat == "ovf-1.0") - ovfF = TaskWriteOVF::OVF_1_0; - else - return setError(VBOX_E_FILE_ERROR, - tr("Invalid format \"%s\" specified"), strFormat.c_str()); - - rc = writeImpl(ovfF, strPath, progress); - - if (SUCCEEDED(rc)) - /* Return progress to the caller */ - progress.queryInterfaceTo(aProgress); - - return rc; -} - -void Appliance::parseURI(Utf8Str strUri, const Utf8Str &strProtocol, Utf8Str &strFilepath, Utf8Str &strHostname, Utf8Str &strUsername, Utf8Str &strPassword) -{ - /* Remove the protocol */ - if (strUri.startsWith(strProtocol, Utf8Str::CaseInsensitive)) - strUri = strUri.substr(strProtocol.length()); - size_t uppos = strUri.find("@"); - if (uppos != Utf8Str::npos) - { - strUsername = strUri.substr(0, uppos); - strUri = strUri.substr(uppos + 1); - size_t upos = strUsername.find(":"); - if (upos != Utf8Str::npos) - { - strPassword = strUsername.substr(upos + 1); - strUsername = strUsername.substr(0, upos); - } - } - size_t hpos = strUri.find("/"); - if (hpos != Utf8Str::npos) - { - strHostname = strUri.substr(0, hpos); - strUri = strUri.substr(hpos); - } - strFilepath = strUri; - RTPrintf("%s - %s - %s - %s\n", strUsername.c_str(), strPassword.c_str(), strHostname.c_str(), strFilepath.c_str()); -} - -HRESULT Appliance::writeImpl(int aFormat, Utf8Str aPath, ComObjPtr &aProgress) -{ - HRESULT rc = S_OK; try { - m->strPath = aPath; + Bstr progressDesc = BstrFmt(tr("Export appliance '%s'"), + m->strPath.raw()); + rc = setUpProgress(progress, progressDesc); + if (FAILED(rc)) throw rc; /* Initialize our worker task */ - std::auto_ptr task(new TaskWriteOVF((TaskWriteOVF::OVFFormat)aFormat, this)); - - /* Check which kind of export the user has requested */ - Utf8Str strProtocol = ""; - /* Check the URI for the target format */ - if (m->strPath.startsWith("SunCloud://", Utf8Str::CaseInsensitive)) /* Sun Cloud service */ - { - task->storageType = VFSType_S3; - strProtocol = "SunCloud://"; - } - else if (m->strPath.startsWith("S3://", Utf8Str::CaseInsensitive)) /* S3 service */ - { - task->storageType = VFSType_S3; - strProtocol = "S3://"; - } - else if (m->strPath.startsWith("webdav://", Utf8Str::CaseInsensitive)) /* webdav service */ - throw E_NOTIMPL; - - parseURI(m->strPath, strProtocol, task->filepath, task->hostname, task->username, task->password); - Bstr progressDesc = BstrFmt(tr("Export appliance '%s'"), - task->filepath.c_str()); - - /* todo: This progress init stuff should be done a little bit more generic */ - if (task->storageType == VFSType_S3) - rc = setUpProgressUpload(aProgress, progressDesc); + std::auto_ptr task(new TaskWriteOVF(this, progress)); + //AssertComRCThrowRC (task->autoCaller.rc()); + + Utf8Str strFormat(format); + if (strFormat == "ovf-0.9") + task->enFormat = TaskWriteOVF::OVF_0_9; + else if (strFormat == "ovf-1.0") + task->enFormat = TaskWriteOVF::OVF_1_0; else - rc = setUpProgress(aProgress, progressDesc); - if (FAILED(rc)) throw rc; - - task->progress = aProgress; + return setError(VBOX_E_FILE_ERROR, + tr("Invalid format \"%s\" specified"), strFormat.c_str()); rc = task->startThread(); @@ -2729,37 +2578,9 @@ } + if (SUCCEEDED(rc)) + /* Return progress to the caller */ + progress.queryInterfaceTo(aProgress); + return rc; -} - -DECLCALLBACK(int) Appliance::taskThreadWriteOVF(RTTHREAD /* aThread */, void *pvUser) -{ - std::auto_ptr task(static_cast(pvUser)); - AssertReturn(task.get(), VERR_GENERAL_FAILURE); - - Appliance *pAppliance = task->pAppliance; - - LogFlowFuncEnter(); - LogFlowFunc(("Appliance %p\n", pAppliance)); - - HRESULT rc = S_OK; - - switch(task->taskType) - { - case TaskWriteOVF::Write: - { - if (task->storageType == VFSType_File) - rc = pAppliance->writeFS(task.get()); - else if (task->storageType == VFSType_S3) - rc = pAppliance->writeS3(task.get()); - break; - } - } - - task->rc = rc; - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; } @@ -2770,15 +2591,22 @@ */ /* static */ -int Appliance::writeFS(TaskWriteOVF *pTask) -{ +DECLCALLBACK(int) Appliance::taskThreadWriteOVF(RTTHREAD /* aThread */, void *pvUser) +{ + std::auto_ptr task(static_cast(pvUser)); + AssertReturn(task.get(), VERR_GENERAL_FAILURE); + + Appliance *pAppliance = task->pAppliance; + LogFlowFuncEnter(); - LogFlowFunc(("Appliance %p\n", this)); - - AutoCaller autoCaller(this); + LogFlowFunc(("Appliance %p\n", pAppliance)); + + AutoCaller autoCaller(pAppliance); CheckComRCReturnRC(autoCaller.rc()); - AutoWriteLock appLock(this); + AutoWriteLock appLock(pAppliance); HRESULT rc = S_OK; + + ComPtr pVirtualBox(pAppliance->mVirtualBox); try @@ -2787,5 +2615,5 @@ xml::ElementNode *pelmRoot = doc.createRootElement("Envelope"); - pelmRoot->setAttribute("ovf:version", (pTask->enFormat == TaskWriteOVF::OVF_1_0) ? "1.0" : "0.9"); + pelmRoot->setAttribute("ovf:version", (task->enFormat == TaskWriteOVF::OVF_1_0) ? "1.0" : "0.9"); pelmRoot->setAttribute("xml:lang", "en-US"); @@ -2796,9 +2624,9 @@ pelmRoot->setAttribute("xmlns:ovf", strNamespace); - pelmRoot->setAttribute("xmlns:ovfstr", "http://schema.dmtf.org/ovf/strings/1"); +// pelmRoot->setAttribute("xmlns:ovfstr", "http://schema.dmtf.org/ovf/strings/1"); pelmRoot->setAttribute("xmlns:rasd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"); pelmRoot->setAttribute("xmlns:vssd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"); pelmRoot->setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); - pelmRoot->setAttribute("xsi:schemaLocation", "http://schemas.dmtf.org/ovf/envelope/1 ../ovf-envelope.xsd"); +// pelmRoot->setAttribute("xsi:schemaLocation", "http://schemas.dmtf.org/ovf/envelope/1 ../ovf-envelope.xsd"); // / @@ -2811,5 +2639,5 @@ */ xml::ElementNode *pelmDiskSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { //
@@ -2834,5 +2662,5 @@ */ xml::ElementNode *pelmNetworkSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { //
@@ -2856,7 +2684,7 @@ // one machine, it seems xml::ElementNode *pelmToAddVirtualSystemsTo; - if (m->virtualSystemDescriptions.size() > 1) + if (pAppliance->m->virtualSystemDescriptions.size() > 1) { - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) throw setError(VBOX_E_FILE_ERROR, tr("Cannot export more than one virtual system with OVF 0.9, use OVF 1.0")); @@ -2870,6 +2698,6 @@ list< ComObjPtr >::const_iterator it; /* Iterate through all virtual systems of that appliance */ - for (it = m->virtualSystemDescriptions.begin(); - it != m->virtualSystemDescriptions.end(); + for (it = pAppliance->m->virtualSystemDescriptions.begin(); + it != pAppliance->m->virtualSystemDescriptions.end(); ++it) { @@ -2877,5 +2705,5 @@ xml::ElementNode *pelmVirtualSystem; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { //
@@ -2921,5 +2749,5 @@
*/ xml::ElementNode *pelmAnnotationSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { //
@@ -2953,5 +2781,5 @@
*/ xml::ElementNode *pelmAnnotationSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { //
@@ -2976,5 +2804,5 @@ */ xml::ElementNode *pelmEulaSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { pelmEulaSection = pelmVirtualSystem->createChild("Section"); @@ -2998,5 +2826,5 @@ */ xml::ElementNode *pelmOperatingSystemSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { pelmOperatingSystemSection = pelmVirtualSystem->createChild("Section"); @@ -3014,5 +2842,5 @@ // xml::ElementNode *pelmVirtualHardwareSection; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) { //
@@ -3040,5 +2868,5 @@ // vmx-4 const char *pcszHardware = "virtualbox-2.2"; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) // pretend to be vmware compatible then pcszHardware = "vmx-6"; @@ -3398,5 +3226,5 @@ // 1 xml::ElementNode *pelmInstanceID; - if (pTask->enFormat == TaskWriteOVF::OVF_0_9) + if (task->enFormat == TaskWriteOVF::OVF_0_9) pelmInstanceID = pItem->createChild("rasd:InstanceId"); else @@ -3474,5 +3302,5 @@ const Utf8Str &strTargetFileNameOnly = pDiskEntry->strOvf; // target path needs to be composed from where the output OVF is - Utf8Str strTargetFilePath = stripFilename(m->strPath); + Utf8Str strTargetFilePath = stripFilename(pAppliance->m->strPath); strTargetFilePath.append("/"); strTargetFilePath.append(strTargetFileNameOnly); @@ -3484,5 +3312,5 @@ Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw())); - rc = mVirtualBox->FindHardDisk(bstrSrcFilePath, pSourceDisk.asOutParam()); + rc = pVirtualBox->FindHardDisk(bstrSrcFilePath, pSourceDisk.asOutParam()); if (FAILED(rc)) throw rc; @@ -3492,5 +3320,5 @@ // create a new hard disk interface for the destination disk image Log(("Creating target disk \"%s\"\n", strTargetFilePath.raw())); - rc = mVirtualBox->CreateHardDisk(bstrSrcFormat, Bstr(strTargetFilePath), pTargetDisk.asOutParam()); + rc = pVirtualBox->CreateHardDisk(bstrSrcFormat, Bstr(strTargetFilePath), pTargetDisk.asOutParam()); if (FAILED(rc)) throw rc; @@ -3504,10 +3332,10 @@ // advance to the next operation - if (!pTask->progress.isNull()) - pTask->progress->setNextOperation(BstrFmt(tr("Exporting virtual disk image '%s'"), strSrcFilePath.c_str()), + if (!task->progress.isNull()) + task->progress->setNextOperation(BstrFmt(tr("Exporting virtual disk image '%s'"), strSrcFilePath.c_str()), pDiskEntry->ulSizeMB); // operation's weight, as set up with the IProgress originally); // now wait for the background disk operation to complete; this throws HRESULTs on error - waitForAsyncProgress(pTask->progress, pProgress2); + pAppliance->waitForAsyncProgress(task->progress, pProgress2); } catch (HRESULT rc3) @@ -3516,5 +3344,5 @@ // it'll stick in the registry forever pTargetDisk->Close(); - throw; + throw rc3; } @@ -3553,5 +3381,5 @@ // now go write the XML xml::XmlFileWriter writer(doc); - writer.write(m->strPath.c_str()); + writer.write(pAppliance->m->strPath.c_str()); } catch(xml::Error &x) @@ -3565,185 +3393,8 @@ } - pTask->rc = rc; - - if (!pTask->progress.isNull()) - pTask->progress->notifyComplete(rc); - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; -} - -/** - * Worker thread implementation for Upload() (ovf uploader). - * @param aThread - * @param pvUser - */ -/* static */ -int Appliance::writeS3(TaskWriteOVF *pTask) -{ - LogFlowFuncEnter(); - LogFlowFunc(("Appliance %p\n", this)); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - HRESULT rc = S_OK; - - AutoWriteLock appLock(this); - - /* Buckets are S3 specific. So parse the bucket out of the file path */ - Utf8Str tmpPath = pTask->filepath; - if (!tmpPath.startsWith("/")) - return setError(E_INVALIDARG, - tr("The path '%s' must start with /"), tmpPath.c_str()); - Utf8Str bucket; - size_t bpos = tmpPath.find("/", 1); - if (bpos != Utf8Str::npos) - { - bucket = tmpPath.substr(1, bpos - 1); /* The bucket without any slashes */ - tmpPath = tmpPath.substr(bpos); /* The rest of the file path */ - } - /* If there is no bucket name provided reject the upload */ - if (bucket.isEmpty()) - return setError(E_INVALIDARG, - tr("You doesn't provide a bucket name in the URI"), tmpPath.c_str()); - - int vrc = VINF_SUCCESS; - RTS3 hS3 = NULL; - char szOSTmpDir[RTPATH_MAX]; - RTPathTemp(szOSTmpDir, sizeof(szOSTmpDir)); - /* The template for the temporary directory created below */ - char *pszTmpDir; - RTStrAPrintf(&pszTmpDir, "%s/vbox-ovf-XXXXXX", szOSTmpDir); - list< pair > filesList; - - // todo: - // - getting the tmp directory (especially on win) - // - usable error codes - // - seems snapshot filenames are problematic {uuid}.vdi - try - { - /* We need a temporary directory which we can put the OVF file & all - * disk images in */ - if (!mkdtemp(pszTmpDir)) - throw setError(VBOX_E_FILE_ERROR, - tr("Cannot create temporary directory '%s'"), pszTmpDir); - - /* The temporary name of the target OVF file */ - Utf8StrFmt strTmpOvf("%s/%s", pszTmpDir, RTPathFilename(tmpPath)); - - /* Prepare the temporary writing of the OVF */ - ComObjPtr progress; - rc = writeImpl(pTask->enFormat, strTmpOvf.c_str(), progress); - if (FAILED(rc)) throw rc; - - /* Unlock the appliance for the writing thread */ - appLock.unlock(); - /* Wait until the writing is done, but report the progress back to the - caller */ - ComPtr progressInt(progress); - waitForAsyncProgress(pTask->progress, progressInt); /* Any errors will be thrown */ - - /* Again lock the appliance for the next steps */ - appLock.lock(); - - vrc = RTPathExists(strTmpOvf.c_str()); /* Paranoid check */ - if(RT_FAILURE(vrc)) - throw setError(VBOX_E_FILE_ERROR, - tr("Cannot find source file '%s'"), strTmpOvf.c_str()); - /* Add the OVF file */ - filesList.push_back(pair(strTmpOvf, m->ulWeightPerOperation)); /* Use 1% of the total for the OVF file upload */ - - /* Now add every disks of every virtual system */ - list< ComObjPtr >::const_iterator it; - for (it = m->virtualSystemDescriptions.begin(); - it != m->virtualSystemDescriptions.end(); - ++it) - { - ComObjPtr vsdescThis = (*it); - std::list avsdeHDs = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskImage); - std::list::const_iterator itH; - for (itH = avsdeHDs.begin(); - itH != avsdeHDs.end(); - ++itH) - { - const Utf8Str &strTargetFileNameOnly = (*itH)->strOvf; - /* Target path needs to be composed from where the output OVF is */ - Utf8Str strTargetFilePath = stripFilename(m->strPath); - strTargetFilePath.append("/"); - strTargetFilePath.append(strTargetFileNameOnly); - vrc = RTPathExists(strTargetFilePath.c_str()); /* Paranoid check */ - if(RT_FAILURE(vrc)) - throw setError(VBOX_E_FILE_ERROR, - tr("Cannot find source file '%s'"), strTargetFilePath.c_str()); - filesList.push_back(pair(strTargetFilePath, (*itH)->ulSizeMB)); - } - } - /* Next we have to upload the OVF & all disk images */ - vrc = RTS3Create(&hS3, pTask->username.c_str(), pTask->password.c_str(), pTask->hostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING); - if(RT_FAILURE(vrc)) - throw setError(VBOX_E_IPRT_ERROR, - tr("Cannot create S3 service handler")); - RTS3SetProgressCallback(hS3, pTask->uploadProgress, &pTask); - - /* Upload all files */ - for (list< pair >::const_iterator it1 = filesList.begin(); it1 != filesList.end(); ++it1) - { - const pair &s = (*it1); - char *pszFilename = RTPathFilename(s.first.c_str()); - /* Advance to the next operation */ - if (!pTask->progress.isNull()) - pTask->progress->setNextOperation(BstrFmt(tr("Uploading file '%s'"), pszFilename), s.second); - vrc = RTS3PutKey(hS3, bucket.c_str(), pszFilename, s.first.c_str()); - if (RT_FAILURE(vrc)) - { - if(vrc == VERR_S3_CANCELED) - break; - else if(vrc == VERR_S3_ACCESS_DENIED) - throw setError(E_ACCESSDENIED, - tr("Cannot upload file '%s' to S3 storage server (Access denied)"), pszFilename); - else if(vrc == VERR_S3_NOT_FOUND) - throw setError(VBOX_E_FILE_ERROR, - tr("Cannot upload file '%s' to S3 storage server (File not found)"), pszFilename); - else - throw setError(VBOX_E_IPRT_ERROR, - tr("Cannot upload file '%s' to S3 storage server (%Rrc)"), pszFilename, vrc); - } - } - - } - catch(HRESULT aRC) - { - rc = aRC; - } - /* Cleanup */ - if (hS3) - RTS3Destroy(hS3); - /* Delete all files which where temporary created */ - for (list< pair >::const_iterator it1 = filesList.begin(); it1 != filesList.end(); ++it1) - { - const pair &s = (*it1); - vrc = RTFileDelete(s.first.c_str()); - if(RT_FAILURE(vrc)) - rc = setError(VBOX_E_FILE_ERROR, - tr("Cannot delete file '%s'"), s.first.c_str()); - } - /* Delete the temporary directory */ - if (RTPathExists(pszTmpDir)) - { - vrc = RTDirRemove(pszTmpDir); - if(RT_FAILURE(vrc)) - rc = setError(VBOX_E_FILE_ERROR, - tr("Cannot delete temporary directory '%s'"), pszTmpDir); - } - if (pszTmpDir) - RTStrFree(pszTmpDir); - - pTask->rc = rc; - - if (!pTask->progress.isNull()) - pTask->progress->notifyComplete(rc); + task->rc = rc; + + if (!task->progress.isNull()) + task->progress->notifyComplete(rc); LogFlowFunc(("rc=%Rhrc\n", rc)); @@ -3894,63 +3545,4 @@ } -HRESULT Appliance::setUpProgressUpload(ComObjPtr &pProgress, const Bstr &bstrDescription) -{ - HRESULT rc; - - /* Create the progress object */ - pProgress.createObject(); - - // weigh the disk images according to their sizes - uint32_t ulTotalMB = 0; - uint32_t cDisks = 0; - list< ComObjPtr >::const_iterator it; - for (it = m->virtualSystemDescriptions.begin(); - it != m->virtualSystemDescriptions.end(); - ++it) - { - ComObjPtr vsdescThis = (*it); - /* One for every hard disk of the Virtual System */ - std::list avsdeHDs = vsdescThis->findByType(VirtualSystemDescriptionType_HardDiskImage); - std::list::const_iterator itH; - for (itH = avsdeHDs.begin(); - itH != avsdeHDs.end(); - ++itH) - { - const VirtualSystemDescriptionEntry *pHD = *itH; - ulTotalMB += pHD->ulSizeMB; - ++cDisks; - } - } - - ULONG cOperations = 1 + 1 + cDisks; // one op per disk plus 1 for the OVF & 1 plus to the temporary creation */ - - ULONG ulTotalOperationsWeight; - if (ulTotalMB) - { - m->ulWeightPerOperation = (ULONG)((double)ulTotalMB * 1 / 100); // use 1% of the progress for OVF file upload (we didn't know the size at this point) - ulTotalOperationsWeight = ulTotalMB + m->ulWeightPerOperation; - } - else - { - // no disks to export: - ulTotalOperationsWeight = 1; - m->ulWeightPerOperation = 1; - } - ULONG ulOVFCreationWeight = ((double)ulTotalOperationsWeight * 50.0 / 100.0); /* Use 50% for the creation of the OVF & the disks */ - ulTotalOperationsWeight += ulOVFCreationWeight; - - Log(("Setting up progress object: ulTotalMB = %d, cDisks = %d, => cOperations = %d, ulTotalOperationsWeight = %d, m->ulWeightPerOperation = %d\n", - ulTotalMB, cDisks, cOperations, ulTotalOperationsWeight, m->ulWeightPerOperation)); - - rc = pProgress->init(mVirtualBox, static_cast(this), - bstrDescription, - TRUE /* aCancelable */, - cOperations, // ULONG cOperations, - ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight, - bstrDescription, // CBSTR bstrFirstOperationDescription, - ulOVFCreationWeight); // ULONG ulFirstOperationWeight, - return rc; -} - /** * Called from the import and export background threads to synchronize the second Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 20044) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 20045) @@ -285,5 +285,4 @@ VirtualBoxImplExtra.cpp \ ApplianceImpl.cpp \ - VFSExplorerImpl.cpp \ MachineImpl.cpp \ SnapshotImpl.cpp \ Index: unk/src/VBox/Main/VFSExplorerImpl.cpp =================================================================== --- /trunk/src/VBox/Main/VFSExplorerImpl.cpp (revision 20044) +++ (revision ) @@ -1,672 +1,0 @@ -/* $Id$ */ -/** @file - * - * IVFSExplorer COM class implementations. - */ - -/* - * Copyright (C) 2009 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#include -#include -#include -#include - -#include -#include - -#include "VFSExplorerImpl.h" -#include "VirtualBoxImpl.h" -#include "ProgressImpl.h" - -#include "Logging.h" - -//////////////////////////////////////////////////////////////////////////////// -// -// VFSExplorer definitions -// -//////////////////////////////////////////////////////////////////////////////// - -/* opaque private instance data of VFSExplorer class */ -struct VFSExplorer::Data -{ - struct DirEntry - { - DirEntry(Utf8Str aName, FileType_T aType) - : name(aName) - , type(aType) {} - - Utf8Str name; - FileType_T type; - }; - - VFSType_T storageType; - Utf8Str strUsername; - Utf8Str strPassword; - Utf8Str strHostname; - Utf8Str strPath; - Utf8Str strBucket; - - std::list entryList; -}; - -DEFINE_EMPTY_CTOR_DTOR(VFSExplorer) - -/** - * VFSExplorer COM initializer. - * @param - * @return - */ -HRESULT VFSExplorer::init(VFSType_T aType, Utf8Str aFilePath, Utf8Str aHostname, Utf8Str aUsername, Utf8Str aPassword, VirtualBox *aVirtualBox) -{ - /* Enclose the state transition NotReady->InInit->Ready */ - AutoInitSpan autoInitSpan(this); - AssertReturn(autoInitSpan.isOk(), E_FAIL); - - /* Weak reference to a VirtualBox object */ - unconst(mVirtualBox) = aVirtualBox; - - /* initialize data */ - m = new Data; - - m->storageType = aType; - m->strPath = aFilePath; - m->strHostname = aHostname; - m->strUsername = aUsername; - m->strPassword = aPassword; - - if (m->storageType == VFSType_S3) - { - size_t bpos = aFilePath.find("/", 1); - if (bpos != Utf8Str::npos) - { - m->strBucket = aFilePath.substr(1, bpos - 1); /* The bucket without any slashes */ - aFilePath = aFilePath.substr(bpos); /* The rest of the file path */ - } - } - - /* Confirm a successful initialization */ - autoInitSpan.setSucceeded(); - - return S_OK; -} - -/** - * VFSExplorer COM uninitializer. - * @return - */ -void VFSExplorer::uninit() -{ - delete m; - m = NULL; -} - -/** - * Public method implementation. - * @param - * @return - */ -STDMETHODIMP VFSExplorer::COMGETTER(Path)(BSTR *aPath) -{ - if (!aPath) - return E_POINTER; - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock alock(this); - - Bstr bstrPath(m->strPath); - bstrPath.cloneTo(aPath); - - return S_OK; -} - -STDMETHODIMP VFSExplorer::COMGETTER(Type)(VFSType_T *aType) -{ - if (!aType) - return E_POINTER; - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock alock(this); - - *aType = m->storageType; - - return S_OK; -} - -struct VFSExplorer::TaskVFSExplorer -{ - enum TaskType - { - Update, - Delete - }; - - TaskVFSExplorer(TaskType aTaskType, VFSExplorer *aThat, Progress *aProgress) - : taskType(aTaskType), - pVFSExplorer(aThat), - progress(aProgress), - rc(S_OK) - {} - ~TaskVFSExplorer() {} - - int startThread(); - static int taskThread(RTTHREAD aThread, void *pvUser); - static int uploadProgress(unsigned uPercent, void *pvUser); - - TaskType taskType; - VFSExplorer *pVFSExplorer; - ComObjPtr progress; - HRESULT rc; - - /* task data */ - std::list filenames; -}; - -int VFSExplorer::TaskVFSExplorer::startThread() -{ - int vrc = RTThreadCreate(NULL, VFSExplorer::TaskVFSExplorer::taskThread, this, - 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, - "Explorer::Task"); - - ComAssertMsgRCRet(vrc, - ("Could not create taskThreadVFS (%Rrc)\n", vrc), E_FAIL); - - return vrc; -} - -/* static */ -DECLCALLBACK(int) VFSExplorer::TaskVFSExplorer::taskThread(RTTHREAD /* aThread */, void *pvUser) -{ - std::auto_ptr task(static_cast(pvUser)); - AssertReturn(task.get(), VERR_GENERAL_FAILURE); - - VFSExplorer *pVFSExplorer = task->pVFSExplorer; - - LogFlowFuncEnter(); - LogFlowFunc(("VFSExplorer %p\n", pVFSExplorer)); - - HRESULT rc = S_OK; - - switch(task->taskType) - { - case TaskVFSExplorer::Update: - { - if (pVFSExplorer->m->storageType == VFSType_File) - rc = pVFSExplorer->updateFS(task.get()); - else if (pVFSExplorer->m->storageType == VFSType_S3) - rc = pVFSExplorer->updateS3(task.get()); - break; - } - case TaskVFSExplorer::Delete: - { - if (pVFSExplorer->m->storageType == VFSType_File) - rc = pVFSExplorer->deleteFS(task.get()); - else if (pVFSExplorer->m->storageType == VFSType_S3) - rc = pVFSExplorer->deleteS3(task.get()); - break; - } - } - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; -} - -/* static */ -int VFSExplorer::TaskVFSExplorer::uploadProgress(unsigned uPercent, void *pvUser) -{ - VFSExplorer::TaskVFSExplorer* pTask = *(VFSExplorer::TaskVFSExplorer**)pvUser; - - if (pTask && - !pTask->progress.isNull()) - { - BOOL fCanceled; - pTask->progress->COMGETTER(Canceled)(&fCanceled); - if (fCanceled) - return -1; - pTask->progress->setCurrentOperationProgress(uPercent); - } - return VINF_SUCCESS; -} - -FileType_T VFSExplorer::RTToFileType(int aType) const -{ - FileType_T t; - switch(aType) - { - case RTDIRENTRYTYPE_UNKNOWN: t = FileType_Unknown; break; - case RTDIRENTRYTYPE_FIFO: t = FileType_Fifo; break; - case RTDIRENTRYTYPE_DEV_CHAR: t = FileType_DevChar; break; - case RTDIRENTRYTYPE_DIRECTORY: t = FileType_Directory; break; - case RTDIRENTRYTYPE_DEV_BLOCK: t = FileType_DevBlock; break; - case RTDIRENTRYTYPE_FILE: t = FileType_File; break; - case RTDIRENTRYTYPE_SYMLINK: t = FileType_SymLink; break; - case RTDIRENTRYTYPE_SOCKET: t = FileType_Socket; break; - case RTDIRENTRYTYPE_WHITEOUT: t = FileType_WhiteOut; break; - } - return t; -} - -HRESULT VFSExplorer::updateFS(TaskVFSExplorer *aTask) -{ - LogFlowFuncEnter(); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoWriteLock appLock(this); - - HRESULT rc = S_OK; - - std::list fileList; - char *pszPath = NULL; - PRTDIR pDir = NULL; - try - { - pszPath = RTStrDup(m->strPath.c_str()); - RTPathStripFilename(pszPath); - int vrc = RTDirOpen(&pDir, pszPath); - if (RT_FAILURE(vrc)) - throw setError(VBOX_E_FILE_ERROR, tr ("Can't open directory '%s'", pszPath)); - - if(aTask->progress) - aTask->progress->setCurrentOperationProgress(33); - RTDIRENTRY entry; - while (RT_SUCCESS(vrc)) - { - vrc = RTDirRead(pDir, &entry, NULL); - if (RT_SUCCESS(vrc)) - { - Utf8Str name(entry.szName); - if (name != "." && - name != "..") - fileList.push_back(VFSExplorer::Data::DirEntry(name, RTToFileType(entry.enmType))); - } - } - if(aTask->progress) - aTask->progress->setCurrentOperationProgress(66); - } - catch(HRESULT aRC) - { - rc = aRC; - } - - /* Clean up */ - if (pszPath) - RTStrFree(pszPath); - if (pDir) - RTDirClose(pDir); - - if(aTask->progress) - aTask->progress->setCurrentOperationProgress(99); - - /* Assign the result on success (this clears the old list) */ - if (rc == S_OK) - m->entryList.assign(fileList.begin(), fileList.end()); - - aTask->rc = rc; - - if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; -} - -HRESULT VFSExplorer::deleteFS(TaskVFSExplorer *aTask) -{ - LogFlowFuncEnter(); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoWriteLock appLock(this); - - HRESULT rc = S_OK; - - float fPercentStep = 100.0 / aTask->filenames.size(); - try - { - char szPath[RTPATH_MAX]; - std::list::const_iterator it; - size_t i = 0; - for (it = aTask->filenames.begin(); - it != aTask->filenames.end(); - ++it, ++i) - { - memcpy(szPath, m->strPath.c_str(), strlen(m->strPath.c_str()) + 1); - RTPathStripFilename(szPath); - RTPathAppend(szPath, sizeof(szPath), (*it).c_str()); - int vrc = RTFileDelete(szPath); - if (RT_FAILURE(vrc)) - throw setError(VBOX_E_FILE_ERROR, tr ("Can't delete file '%s'", szPath)); - if(aTask->progress) - aTask->progress->setCurrentOperationProgress(fPercentStep * i); - } - } - catch(HRESULT aRC) - { - rc = aRC; - } - - aTask->rc = rc; - - if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; -} - -HRESULT VFSExplorer::updateS3(TaskVFSExplorer *aTask) -{ - LogFlowFuncEnter(); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoWriteLock appLock(this); - - HRESULT rc = S_OK; - - RTS3 hS3 = NULL; - std::list fileList; - try - { - int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(), m->strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING); - if (RT_FAILURE(vrc)) - throw setError(E_FAIL, tr ("Can't open S3 storage service")); - - RTS3SetProgressCallback(hS3, VFSExplorer::TaskVFSExplorer::uploadProgress, &aTask); - /* Do we need the list of buckets or keys? */ - if (m->strBucket.isEmpty()) - { - PCRTS3BUCKETENTRY pBuckets = NULL; - vrc = RTS3GetBuckets(hS3, &pBuckets); - if (RT_FAILURE(vrc)) - throw setError(E_FAIL, tr ("Can't get buckets")); - - PCRTS3BUCKETENTRY pTmpBuckets = pBuckets; - while (pBuckets) - { - fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, FileType_Directory)); - pBuckets = pBuckets->pNext; - } - RTS3BucketsDestroy(pTmpBuckets); - } - else - { - PCRTS3KEYENTRY pKeys = NULL; - vrc = RTS3GetBucketKeys(hS3, m->strBucket, &pKeys); - if (RT_FAILURE(vrc)) - throw setError(E_FAIL, tr ("Can't get keys for bucket")); - - PCRTS3KEYENTRY pTmpKeys = pKeys; - while (pKeys) - { - Utf8Str name(pKeys->pszName); - fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, FileType_File)); - pKeys = pKeys->pNext; - } - RTS3KeysDestroy(pTmpKeys); - } - } - catch(HRESULT aRC) - { - rc = aRC; - } - - if (hS3 != NULL) - RTS3Destroy(hS3); - - /* Assign the result on success (this clears the old list) */ - if (rc == S_OK) - m->entryList.assign(fileList.begin(), fileList.end()); - - aTask->rc = rc; - - if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; -} - -HRESULT VFSExplorer::deleteS3(TaskVFSExplorer *aTask) -{ - LogFlowFuncEnter(); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoWriteLock appLock(this); - - HRESULT rc = S_OK; - - RTS3 hS3 = NULL; - float fPercentStep = 100.0 / aTask->filenames.size(); - try - { - int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(), m->strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING); - if (RT_FAILURE(vrc)) - throw setError(E_FAIL, tr ("Can't open S3 storage service")); - - RTS3SetProgressCallback(hS3, VFSExplorer::TaskVFSExplorer::uploadProgress, &aTask); - - std::list::const_iterator it; - size_t i = 0; - for (it = aTask->filenames.begin(); - it != aTask->filenames.end(); - ++it, ++i) - { - vrc = RTS3DeleteKey(hS3, m->strBucket.c_str(), (*it).c_str()); - if (RT_FAILURE(vrc)) - throw setError(VBOX_E_FILE_ERROR, tr ("Can't delete file '%s'", (*it).c_str())); - if(aTask->progress) - aTask->progress->setCurrentOperationProgress(fPercentStep * i); - } - } - catch(HRESULT aRC) - { - rc = aRC; - } - - aTask->rc = rc; - - if (hS3 != NULL) - RTS3Destroy(hS3); - - if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); - - LogFlowFunc(("rc=%Rhrc\n", rc)); - LogFlowFuncLeave(); - - return VINF_SUCCESS; -} - -STDMETHODIMP VFSExplorer::Update(IProgress **aProgress) -{ - CheckComArgOutPointerValid(aProgress); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock(this); - - HRESULT rc = S_OK; - - ComObjPtr progress; - try - { - Bstr progressDesc = BstrFmt(tr("Update directory info for '%s'"), - m->strPath.raw()); - /* Create the progress object */ - progress.createObject(); - - rc = progress->init(mVirtualBox, static_cast(this), - progressDesc, - TRUE /* aCancelable */); - if (FAILED(rc)) throw rc; - - /* Initialize our worker task */ - std::auto_ptr task(new TaskVFSExplorer(TaskVFSExplorer::Update, this, progress)); - - rc = task->startThread(); - if (FAILED(rc)) throw rc; - - task.release(); - } - catch (HRESULT aRC) - { - rc = aRC; - } - - if (SUCCEEDED(rc)) - /* Return progress to the caller */ - progress.queryInterfaceTo(aProgress); - - return rc; -} - -STDMETHODIMP VFSExplorer::EntryList(ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(FileType_T, aTypes)) -{ - if (ComSafeArrayOutIsNull(aNames) || - ComSafeArrayOutIsNull(aTypes)) - return E_POINTER; - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock alock(this); - - com::SafeArray sfaNames((ULONG)m->entryList.size()); - com::SafeArray sfaTypes((FileType_T)m->entryList.size()); - - std::list::const_iterator it; - size_t i = 0; - for (it = m->entryList.begin(); - it != m->entryList.end(); - ++it, ++i) - { - const VFSExplorer::Data::DirEntry &entry = (*it); - Bstr bstr(entry.name); - bstr.cloneTo(&sfaNames[i]); - sfaTypes[i] = entry.type; - } - - sfaNames.detachTo(ComSafeArrayOutArg(aNames)); - sfaTypes.detachTo(ComSafeArrayOutArg(aTypes)); - - return S_OK; -} - -STDMETHODIMP VFSExplorer::Exists(ComSafeArrayIn(IN_BSTR, aNames), ComSafeArrayOut(BSTR, aExists)) -{ - CheckComArgSafeArrayNotNull(aNames); - CheckComArgSafeArrayNotNull(aExists); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock alock(this); - - com::SafeArray sfaNames(ComSafeArrayInArg(aNames)); - std::list listExists; - - std::list::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) - { - if (entry.name == RTPathFilename(Utf8Str(sfaNames[a]))) - { - BSTR name; - Bstr(sfaNames[a]).cloneTo(&name); - listExists.push_back(name); - } - } - } - - com::SafeArray sfaExists(listExists); - sfaExists.detachTo(ComSafeArrayOutArg(aExists)); - - return S_OK; -} - -STDMETHODIMP VFSExplorer::Remove(ComSafeArrayIn(IN_BSTR, aNames), IProgress **aProgress) -{ - CheckComArgSafeArrayNotNull(aNames); - CheckComArgOutPointerValid(aProgress); - - AutoCaller autoCaller(this); - CheckComRCReturnRC(autoCaller.rc()); - - AutoReadLock(this); - - HRESULT rc = S_OK; - - com::SafeArray sfaNames(ComSafeArrayInArg(aNames)); - - ComObjPtr progress; - try - { - /* Create the progress object */ - progress.createObject(); - - rc = progress->init(mVirtualBox, static_cast(this), - Bstr(tr("Delete files")), - TRUE /* aCancelable */); - if (FAILED(rc)) throw rc; - - /* Initialize our worker task */ - std::auto_ptr task(new TaskVFSExplorer(TaskVFSExplorer::Delete, this, progress)); - - /* Add all filenames to delete as task data */ - for (size_t a=0; a < sfaNames.size(); ++a) - task->filenames.push_back(Utf8Str(sfaNames[a])); - - rc = task->startThread(); - if (FAILED(rc)) throw rc; - - task.release(); - } - catch (HRESULT aRC) - { - rc = aRC; - } - - if (SUCCEEDED(rc)) - /* Return progress to the caller */ - progress.queryInterfaceTo(aProgress); - - return rc; -} - Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 20044) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 20045) @@ -2890,101 +2890,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3140,5 +3043,5 @@ @@ -3323,16 +3226,4 @@ - - - - - - - - - - - - Index: /trunk/src/VBox/Main/include/ApplianceImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ApplianceImpl.h (revision 20044) +++ /trunk/src/VBox/Main/include/ApplianceImpl.h (revision 20045) @@ -75,12 +75,8 @@ /* IAppliance methods */ - /* Import methods */ STDMETHOD(Read)(IN_BSTR path); STDMETHOD(Interpret)(void); STDMETHOD(ImportMachines)(IProgress **aProgress); - /* Export methods */ - STDMETHOD(CreateVFSExplorer)(IN_BSTR aURI, IVFSExplorer **aExplorer); STDMETHOD(Write)(IN_BSTR format, IN_BSTR path, IProgress **aProgress); - STDMETHOD(GetWarnings)(ComSafeArrayOut(BSTR, aWarnings)); @@ -103,19 +99,12 @@ HRESULT searchUniqueDiskImageFilePath(Utf8Str& aName) const; HRESULT setUpProgress(ComObjPtr &pProgress, const Bstr &bstrDescription); - HRESULT setUpProgressUpload(ComObjPtr &pProgress, const Bstr &bstrDescription); void waitForAsyncProgress(ComObjPtr &pProgressThis, ComPtr &pProgressAsync); void addWarning(const char* aWarning, ...); - void parseURI(Utf8Str strUri, const Utf8Str &strProtocol, Utf8Str &strFilepath, Utf8Str &strHostname, Utf8Str &strUsername, Utf8Str &strPassword); - HRESULT writeImpl(int aFormat, Utf8Str aPath, ComObjPtr &aProgress); - struct TaskImportMachines; /* Worker thread for import */ static DECLCALLBACK(int) taskThreadImportMachines(RTTHREAD thread, void *pvUser); - struct TaskWriteOVF; /* Worker threads for export */ - static DECLCALLBACK(int) taskThreadWriteOVF(RTTHREAD aThread, void *pvUser); - - int writeFS(TaskWriteOVF *pTask); - int writeS3(TaskWriteOVF *pTask); + struct TaskWriteOVF; /* Worker thread for export */ + static DECLCALLBACK(int) taskThreadWriteOVF(RTTHREAD thread, void *pvUser); friend class Machine; Index: unk/src/VBox/Main/include/VFSExplorerImpl.h =================================================================== --- /trunk/src/VBox/Main/include/VFSExplorerImpl.h (revision 20044) +++ (revision ) @@ -1,102 +1,0 @@ -/* $Id$ */ - -/** @file - * - * VirtualBox COM class implementation - */ - -/* - * Copyright (C) 2009 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#ifndef ____H_VFSEXPLORERIMPL -#define ____H_VFSEXPLORERIMPL - -#include "VirtualBoxBase.h" - -class VirtualBox; - -class ATL_NO_VTABLE VFSExplorer : - public VirtualBoxBaseNEXT, - public VirtualBoxSupportErrorInfoImpl , - public VirtualBoxSupportTranslation , - VBOX_SCRIPTABLE_IMPL(IVFSExplorer) -{ - VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (VFSExplorer) - - DECLARE_NOT_AGGREGATABLE(VFSExplorer) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(VFSExplorer) - COM_INTERFACE_ENTRY(ISupportErrorInfo) - COM_INTERFACE_ENTRY(IVFSExplorer) - COM_INTERFACE_ENTRY(IDispatch) - END_COM_MAP() - - NS_DECL_ISUPPORTS - - DECLARE_EMPTY_CTOR_DTOR(VFSExplorer) - - // public initializer/uninitializer for internal purposes only - HRESULT FinalConstruct() { return S_OK; } - void FinalRelease() { uninit(); } - - HRESULT init(VFSType_T aType, Utf8Str aFilePath, Utf8Str aHostname, Utf8Str aUsername, Utf8Str aPassword, VirtualBox *aVirtualBox); - void uninit(); - - // for VirtualBoxSupportErrorInfoImpl - static const wchar_t *getComponentName() { return L"VFSExplorer"; } - - /* IVFSExplorer properties */ - STDMETHOD(COMGETTER(Path))(BSTR *aPath); - STDMETHOD(COMGETTER(Type))(VFSType_T *aType); - - /* IVFSExplorer methods */ - STDMETHOD(Update)(IProgress **aProgress); - - STDMETHOD(EntryList)(ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(FileType_T, aTypes)); - - STDMETHOD(Exists)(ComSafeArrayIn(IN_BSTR, aNames), ComSafeArrayOut(BSTR, aExists)); - - STDMETHOD(Remove)(ComSafeArrayIn(IN_BSTR, aNames), IProgress **aProgress); - - /* todo: later - STDMETHOD(Cd)(IN_BSTR aDir, IProgress **aProgress); - STDMETHOD(CdUp)(IProgress **aProgress); - - STDMETHOD(MkDir)(IN_BSTR aDir, IProgress **aProgress); - STDMETHOD(RmDir)(IN_BSTR aDir, IProgress **aProgress); - */ - -private: - /* Private member vars */ - const ComObjPtr mVirtualBox; - - struct TaskVFSExplorer; /* Worker thread helper */ - struct Data; - Data *m; - - /* Private member methods */ - FileType_T RTToFileType(int aType) const; - - HRESULT updateFS(TaskVFSExplorer *aTask); - HRESULT deleteFS(TaskVFSExplorer *aTask); - HRESULT updateS3(TaskVFSExplorer *aTask); - HRESULT deleteS3(TaskVFSExplorer *aTask); -}; - -#endif /* ____H_VFSEXPLORERIMPL */ - Index: /trunk/src/VBox/Main/xpcom/server.cpp =================================================================== --- /trunk/src/VBox/Main/xpcom/server.cpp (revision 20044) +++ /trunk/src/VBox/Main/xpcom/server.cpp (revision 20045) @@ -74,5 +74,4 @@ #include #include -#include #include #include @@ -111,7 +110,4 @@ NS_DECL_CLASSINFO(Machine) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Machine, IMachine) - -NS_DECL_CLASSINFO(VFSExplorer) -NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VFSExplorer, IVFSExplorer) NS_DECL_CLASSINFO(Appliance)