FCL/sf/mw/remoteconn: comparison mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp

equal deleted inserted replaced

-:aabe5387f5ce
+:1b39655331a3
 #include "cmtpsendobjectinfo.h"
 #include "mtpdppanic.h"
 #include "cmtpfsexclusionmgr.h"
 #include "cmtpdataprovidercontroller.h"
 #include "cmtpdataprovider.h"
+#include "cmtpstoragemgr.h"
 // Class constants.
 __FLOG_STMT(_LIT8(KComponent,"SendObjectInfo");)
 Destructor
 */
 EXPORT_C CMTPSendObjectInfo::~CMTPSendObjectInfo()
 {
 __FLOG(_L8("~CMTPSendObjectInfo - Entry"));
+__FLOG_2(_L8("iProgress:%d NoRollback:%d"),iProgress,iNoRollback);
 if ((iProgress == EObjectInfoSucceed ||
 iProgress == EObjectInfoFail ||
 iProgress == EObjectInfoInProgress) && !iNoRollback)
 {
 // Not finished SendObjectInfo/PropList SendObject pair detected.
 if (IsTooLarge(iObjectSize))
 {
 result = EMTPRespCodeObjectTooLarge;
 }
-//File size is limited to KMaxTInt64 that is 8ExaBytes
-//if the object size is more,then report this error.
-if (!CanStoreFileL(iStorageId, iObjectSize)||(iObjectSize > (KMaxTInt64)))
-{
-result = EMTPRespCodeStoreFull;
-}
 }
 }
 // If the previous request is not SendObjectInfo or SendObjectPropList, SendObject fails
 if (result == EMTPRespCodeOK && iOperationCode == EMTPOpCodeSendObject)
 }
 iProgress = EObjectInfoSucceed;
 result = EFalse;
 }
