FCL/sf/mw/mds: comparison harvester/monitorplugins/mmcplugin/src/mmcmonitorplugin.cpp

equal deleted inserted replaced

-:b73a2e62868f
+:6dfc5f825351
 #include "mdsfileserverpluginclient.h"
 #include "fsutil.h"
 #include "harvestercenreputil.h"
 #include <driveinfo.h>
+#ifdef __WINSCW__
+#include <pathinfo.h>
+#endif
 #include <e32cmn.h>
 _LIT( KColon, ":" );
 // construct/destruct
 void CMMCMonitorPlugin::ConstructL() // second-phase constructor
 {
 WRITELOG( "CMMCMonitorPlugin::ConstructL" );
+User::LeaveIfError( iFs.Connect() );
 iMMCMonitor = CMMCMonitorAO::NewL();
 iMountTask = CMMCMountTaskAO::NewL();
 iUsbMonitor = CMMCUsbAO::NewL();
 iMdEClient = NULL;
 }
 	delete iMountTask;
 	}
 	delete iMmcScanner;
 	delete iHddScanner;
+	iFs.Close();
 }
 TBool CMMCMonitorPlugin::StartMonitoring( MMonitorPluginObserver& aObserver,
 CMdESession* aMdEClient, CContextEngine* /*aCtxEngine*/,
 CHarvesterPluginFactory* aHarvesterPluginFactory )
 	TRAP_IGNORE( iMdEClient->GetMediaL( medias[i].iMediaId, driveLetter, presentState ) );
 	if ( presentState && medias[i].iMediaId != hdMediaId )
 		{
 		// scan MMC if card was in phone
+	    if( iMmcScanner )
+	        {
+	        iMmcScanner->Cancel();
+	        delete iMmcScanner;
+	        iMmcScanner = NULL;
+	        }
 		TRAP_IGNORE( iMmcScanner = CMmcScannerAO::NewL( medias[i].iMediaId, iMdEClient, iObserver,
 		    				aHarvesterPluginFactory, CActive::EPriorityHigh, alreadyWaited ) );
 		alreadyWaited = ETrue;
 		}
 	}
