FCL/sf/mw/mmappfw: comparison mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataproviderenumerator.cpp

equal deleted inserted replaced

-:a05c44bc3c61
+:d881023c13eb
 #include "mmmtpdplogger.h"
 #include "mmmtpdputility.h"
 #include "cmmmtpdpaccesssingleton.h"
 #include "cmmmtpdpmetadataaccesswrapper.h"
+#if defined(_DEBUG) || defined(MMMTPDP_PERFLOG)
+_LIT( KDirectoryScan, "DirectoryScan" );
+_LIT( KFormatFilter, "FormatFilter" );
+_LIT( KObjectManagerObjectUid, "ObjectManagerObjectUid" );
+_LIT( KObjectManagerInsert, "ObjectManagerInsert" );
+#endif
 // Unit: microsecond
 const TInt KThresholdOfEnumerationLoopDuration = 1000 * 1000; // microsecond
 const TInt KMTPDriveGranularity = 5;
 const TInt KMediaDpArrayGranularity = 2;
 User::Invariant() );
 TFileName root( storage.DesC( CMTPStorageMetaData::EStorageSuid ) );
 PRINT2( _L("MM MTP <> CMediaMtpDataProviderEnumerator::ScanStorageL aStorageId = 0x%x, StorageSuid = %S"), aStorageId, &root );
-iParentHandle = KMTPHandleNone;
+iParentHandle = KMTPHandleNoParent;
 iPath.Set( root, NULL, NULL);
 iDir.Close();
 User::LeaveIfError( iDir.Open( iFramework.Fs(),
 iPath.DriveAndPath(),
 KEntryAttNormal | KEntryAttDir ) );
 {
 // Round trip suppport
 const CMTPStorageMetaData& storage( iFramework.StorageMgr().StorageL( iStorages[0] ) );
 TFileName root( storage.DesC( CMTPStorageMetaData::EStorageSuid ) );
 GetModifiedContentL( root );
-iDataProvider.GetWrapperL().UpdateMusicCollectionL();
+TRAPD( err, iDataProvider.GetWrapperL().UpdateMusicCollectionL() );
+if ( err != KErrNone )
+{
+PRINT1( _L("MM MTP <> ScanNextStorageL, UpdateMusicCollectionL err =%d "), err );
+}
 iStorages.Remove( 0 );
 ScanStorageL( iStorages[0] );
 }
 else
 {
 // Round trip suppport
 const CMTPStorageMetaData& storage( iFramework.StorageMgr().StorageL( iStorages[0] ) );
 TFileName root( storage.DesC( CMTPStorageMetaData::EStorageSuid ) );
 GetModifiedContentL( root );
 iPath.PopDir();
 iDirStack.Remove( count - 1 );
 delete entry;
 entry = NULL;
 iDir.Close();
 // Scan the next directory of the parent
 ScanNextDirL();
 }
 // Going into a subdirectory of current
 else
 PRINT( _L( "MM MTP => CMediaMtpDataProviderEnumerator::ScanNextSubdirL" ) );
 // A empty (non-constructed) TEntry is our marker telling us to pop a directory
 // from iPath when we see this
 TEntry* entry = new TEntry( TEntry() );
 User::LeaveIfNull( entry );
 iDirStack.AppendL( entry );
 // Leave with KErrNotFound if we don't find the object handle since it shouldn't be on the
 // dirstack if the entry wasn't added
 TPtrC suid = iPath.DriveAndPath().Left( iPath.DriveAndPath().Length() );
 // Update the current parenthandle with object of the directory
 PERFLOGSTART( KObjectManagerObjectUid );
 iParentHandle = iFramework.ObjectMgr().HandleL( suid );
 PERFLOGSTOP( KObjectManagerObjectUid );
