MCL/sf/mw/mds: comparison harvester/monitorplugins/mdsfileserverplugin/src/mdsfileserverplugin.cpp

equal deleted inserted replaced

-:9f21bab39f42
+:4a4892eec172
 #include "mdsfileserverplugin.h"
 #include "harvesterlog.h"
 #include "mdsutils.h"
 _LIT( KMdsFileServerPlugin, "MdsFileServerPlugin" );
+_LIT( KExludedThumbPath, "\\_PAlbTN\\");
+_LIT( KExludedMediaArtPath, "\\.mediaartlocal\\");
 /* Server name */
 _LIT( KHarvesterServerName, "HarvesterServer" );
 const TInt KCleanQueueTreshold( 1000 );
 //
 CMdsFileServerPlugin::~CMdsFileServerPlugin()
 {
 WRITELOG( "CMdsFileServerPlugin::~CMdsFileServerPlugin()" );
-TRAP_IGNORE( DisableL() );
+#ifdef _DEBUG
-iFsSession.Close();
+TRAPD( error, DisableL() );
+_LIT( KPanicCategory,"CMdsFileServerPlugin" );
+__ASSERT_DEBUG( error == KErrNone, User::Panic( KPanicCategory,  error ) );
+#else
+TRAP_IGNORE( DisableL() );
+#endif
 iCreatedFiles.ResetAndDestroy();
 iCreatedFiles.Close();
 iModifiedFiles.ResetAndDestroy();
 //-----------------------------------------------------------------------------
 //
 void CMdsFileServerPlugin::InitialiseL()
 {
 WRITELOG( "CMdsFileServerPlugin::InitializeL()" );
-User::LeaveIfError( iFsSession.Connect() );
 }
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
 //
 TInt CMdsFileServerPlugin::DoRequestL( TFsPluginRequest& aRequest )
 	{
-	// ignore event if there is no any client listening
+	// ignore event if there are not any clients listening
 	if( iConnectionCount <= 0 )
 		{
 		WRITELOG( "CMdsFileServerPlugin::DoRequestL() - no clients -> ignore event" );
 		return KErrNone;
 		}
 	TInt function = aRequest.Function();
-	iFileName.Zero();
-iNewFileName.Zero();
 #ifdef _DEBUG_EVENTS
 PrintDebugEvents( function );
 #endif
 if ( function == EFsFileSubClose && iCreatedFiles.Count() == 0 )
 }
 #endif
 return KErrNone;
 }
-const TBool formatFunction = function == EFsFormatOpen || function == EFsFormatSubClose;
+const TBool formatFunction( function == EFsFormatOpen || function == EFsFormatSubClose );
 WRITELOG1( "----- CMdsFileServerPlugin::DoRequestL() - plugin function: %d -----", function );
 	if ( !formatFunction )
 		{
 		    WRITELOG1( "CMdsFileServerPlugin::DoRequestL() - fileName: %S", &iFileName );
 		    }
 		}
 // get process id