-__FLOG(_L8("DoHandleCompletingPhaseL - Exit"));
+__FLOG_2(_L8("DoHandleCompletingPhaseL - Exit result:%d progress:%d"),result,iProgress);
 return result;
 }
 /**
 if (IsTooLarge(iObjectSize))
 {
 SendResponseL(EMTPRespCodeObjectTooLarge);
 result = EFalse;
 }
-if(result && !CanStoreFileL(iStorageId, iObjectSize))
-{
-SendResponseL(EMTPRespCodeStoreFull);
-result = EFalse;
-}
 }
 if (result)
 {
 iProtectionStatus = iObjectInfo->Uint16L(CMTPTypeObjectInfo::EProtectionStatus);
 TRAPD(err, CreateFsObjectL());
 if (err != KErrNone)
 {
+__FLOG_1(_L8("Fail to create fs object %d"),err);
 SendResponseL(ErrorToMTPError(err));
+result = EFalse;
 }
 else
 {
 ReserveObjectL();
 }
 TRAPD(err, CreateFsObjectL());
 if (err != KErrNone)
 {
+__FLOG_1(_L8("Fail to create fs object %d"),err);
 SendResponseL(ErrorToMTPError(err));
+result = EFalse;
 }
 else
 {
 ReserveObjectL();
 }
 	iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObject);
 	TParsePtrC file( iFullPath );
 	_LIT( KTxtExtensionODF, ".odf" );
 	if ( file.ExtPresent() && file.Ext().CompareF(KTxtExtensionODF)==0 )
-	    {;
+	    {
 	    TUint32 DpId = iFramework.DataProviderId();
 	    DpId = iDpSingletons.MTPUtility().GetDpId(file.Ext().Mid(1),KNullDesC);
 	    //The data provider which owns all mimetypes of a file extension is not found
 	    if ( 255 == DpId )
 	        {
 #endif
 return result;
 }
 /**
-Check if we can store the file on the storage
-@return ETrue if yes, otherwise EFalse
-*/
-TBool CMTPSendObjectInfo::CanStoreFileL(TUint32 aStorageId, TInt64 aObjectSize) const
-{
-__FLOG(_L8("CanStoreFileL - Entry"));
-TBool result(ETrue);
-if (aStorageId == KMTPStorageDefault)
-{
-aStorageId = iFramework.StorageMgr().DefaultStorageId();
-}
-TInt drive( iFramework.StorageMgr().DriveNumber(aStorageId) );
-User::LeaveIfError(drive);
-TVolumeInfo volumeInfo;
-User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive));
-if (volumeInfo.iFree < aObjectSize)
-{
-result = EFalse;
-}
-__FLOG_VA((_L8("Result = %d"), result));
-__FLOG(_L8("CanStoreFileL - Exit"));
-return result;
-}
-/**
 Check if the object is too large
 @return ETrue if yes, otherwise EFalse
 */
 TBool CMTPSendObjectInfo::IsTooLarge(TUint64 aObjectSize) const
 {
 {
 TMTPResponseCode ret = EMTPRespCodeOK;
 const TUint32 storeId(Request().Uint32(TMTPTypeRequest::ERequestParameter1));
 const TUint32 parentHandle(Request().Uint32(TMTPTypeRequest::ERequestParameter2));
-// this checking is only valid when the second parameter is not a special value.
+if( (EMTPOpCodeSendObjectPropList == iOperationCode) || (EMTPOpCodeSendObjectInfo == iOperationCode) )
-if (parentHandle != KMTPHandleAll && parentHandle != KMTPHandleNone)
+	{
-{
+		if(storeId != KMTPStorageDefault)
-//does not take owernship
+			{
-CMTPObjectMetaData* parentObjInfo = iRequestChecker->GetObjectInfo(parentHandle);
+			if(!iSingletons.StorageMgr().IsReadWriteStorage(storeId))
-__ASSERT_DEBUG(parentObjInfo, Panic(EMTPDpObjectNull));
+				{
+				ret = EMTPRespCodeStoreReadOnly;
-if (parentObjInfo->Uint(CMTPObjectMetaData::EStorageId) != storeId)
+				}
-{
+			}
-ret = EMTPRespCodeInvalidObjectHandle;
-}
+		 // this checking is only valid when the second parameter is not a special value.
-}
+		if ((EMTPRespCodeOK == ret) && (parentHandle != KMTPHandleAll && parentHandle != KMTPHandleNone))
+			{
+			//does not take owernship
+			CMTPObjectMetaData* parentObjInfo = iRequestChecker->GetObjectInfo(parentHandle);
+			__ASSERT_DEBUG(parentObjInfo, Panic(EMTPDpObjectNull));
+			if (parentObjInfo->Uint(CMTPObjectMetaData::EStorageId) != storeId)
+				{
+				ret = EMTPRespCodeInvalidObjectHandle;
+				}
+			}
+	}
 return ret;
 }
 /**
 Reserves space for and assigns an object handle to the received object, then
 void CMTPSendObjectInfo::Rollback()
 {
 if(iIsFolder)
 {
-__FLOG(_L8("It is a folder cancel process."));
+__FLOG(_L8("Rollback the dir created."));
 iFramework.Fs().RmDir(iFullPath);
 // If it is folder, delete it from MTP database, i.e ObjectStore.
 TRAP_IGNORE(iFramework.ObjectMgr().RemoveObjectL(iFullPath));
 }
 else
 {
-__FLOG(_L8("It is a file cancel process."));
+__FLOG(_L8("Rollback the file created."));
+delete iFileReceived;
+iFileReceived = NULL;
 // Delete this object from file system.
 iFramework.Fs().Delete(iFullPath);
 TRAP_IGNORE(iFramework.ObjectMgr().UnreserveObjectHandleL(*iReceivedObject));
 }
 }
 resp = EMTPRespCodeAccessDenied;
 break;
 case KErrDiskFull:
 resp = EMTPRespCodeStoreFull;
+break;
+default:
 break;
 }
 return resp;
 }
 {
 entry.iAtt |= KEntryAttReadOnly;
 }
 User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt));
 }
+if(iDateMod != NULL && iDateMod->Length())
+{
+TTime modifiedTime;
+iDpSingletons.MTPUtility().MTPTimeStr2TTime(*iDateMod, modifiedTime);
+User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime));
+}
 iReceivedObject->SetDesCL(CMTPObjectMetaData::EName, iName);
 __FLOG(_L8("SetPropertiesL - Exit"));
 }

changeset 18	1b39655331a3
parent 17	aabe5387f5ce
child 22	a5c0bb5018eb
child 29	3ae5cb0b4c02