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

equal deleted inserted replaced

-:d0791faffa3f
+:aabe5387f5ce
 #include "cmtpfsexclusionmgr.h"
 #include "cmtpfsenumerator.h"
 #include "mmtpenumerationcallback.h"
 #include "cmtpdataprovidercontroller.h"
 #include "cmtpdataprovider.h"
+#include "mtpframeworkconst.h"
 // Class constants.
 __FLOG_STMT(_LIT8(KComponent,"FSEnumerator");)
+const TUint KMTPMaxFullFileName = 259;
+/*
+*
+*/
+#define KMAX_FILECOUNT_ENUMERATINGPHASE1 5000
 /**
 * the files should not be owned by any dp.
 */
 #define FILES_OWNED_BY_NONE             0
 /**
 Kick off the enumeration on the specified storage
 @param aStorageId storage to be enumerated
 */
-EXPORT_C void CMTPFSEnumerator::StartL(TUint32 aStorageId)
+EXPORT_C void CMTPFSEnumerator::StartL(TUint32 aStorageId, TBool aOnlyRoot)
 	{
 	__ASSERT_DEBUG(!IsActive(), User::Invariant());
+	iNumOfFoldersAndFiles = 0;
+	iOnlyScanRoot = aOnlyRoot;
+	__FLOG_VA((_L8("iOnlyScanRoot == %d "), iOnlyScanRoot));
 	MMTPStorageMgr& storageMgr(iFramework.StorageMgr());
 	if (aStorageId == KMTPStorageAll)
 	    {
 // Retrieve the available logical StorageIDs
 RPointerArray<const CMTPStorageMetaData> storages;
 				 }
 			 }
 		}
 	else
 		{
+		if((!iIsFileEnumerator) &&(iNumOfFoldersAndFiles > KMAX_FILECOUNT_ENUMERATINGPHASE1))
+			{
+			iSingletons.DpController().SetNeedEnumeratingPhase2(ETrue);
+			}
 		iCallback.NotifyEnumerationCompleteL(iStorageId, KErrNone);
 		TMTPTypeEvent event;
 		event.SetUint16(TMTPTypeEvent::EEventCode, EMTPEventCodeUnreportedStatus);
 	if ( iExclusionMgr.IsFolderAcceptedL(root, aStorageId) )
 	    {
 	    iParentHandle = KMTPHandleNoParent;
 	    iPath.Set(root, NULL, NULL);
-	    User::LeaveIfError(iDir.Open(iFramework.Fs(), iPath.DriveAndPath(), KEntryAttNormal | KEntryAttDir));
+	    User::LeaveIfError(iDir.Open(iFramework.Fs(), iPath.DriveAndPath(), KEntryAttNormal | KEntryAttHidden | KEntryAttDir));
 	    ScanDirL();
 	    }
 	else
 	    {
 	    TRequestStatus* status = &iStatus;
 		}
 	else
 		{
 		// We are done
 		iStorages.Reset();
+		if((!iIsFileEnumerator) &&(iNumOfFoldersAndFiles > KMAX_FILECOUNT_ENUMERATINGPHASE1))
+			{
+			iSingletons.DpController().SetNeedEnumeratingPhase2(ETrue);
+			}
 		iCallback.NotifyEnumerationCompleteL(iStorageId, KErrNone);
 		}
 	__FLOG_VA(_L8("ScanNextStorageL - exit"));
 	}
 void CMTPFSEnumerator::ScanNextSubdirL()
 	// Update the current parentId with object of the directory
 	iParentHandle = iFramework.ObjectMgr().HandleL(suid);
 	// Kick-off a scan of the next directory
 	iDir.Close();