-	TUid processId = { 0 };
+	TUid processId = aRequest.Message().SecureId();
-	processId = aRequest.Message().SecureId();
 	TBool isDirectory = EFalse;
 // if rename, check destination path
 if ( function == EFsRename  || function == EFsFileRename ||
 if ( iNewFileName.Length() > KMaxFileName )
 	{
 	return KErrNone;
 	}
 WRITELOG2( "CMdsFileServerPlugin::DoRequestL() - newFileName: '%S' %d", &iNewFileName, newNameErr );
+TBool setToBeDeleted( EFalse );
 if ( newNameErr == KErrNone )
 {
 if ( !CheckPath(iNewFileName) )
 {
 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - new path not supported" );
 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - ignore file" );
 return KErrNone;
 }
 // file moved to ignored path, delete from db
 function = EFsDelete;
+setToBeDeleted = ETrue;
 }
-if ( !CheckAttribs( iNewFileName, isDirectory ) )
+if( !setToBeDeleted )
 {
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - new path attribute check failed" );
+RFsPlugin fsPlugin( aRequest );
-if( !CheckAttribs(iFileName, isDirectory) )
+const TInt rfsPluginErr = fsPlugin.Connect();
+if ( ( rfsPluginErr == KErrNone ) && !CheckAttribs( iNewFileName, isDirectory, fsPlugin, EFalse ) )
 {
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - old path attribute check failed" );
+WRITELOG( "CMdsFileServerPlugin::DoRequestL() - new path attribute check failed" );
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - ignore file" );
+if( !CheckAttribs(iFileName, isDirectory, fsPlugin, EFalse) )
-return KErrNone;
+{
+WRITELOG( "CMdsFileServerPlugin::DoRequestL() - old path attribute check failed" );
+WRITELOG( "CMdsFileServerPlugin::DoRequestL() - ignore file" );
+fsPlugin.Close();
+return KErrNone;
+}
+// file set to hidden, delete from db
+function = EFsDelete;
 }
-// file set to hidden, delete from db
+fsPlugin.Close();
-function = EFsDelete;
 }
 }
 else
 	{
-if ( !CheckPath(iFileName) )
+if( !CheckIfValidFile(iFileName, isDirectory, aRequest, EFalse)  )
 {
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - path not supported" );
-return KErrNone;
-}
-if ( !CheckAttribs(iFileName, isDirectory) )
-{
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - attribute check failed" );
 return KErrNone;
 }
 	}
 }
 else if ( !formatFunction )
 {
-if ( !CheckPath(iFileName) )
+const TBool deleteFunction( function == EFsDelete );
-{
+if( !CheckIfValidFile(iFileName, isDirectory, aRequest, deleteFunction)  )
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - path not supported" );
+{
-return KErrNone;
-}
-if ( !CheckAttribs( iFileName, isDirectory ) )
-{
-WRITELOG( "CMdsFileServerPlugin::DoRequestL() - attribute check failed" );
 return KErrNone;
 }
 }
 TInt fileEventType = EMdsFileUnknown;
 switch( function )
 {
 case EFsFileCreate:
 {
 #ifdef _DEBUG
 if (function == EFsFileCreate)
+{
 	WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsFileCreate" );
-if (function == EFsFileReplace)
+}
-	WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsFileReplace" );
 #endif
-iCreatedFiles.Append( iFileName.AllocL() );
+HBufC* createdFileName = iFileName.Alloc();
-User::LeaveIfError( UnregisterIntercept(EFsFileSetModified, EPostIntercept) );
+if( createdFileName )
+{
+// Ownership transferred if succeeded
+const TInt appendError( iCreatedFiles.Append( createdFileName ) );
+if( appendError != KErrNone )
+{
+delete createdFileName;
+createdFileName = NULL;
+}
+}
 return KErrNone;
 }
 case EFsFileSubClose:
 {
 		  {
 			fileEventType = EMdsFileCreated;
 			delete iCreatedFiles[i];
 			iCreatedFiles.Remove( i );
 						//Have to check whether file has been hidden
-						if ( CheckAttribs( iFileName, isDirectory ) )
+	        RFsPlugin fsPlugin( aRequest );
-							{
+	        const TInt rfsPluginError( fsPlugin.Connect() );
-							found = ETrue;
+	        if( (rfsPluginError == KErrNone) && CheckAttribs( iFileName, isDirectory, fsPlugin, EFalse ) )
-							}
+	            {
+	            found = ETrue;
-			User::LeaveIfError( RegisterIntercept(EFsFileSetModified, EPostIntercept) );
+	            }
+	        else if( rfsPluginError != KErrNone )
+	            {
+	            found = ETrue;
+	            }
+	        fsPlugin.Close();
 			}
 		}
 	if( iCreatedFiles.Count() == 0 )
 				{
 WRITELOG1( "CMdsFileServerPlugin::DoRequestL() - EFsFileRename, new file: %S", &iNewFileName );
 fileEventType = EMdsFileRenamed;
 break;
 case EFsFileSetModified:
+{
 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsFileSetModified" );
-iModifiedFiles.Append( iFileName.AllocL() );
+for ( TInt i = iCreatedFiles.Count(); --i >= 0; )
+{
+// If file has been created but not closed, do not handle modified events
+// for that file before the application that has created the file is done with writing
+// it to the disk.
+if ( MdsUtils::Compare( iFileName, *(iCreatedFiles[i]) ) == 0 )
+{
+return KErrNone;
+}
+}
+HBufC* modifiedFileName = iFileName.Alloc();
+if( modifiedFileName )
+{
+// Ownership transferred if succeeded
+const TInt appendError( iModifiedFiles.Append( modifiedFileName ) );
+if( appendError != KErrNone )
+{
+delete modifiedFileName;
+modifiedFileName = NULL;
+}
+}
 fileEventType = EMdsFileModified;
+}
 break;
 case EFsSetEntry:
 {
 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsSetEntry" );
 		case EFsFormatOpen:
 		    {
 			WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsFormatOpen" );
 			// get the drive letter
-		    RFsPlugin fsplugin( aRequest );
+		    RFsPlugin fsPlugin( aRequest );
-	        const TInt rfsPluginError( fsplugin.Connect() );
+		    err = fsPlugin.Connect();
-	        if( rfsPluginError == KErrNone )
+	        if( err == KErrNone )
 	            {
-	            err = fsplugin.Volume( volInfo, drvNumber );
+	            err = fsPlugin.Volume( volInfo, drvNumber );
 	            }
-	        else
+	        fsPlugin.Close();
-	            {
-	            err = iFsSession.Volume( volInfo, drvNumber );
-	            }
-	        fsplugin.Close();
 			if( KErrNone == err )
 				{
 				iFormatOldMediaId = volInfo.iUniqueID;
 				iFormatDriveNumber = drvNumber;
 iQueue.ResetAndDestroy();
 iQueue.Compress();
 }
 }
+iFileName.Zero();
+iNewFileName.Zero();
 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - return" );
 return err;
 }
 //-----------------------------------------------------------------------------
 WRITELOG1( "CMdsFileServerPlugin::AddNotificationPath() - add path: %S", &status.iFileName );
 HBufC* fn = status.iFileName.Alloc();
 if ( fn )
 {
-iPaths.InsertInOrder(fn, TLinearOrder<TDesC>(CMdsFileServerPlugin::Compare));
+const TInt insertError( iPaths.InsertInOrder(fn, TLinearOrder<TDesC>(CMdsFileServerPlugin::Compare)));
+if( insertError != KErrNone )
+{
+delete fn;
+fn = NULL;
+}
 }
 else
 {
 err = KErrNoMemory;
 }
 WRITELOG1( "CMdsFileServerPlugin::AddIgnorePath() - add path: %S", &status.iFileName );
 HBufC* fn = status.iFileName.Alloc();
 if ( fn )
 {
-iIgnorePaths.InsertInOrder(fn, TLinearOrder<TDesC>(CMdsFileServerPlugin::Compare));
+const TInt insertError( iIgnorePaths.InsertInOrder(fn, TLinearOrder<TDesC>(CMdsFileServerPlugin::Compare)));
+if( insertError != KErrNone )
+{
+delete fn;
+fn = NULL;
+}
 }
 else
 {
 err = KErrNoMemory;
 }
 TDesC* pathName = iIgnorePaths[i];
 if ( MdsUtils::Find( aFilename, *pathName ) != KErrNotFound )
 {
 return EFalse;
 }
+else if( MdsUtils::Find( aFilename, KExludedThumbPath ) != KErrNotFound )
+{
+return EFalse;
+}
+else if( MdsUtils::Find( aFilename, KExludedMediaArtPath ) != KErrNotFound )
+{
+return EFalse;
+}
 }
 // check if notification path
 if ( iPaths.Count() > 0 )
 {
 //-----------------------------------------------------------------------------
 // CheckAttribs
 //-----------------------------------------------------------------------------
 //
 TBool CMdsFileServerPlugin::CheckAttribs( const TDesC& aFilename,
-		TBool& aIsDirectory ) const
+		TBool& aIsDirectory, RFsPlugin& aFsPlugin, TBool aDelete ) const
 	{
 	// find last backslash from filename and
 // take drive and path from filename including last backslash
 const TChar KBackslashChar( '\\' );
 TInt pos = aFilename.LocateReverse( KBackslashChar );
 	{
 	return ETrue;
 	}
 TPtrC path( aFilename.Left( pos + 1 ) );
-TUint att = 0;
+TEntry entry;
-// check if path is hidden or system path
+// check if path is hidden
-TInt err = iFsSession.Att( path, att );
+TInt err = aFsPlugin.Entry( path, entry );
 if ( err == KErrNone )
 {
-if ( att & KEntryAttHidden || att & KEntryAttSystem )
+if ( entry.iAtt & KEntryAttHidden )
 {
 return EFalse;
 }
 }
-// or is the file hidden or system file
+if( !aDelete )
-att = 0;
+{
-err = iFsSession.Att( aFilename, att );
+// check if the file hidden or system file
-if ( err == KErrNone )
+err = aFsPlugin.Entry( aFilename, entry );
-{
+if ( err == KErrNone )
-if ( att & KEntryAttHidden || att & KEntryAttSystem )
+{
-{
+if ( entry.iAtt & KEntryAttHidden || entry.iAtt & KEntryAttSystem )
-return EFalse;
+{
-}
+return EFalse;
+}
-aIsDirectory = att & KEntryAttDir ? ETrue : EFalse;
+aIsDirectory = entry.iAtt & KEntryAttDir ? ETrue : EFalse;
+}
 }
 return ETrue;
 }
 return ETrue;
 }
 WRITELOG( "CMdsFileServerPlugin::CheckHarvesterStatus() - end" );
 return EFalse;
+}
+//-----------------------------------------------------------------------------
+// CheckIfValidFile
+//-----------------------------------------------------------------------------
+//
+TBool CMdsFileServerPlugin::CheckIfValidFile( const TDesC& aFilename,
+TBool& aIsDirectory, TFsPluginRequest& aRequest, TBool aDelete )
+{
+if ( !CheckPath(aFilename) )
+{
+WRITELOG( "CMdsFileServerPlugin::CheckIfValidFile() - path not supported" );
+return EFalse;
+}
+RFsPlugin fsPlugin( aRequest );
+const TInt rfsPluginErr = fsPlugin.Connect();
+if( rfsPluginErr == KErrNone )
+{
+if ( !CheckAttribs(aFilename, aIsDirectory, fsPlugin, aDelete) )
+{
+WRITELOG( "CMdsFileServerPlugin::CheckIfValidFile() - attribute check failed" );
+return EFalse;
+}
+}
+fsPlugin.Close();
+return ETrue;
 }
 //-----------------------------------------------------------------------------
 // CMdsFileServerPluginFactory implementation
 //-----------------------------------------------------------------------------

branch	RCL_3
changeset 13	4a4892eec172
parent 9	82c0024438c8
child 14	3e156c80c15d