-PRINT1( _L( "MM MTP <> iParentHandle = 0x%Lx" ), iParentHandle );
+PRINT1( _L( "MM MTP <> iParentHandle = 0x%x" ), iParentHandle );
 // Kick-off a scan of the next directory
 iDir.Close();
 TInt err = iDir.Open( iFramework.Fs(),
 //
 // -----------------------------------------------------------------------------
 //
 TInt CMediaMtpDataProviderEnumerator::RunError( TInt aError )
 {
-PRINT1( _L( "MM MTP <> CMediaMtpDataProviderEnumerator::RunError with error %d" ), aError );
+if ( aError != KErrNone )
+PRINT1( _L( "MM MTP <> CMediaMtpDataProviderEnumerator::RunError with error %d" ), aError );
 TRAP_IGNORE( SignalCompleteL( iDataProvider ) );
 return KErrNone;
 }
 //
 void CMediaMtpDataProviderEnumerator::ProcessEntriesL()
 {
 PRINT( _L( "MM MTP => CMediaMtpDataProviderEnumerator::ProcessEntriesL" ) );
-TBuf<KMaxFileName> path = iPath.DriveAndPath();
+TFileName path = iPath.DriveAndPath();
 while ( !IsOverThreshold() && iFirstUnprocessed < iEntries.Count() )
 {
 const TEntry& entry = iEntries[iFirstUnprocessed];
-path.Append( entry.iName );
-PRINT1( _L( "MM MTP <> path = %S" ), &path );
 TInt len = entry.iName.Length();
-if ( entry.IsDir() )
+// Skip object with too long name
-{
+if ( KMaxFileName >= path.Length() + len )
-path.Append( '\\' );
+{
-++len;
+path.Append( entry.iName );
+PRINT1( _L( "MM MTP <> path = %S" ), &path );
-// we don't need to process folder, just remember
-// the folder
+if ( entry.IsDir() )
-TEntry* dirEntry = new TEntry( entry );
+{
-User::LeaveIfNull( dirEntry );
+path.Append( '\\' );
-iDirStack.AppendL( dirEntry );
+++len;
-}
-else if ( IsFileAccepted( path ) )
+// we don't need to process folder, just remember
-{
+// the folder
-AddEntryL( path );
+TEntry* dirEntry = new TEntry( entry );
-}
+User::LeaveIfNull( dirEntry );
+iDirStack.AppendL( dirEntry );
-// Remove filename part
+}
-path.SetLength( path.Length() - len );
+else if ( IsFileAccepted( path ) )
+{
+AddEntryL( path );
+}
+// Remove filename part
+path.SetLength( path.Length() - len );
+}
 iFirstUnprocessed++;
 }
 StartEnumerationCount();
 // Is the file format is supported by this Dp
 // -----------------------------------------------------------------------------
 //
 TBool CMediaMtpDataProviderEnumerator::IsFileAccepted( const TDesC& aFullFileName )
 {
-PERFLOGSTART(KFormatFilter);
+PERFLOGSTART( KFormatFilter );
 iFormatCode = GetObjectFormatCode( aFullFileName );
 PRINT1( _L( "MM MTP <> CMediaMtpDataProviderEnumerator::IsFileAcceptedL formatCode = 0x%x" ), iFormatCode );
 TBool accepted = EFalse;
 TInt count = sizeof( KMediaMtpDataProviderSupportedFormats ) / sizeof( TUint16 );
 for ( TInt i = 0; i < count; i++ )
 accepted = ETrue;
 break;
 }
 }
-PERFLOGSTOP(KFormatFilter);
+PERFLOGSTOP( KFormatFilter );
 return accepted;
 }
 // -----------------------------------------------------------------------------
 // CMediaDpMtpEnumerator::StartEnumerationCount
 PRINT( _L( "MM MTP => CMediaMtpDataProviderEnumerator::GetModifiedContentL" ) );
 TInt arrayCount = 0;
 CDesCArray* modifiedContents = new ( ELeave ) CDesCArrayFlat( KMTPDriveGranularity );
 CleanupStack::PushL( modifiedContents ); // + modifiedContents
-iDataProvider.GetWrapperL().GetModifiedContentL( aStorageRoot, arrayCount, *modifiedContents );
+TRAPD( err, iDataProvider.GetWrapperL().GetModifiedContentL( aStorageRoot, arrayCount, *modifiedContents ) );
+if ( err != KErrNone )
+PRINT1( _L("MM MTP <> GetModifiedContentL err =%d "), err );
 if ( arrayCount > 0 )
 {
 CMTPObjectMetaData* object = CMTPObjectMetaData::NewLC();   // + object
 for ( TInt i = 0; i < arrayCount; i++ )

changeset 25	d881023c13eb
parent 0	a2952bb97e68
child 32	edd273b3192a