-	User::LeaveIfError(iDir.Open(iFramework.Fs(), iPath.DriveAndPath(), KEntryAttNormal | KEntryAttDir));
+	User::LeaveIfError(iDir.Open(iFramework.Fs(), iPath.DriveAndPath(), KEntryAttNormal | KEntryAttHidden | KEntryAttDir));
 	ScanDirL();
 	__FLOG_VA(_L8("ScanNextSubdirL - exit"));
 	}
 /**
 void CMTPFSEnumerator::ScanNextL()
 	{
 	__FLOG_VA(_L8("ScanNextL - entry"));
 	TInt count = iDirStack.Count();
-	if (count == 0)
+	if ((count == 0) || iOnlyScanRoot )
 		{
 		// No more directories on the stack, try the next storage
 		ScanNextStorageL();
 		}
 	else
 TInt CMTPFSEnumerator::RunError(TInt aError)
 	{
 	__FLOG_VA((_L8("RunError - entry with error %d"), aError));
 	 if(!iFramework.StorageMgr().ValidStorageId(iStorages[0]))
 		 {
+		 __FLOG_VA((_L8("Invalid StorageID = %d"),iStorages[0] ));
 		 if (iStorages.Count()>1)
 			 {
 			 //Not necessary to process any entry on the storage, since the storage removed.
 			 //Then need to start from root dir of next storage if there is.
 			 //So, the dir stack is popped to bottom.
 	{
 	iSingletons.OpenL();
 	iDpSingletons.OpenL(iFramework);
 	iObject = CMTPObjectMetaData::NewL();
 	iDpID = iFramework.DataProviderId();
+	iIsFileEnumerator = (KMTPFileDPID == iDpID);
 	}
 /**
 Iterates iEntries adding entries as needed to object manager and iDirStack.
 */
 void CMTPFSEnumerator::ProcessEntriesL()
 	{
-	const TUint KMTPMaxFullFileName = 259;
 	TBuf<KMTPMaxFullFileName> path = iPath.DriveAndPath();
 	// Start looping through entries at where we left off
 	TInt count = iEntries.Count() - iFirstUnprocessed;
 	// Process no more than KProcessLimit entries
 	count = Min(count, iProcessLimit);
 	iFirstUnprocessed += count;
+	if(!iIsFileEnumerator)
+		{
+		iNumOfFoldersAndFiles +=count;
+		}
 	for (TInt i = (iFirstUnprocessed - count); i < iFirstUnprocessed; ++i)
 		{
 		const TEntry& entry = iEntries[i];
 		path.Append(entry.iName);
 			if (iExclusionMgr.IsFolderAcceptedL(path, iStorages[0]))
 				{
 				path.Append('\\');
 				++len;
 				format = EMTPFormatCodeAssociation;
-				AddEntryL(path, handle, format, iDpID, entry);
+				AddEntryL(path, handle, format, iDpID, entry, iStorages[0], iParentHandle);
 				iDirStack.AppendL(entry);
 				}
 			}
 		else if ( iExclusionMgr.IsFileAcceptedL(path,iStorages[0]) )
 			{
 			format = EMTPFormatCodeUndefined;
-			AddEntryL(path, handle, format, iDpID, entry);
+			AddEntryL(path, handle, format, iDpID, entry, iStorages[0], iParentHandle);
 			}
 		else if ( parse.ExtPresent() )
 		    {
 		    switch(iDpSingletons.MTPUtility().GetEnumerationFlag(parse.Ext().Mid(1)))
 		        {
 case MISSED_FILES_OWNED_BY_FILE_DP:
 if (KMTPHandleNone == iFramework.ObjectMgr().HandleL(path))
 {
 format = EMTPFormatCodeUndefined;
-AddEntryL(path, handle, format, iDpID, entry);
+AddEntryL(path, handle, format, iDpID, entry, iStorages[0], iParentHandle);
 }
 break;
 case MISSED_FILES_OWNED_BY_OTHER_DP:
 if (KMTPHandleNone == iFramework.ObjectMgr().HandleL(path))
 {
 format = iDpSingletons.MTPUtility().GetFormatByExtension(parse.Ext().Mid(1));
 TUint32 DpId = iDpSingletons.MTPUtility().GetDpId(parse.Ext().Mid(1), KNullDesC);
-AddFileEntryForOtherDpL(path, handle, format, DpId, entry);
+AddFileEntryForOtherDpL(path, handle, format, DpId, entry, iStorages[0], iParentHandle);
 }
 break;
 case FILES_OWNED_BY_OTHER_DP:
 {
 format = iDpSingletons.MTPUtility().GetFormatByExtension(parse.Ext().Mid(1));
 TUint32 DpId = iDpSingletons.MTPUtility().GetDpId(parse.Ext().Mid(1), KNullDesC);
-AddFileEntryForOtherDpL(path, handle, format, DpId, entry);
+AddFileEntryForOtherDpL(path, handle, format, DpId, entry, iStorages[0], iParentHandle);
 }
 break;
 //          case FILES_OWNED_BY_NONE:
 default:
 Add a file entry to the object store
 @param aEntry    The file Entry to be added
 @param aPath    The full path name of the entry
 @return MTP object handle, or KMTPHandleNone if entry was not accepted
 */
-void CMTPFSEnumerator::AddEntryL(const TDesC& aPath, TUint32 &aHandle, TMTPFormatCode format, TUint32 aDPId, const TEntry& aEntry)
+void CMTPFSEnumerator::AddEntryL(const TDesC& aPath, TUint32 &aHandle, TMTPFormatCode format, TUint32 aDPId, const TEntry& aEntry, TUint32 aStorageId, TUint32 aParentHandle)
 	{
 #ifdef __FLOG_ACTIVE
 	TBuf8<KMaxFileName> tmp;
 	tmp.Copy(aPath);
 {
 aHandle = KMTPHandleNone;
 iObject->SetUint(CMTPObjectMetaData::EDataProviderId, aDPId);
 iObject->SetUint(CMTPObjectMetaData::EFormatCode, format);
-iObject->SetUint(CMTPObjectMetaData::EStorageId, iStorages[0]);
+iObject->SetUint(CMTPObjectMetaData::EStorageId, aStorageId);
 iObject->SetDesCL(CMTPObjectMetaData::ESuid, aPath);
 iObject->SetUint(CMTPObjectMetaData::EFormatSubCode, assoc);
-iObject->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle);
+iObject->SetUint(CMTPObjectMetaData::EParentHandle, aParentHandle);
 iObject->SetUint(CMTPObjectMetaData::ENonConsumable, EMTPConsumable);
 iObject->SetDesCL(CMTPObjectMetaData::EName, name);
 iFramework.ObjectMgr().InsertObjectL(*iObject);
 }
 	__FLOG_VA(_L8("AddEntryL - exit"));
 	}
-void CMTPFSEnumerator::AddFileEntryForOtherDpL(const TDesC& aPath, TUint32 &aHandle, TMTPFormatCode format, TUint32 aDPId, const TEntry& /*aEntry*/)
+void CMTPFSEnumerator::AddFileEntryForOtherDpL(const TDesC& aPath, TUint32 &aHandle, TMTPFormatCode format, TUint32 aDPId, const TEntry& /*aEntry*/, TUint32 aStorageId, TUint32 aParentHandle)
 {
 #ifdef __FLOG_ACTIVE
 TBuf8<KMaxFileName> tmp;
 tmp.Copy(aPath);
 aHandle = KMTPHandleNone;
 iObject->SetUint(CMTPObjectMetaData::EDataProviderId, aDPId);
 iObject->SetUint(CMTPObjectMetaData::EFormatCode, format);
-iObject->SetUint(CMTPObjectMetaData::EStorageId, iStorages[0]);
+iObject->SetUint(CMTPObjectMetaData::EStorageId, aStorageId);
 iObject->SetDesCL(CMTPObjectMetaData::ESuid, aPath);
 iObject->SetUint(CMTPObjectMetaData::EFormatSubCode, assoc);
-iObject->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle);
+iObject->SetUint(CMTPObjectMetaData::EParentHandle, aParentHandle);
 iObject->SetUint(CMTPObjectMetaData::ENonConsumable, EMTPConsumable);
 iObject->SetDesCL(CMTPObjectMetaData::EName, name);
 iFramework.ObjectMgr().InsertObjectL(*iObject);
 __FLOG_VA(_L8("AddEntryL - exit"));
 }
 void CMTPFSEnumerator::NotifyObjectAddToDP(const TUint32 aHandle,const TUint DpId)
 {
 iSingletons.DpController().NotifyDataProvidersL(DpId,EMTPObjectAdded,(TAny*)&aHandle);
 }

changeset 17	aabe5387f5ce
parent 0	d0791faffa3f
child 20	6e82ae192c3a