+if( hdMediaId == 0 )
+{
+// Try to fetch internall mass storage media id again if it was not mounted
+hdMediaId = iMountTask->GetInternalDriveMediaId();
+}
 // scan mass storage to catch all chances even if battery dies during operation that should  be catched
 if( hdMediaId )
 		{
 		TBool exists( EFalse );
 		TRAP_IGNORE( exists= iMdEClient->GetMediaL( hdMediaId, driveLetter, presentState ) );
 {
 return;
 }
 if( aMediaID != 0 && aEventType == EMounted)
 	{
-	    RFs fs;
-	    const TInt err = fs.Connect();
-	    if ( err != KErrNone )
-	    	{
-	        delete mountData;
-	    	return;
-	    	}
 	    TUint status;
 	    TInt drive;
-	    fs.CharToDrive( aDriveChar, drive );
+	    iFs.CharToDrive( aDriveChar, drive );
-		if( DriveInfo::GetDriveStatus( fs, drive, status ) == KErrNone )
+		if( DriveInfo::GetDriveStatus( iFs, drive, status ) == KErrNone )
 			{
 			//The "Out of disk space" mde query uses the MdE_Preferences table
 			if( !(status & DriveInfo::EDriveInternal) )
 				{
 				iMdEClient->AddMemoryCard( aMediaID );
 				}
 			}
-		fs.Close();
 	}
 mountData->iDrivePath.Append( aDriveChar );
 mountData->iDrivePath.Append( KColon );
 mountData->iMediaID = aMediaID;
 {
 case EMounted:
 {
 WRITELOG( "CMMCMonitorPlugin::MountEvent with parameter EMounted" );
 mountData->iMountType = TMountData::EMount;
+if( !iMountTask->IsActive() )
+{
+iMountTask->SetPriority( KHarvesterPriorityMonitorPlugin );
+}
 iMountTask->StartMount( *mountData );
 }
 break;
 case EDismounted:
 	}
 if( mountData->iMediaID )
 	{
 	            WRITELOG( "CMMCMonitorPlugin::MountEvent with parameter EDismounted" );
 	            mountData->iMountType = TMountData::EUnmount;
+	            if( !iMountTask->IsActive() )
+	                {
+	                iMountTask->SetPriority( KHarvesterPriorityMonitorPlugin );
+	                }
 	            iMountTask->StartUnmount( *mountData );
 	}
 }
 break;
 case EFormatted:
 {
 WRITELOG( "CMMCMonitorPlugin::MountEvent with parameter EFormatted" );
 mountData->iMountType = TMountData::EFormat;
+if( !iMountTask->IsActive() )
+{
+iMountTask->SetPriority( KHarvesterPriorityMonitorPlugin );
+}
 iMountTask->StartUnmount( *mountData );
 }
 break;
 default:
 }
 void CMMCMonitorPlugin::StartMonitoringAllMMCsL( RArray<TMdEMediaInfo>& aMedias )
 {
 WRITELOG( "CMMCMonitorPlugin::StartMonitoringAllMMCs" );
-RFs fs;
-User::LeaveIfError( fs.Connect() );
-CleanupClosePushL( fs );
 TDriveInfo driveInfo;
 TDriveList driveList;
 TInt numOfElements( 0 );
-DriveInfo::GetUserVisibleDrives( fs,
+DriveInfo::GetUserVisibleDrives( iFs,
 driveList,
 numOfElements,
 KDriveAttExclude | KDriveAttRemote | KDriveAttRom );
+#ifdef __WINSCW__
+TFileName systemPath = PathInfo::GetPath( PathInfo::EPhoneMemoryRootPath );
+TInt systemDriveNum( -1 );
+iFs.CharToDrive( systemPath[0], systemDriveNum );
+#endif
 TInt i( 0 );
 TChar drive;
 const TInt acount = driveList.Length();
 const TInt mediaCount = aMedias.Count();
 // set removed medias to not present
 for ( i = 0; i < mediaCount; i++ )
 	{
 	TInt driveNum(0);
-	fs.CharToDrive( aMedias[i].iDrive, driveNum );
+	iFs.CharToDrive( aMedias[i].iDrive, driveNum );
-	TUint32 mediaId = FSUtil::MediaID( fs, driveNum );
+	TUint32 mediaId = FSUtil::MediaID( iFs, driveNum );
 	if ( mediaId != aMedias[i].iMediaId )
 		{
 		iMdEClient->SetMediaL( aMedias[i].iMediaId, aMedias[i].iDrive, EFalse );
 		}
 	}
 for ( i = 0; i < acount; i++ )
 {
+#ifdef __WINSCW__
+if ( i == systemDriveNum )
+{
+continue;
+}
+#endif
 if ( driveList[i] > 0 )
 {
 TUint driveStatus( 0 );
-DriveInfo::GetDriveStatus( fs, i, driveStatus );
+DriveInfo::GetDriveStatus( iFs, i, driveStatus );
 if ( driveStatus & DriveInfo::EDriveUsbMemory )
 {
 driveList[i] = 0;
 continue;
 }
-fs.Drive( driveInfo, i );
+iFs.Drive( driveInfo, i );
-if ( driveInfo.iDriveAtt & KDriveAttRemovable && driveInfo.iType != EMediaNotPresent )
+if ( ((driveInfo.iDriveAtt & KDriveAttRemovable) || (driveInfo.iDriveAtt & KDriveAttLogicallyRemovable) ||
+(driveInfo.iType == EMediaHardDisk && driveStatus & DriveInfo::EDriveInternal) ) &&
+(driveInfo.iType != EMediaNotPresent) )
 {
 count++; // DEBUG INFO
-fs.DriveToChar( i, drive );
+iFs.DriveToChar( i, drive );
 // set media id to MdE
-TUint32 mediaId = FSUtil::MediaID( fs, i );
+TUint32 mediaId = FSUtil::MediaID( iFs, i );
 if ( mediaId != 0 )
 {
 iMdEClient->SetMediaL( mediaId, drive, ETrue );
 AddNotificationPathL( drive );
 }
 }
 }
 }
-CleanupStack::PopAndDestroy( &fs );
 WRITELOG1( "CMMCMonitorPlugin::StartMonitoringAllMMCs found %d MMCs", count );
 }

changeset 20	6dfc5f825351
parent 3	b73a2e62868f
child 21	50bf9db68373