MCL/sf/mw/mmappfw: comparison mmappcomponents/harvester/filehandler/src/mpxharvesterfilehandlerimp.cpp

equal deleted inserted replaced

-:d45095c2f4f3
+:bee149131e4b
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:  Handles all file related activities
-*  Version     : %version: da1mmcf#72.1.14.2.4.1.4.1.2 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: e003sa33#72.1.14.2.4.1.4.1.2.1.3 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 #include <e32base.h>
 #endif
 // Create DRM Notifier and register for AddRemove event
 iDrmNotifier = CDRMNotifier::NewL();
 iDrmNotifier->RegisterEventObserverL( *this, KEventAddRemove );
+iCurUSBEvent = KErrNotFound;
 }
 // ---------------------------------------------------------------------------
 // Two-Phased Constructor
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CMPXHarvesterFileHandlerImp::HandleSystemEventL( TSystemEvent aEvent,
 TInt aData )
 {
-MPX_DEBUG2("CMPXHarvesterFileHandlerImp::HandleSystemEventL %i", aEvent);
+MPX_DEBUG3("CMPXHarvesterFileHandlerImp::HandleSystemEventL %i, drive %d", aEvent, aData);
 // How to handle each event
 //
 // 1: Format and eject, we stop scanning and close only the mmc db
 // 2: Format end and disk insert we reopen db and scan for new files
 // 3: USB start we stop scan and close all db
 MPX_DEBUG3 ("CMPXHarvesterFileHandlerImp::HandleSystemEventL - drive %d status=0x%x", driveNum, driveStatus);
 TChar driveChar;
 User::LeaveIfError(
 iFs.DriveToChar( driveNum, driveChar ) );
 MPX_DEBUG5 ("CMPXHarvesterFileHandlerImp::HandleSystemEventL - drive %c: is %S, %S and %S",
-driveChar,
+(TUint)driveChar,
 (driveStatus&DriveInfo::EDrivePresent)?&drivePresent:&driveNotPresent,
 (driveStatus&DriveInfo::EDriveInUse)?&driveInUse:&driveAvailable,
 (driveStatus&DriveInfo::EDriveFormatted)?&driveFormatted:&driveNotFormatted);
 }
 }
 {
 MPX_DEBUG1("Disk Removed event");
 iIdle->Cancel();
 CancelScan();
 #ifdef RD_MULTIPLE_DRIVE
+TBool dbClosed( EFalse );
 for( TInt driveNum = EDriveA; driveNum <= EDriveZ; driveNum++ )
 {
 if (driveList[driveNum] && (!iDBManager->IsRemoteDrive(static_cast<TDriveNumber>(driveNum))))
 {
 TUint driveStatus(0);
 {
 // Close database for non-present drive
 iDBManager->CloseDatabase( (TDriveNumber) driveNum );
 // Save the drive
 iRemovedDrive = driveNum;
+dbClosed = ETrue;
 break;
 }
+}
+}
+if( !dbClosed )
+{
+// GetUserVisibleDrives / RFs::DriveList does not return drive at all
+// if it is dismounted using file server methods. This occurs at least
+// when removing card using power menu eject.
+// If the drive reported as removed is not ready, close db on that drive.
+TUint driveStatus(0);
+TInt err( DriveInfo::GetDriveStatus( iFs, aData, driveStatus ) );
+MPX_DEBUG4("Drive %d status 0x%x, err %d", aData, driveStatus, err);
+if( err == KErrNotReady )
+{
+iDBManager->CloseDatabase( (TDriveNumber) aData );
+iRemovedDrive = aData;
 }
 }
 #else
 iDBManager->CloseDatabase( (TDriveNumber) aData );
 #endif // RD_MULTIPLE_DRIVE
 #endif // RD_MULTIPLE_DRIVE
 break;
 }
 case EUSBMassStorageStartEvent:
 {
+if (iCurUSBEvent == EUSBMassStorageStartEvent)
+	{
+	break;
+	}
 iIdle->Cancel();
 CancelScan();
 #ifdef RD_MULTIPLE_DRIVE
 // Close all databases other than the phone memory database
 for( TInt driveNum = EDriveA; driveNum <= EDriveZ; driveNum++ )
 }
 }
 #else
 iDBManager->CloseDatabase( (TDriveNumber) aData );
 #endif // RD_MULTIPLE_DRIVE
+iCurUSBEvent = EUSBMassStorageStartEvent;
 break;
 }
 case EUSBMassStorageEndEvent:
 {
 #ifdef RD_MULTIPLE_DRIVE
 }
 }
 #else
 iDBManager->OpenDatabaseL( (TDriveNumber) aData );
 #endif // RD_MULTIPLE_DRIVE
+iCurUSBEvent = EUSBMassStorageEndEvent;
 break;
 }
 case EUSBMTPNotActiveEvent: // deliberate fall through
 {
+if (iCurUSBEvent == EUSBMTPNotActiveEvent)
+	{
+	break;
+	}
 if ( iRefreshing )
 {
 // Notify clients that refresh is cancelled.
 iCollectionUtil->Collection().NotifyL( EMcMsgRefreshEnd, KErrLocked );
 }
+CancelScan();
+iCurUSBEvent = EUSBMTPNotActiveEvent;
+break;
 }
 case EUSBMTPStartEvent:
 {
 CancelScan();
+iCurUSBEvent = EUSBMTPStartEvent;
 // nothing to do, db is needed for MTP
+#ifdef __RAMDISK_PERF_ENABLE
+// if statement needed because of fall through above.
+if ( aEvent == EUSBMTPStartEvent )
+{
+// copy dbs to ram drive
+iDBManager->CopyDBsToRamL(ETrue);
+}
+#endif //__RAMDISK_PERF_ENABLE
 break;
 }
 case EUSBMTPEndEvent:
 {
+iCurUSBEvent = EUSBMTPEndEvent;
 // nothing to do, db is updated by MTP
+#ifdef __RAMDISK_PERF_ENABLE
+// copy dbs from ram drive
+iDBManager->CopyDBsFromRamL();
+#endif //__RAMDISK_PERF_ENABLE
 break;
 }
 case EPowerKeyEjectEvent:
 {
 CancelScan();
 MPX_DEBUG1("CMPXHarvesterFileHandlerImp::AddFiles -- db flags drm invalid");
 drm = ETrue;
 }
 }
 // Add to database
+#ifdef __RAMDISK_PERF_ENABLE
+// EnsureRamSpaceL will copy dbs from ram if ram space is low or dbs exceeded max space.
+iDBManager->EnsureRamSpaceL();
+#endif // __RAMDISK_PERF_ENABLE
 CMPXHarvesterDB& db = iDBManager->GetDatabaseL( ::ExtractDrive( path ) );
 CMPXHarvesterDatabaseTable* table = db.OpenFileL( path );
 CleanupStack::PushL( table );
 // Don't add something we already have
 }
 CleanupStack::PopAndDestroy( table );
 // Return the collection that it should belong to.
 r = col.iUid;
+#ifdef __RAMDISK_PERF_ENABLE
+// This feature will be turned on in the second phase.
+//TRAP_IGNORE( iDBManager->UpdateDBsFromRamL(0) );
+#endif // __RAMDISK_PERF_ENABLE
 }
 else
 {
 // No file path, leave KErrArgument!
 User::Leave( KErrArgument );
 {
 MPX_DEBUG1("CMPXHarvesterFileHandlerImp::RemoveFileL <---");
 TInt r(0);
 // Open the db
+#ifdef __RAMDISK_PERF_ENABLE
+// EnsureRamSpaceL will copy dbs from ram if ram space is low or dbs exceeded max space.
+iDBManager->EnsureRamSpaceL();
+#endif // __RAMDISK_PERF_ENABLE
 CMPXHarvesterDB& db = iDBManager->GetDatabaseL( ::ExtractDrive(aPath) );
 	MPX_PERF_START( MPX_PERF_HARV_DB_DELETE_SUB1 );
 CMPXHarvesterDatabaseTable* table = db.OpenFileL( aPath );
 MPX_PERF_END( MPX_PERF_HARV_DB_DELETE_SUB1 );
 iBrokenLink->Start();
 break;
 }
 case ECleanupBrokenLink:
 {
+#ifdef __RAMDISK_PERF_ENABLE
+// copy dbs to ram drive
+iDBManager->CopyDBsToRamL();
+#endif //__RAMDISK_PERF_ENABLE
 MPX_DEBUG1("Start Metadata Scan");
 iMetadataScanner->Start();
 break;
 }
 case EScanMetadata:
 // Look for broken files
 HandleBrokenItemsL();
 // Delete previous table and open the next one
 Reset();
+#ifdef __RAMDISK_PERF_ENABLE
+// EnsureRamSpaceL will copy dbs from ram if ram space is low or dbs exceeded max space.
+iDBManager->EnsureRamSpaceL();
+#endif // __RAMDISK_PERF_ENABLE
 MPX_TRAPD( err, iCurDB = &iDBManager->GetDatabaseL( aDrive ) );
 if ( err != KErrNone )
 {
 iDBManager->OpenAllDatabasesL();
 iCurDB = &iDBManager->GetDatabaseL( aDrive );
 parse.NameAndExt(),
 lastModTime, collection.iUid, drm );
 iAddedCount++;
 }
+#ifdef __RAMDISK_PERF_ENABLE
+// This feature will be turned on in the second phase.
+//TRAP_IGNORE( iDBManager->UpdateDBsFromRamL(iAddedCount) );
+#endif // __RAMDISK_PERF_ENABLE
 }
 else if ( addErr == KErrDiskFull )
 {
 User::Leave( KErrDiskFull );
 }
 else if ( addErr == KErrDiskFull )
 {
 User::Leave( KErrDiskFull );
 }
 }
+#ifdef __RAMDISK_PERF_ENABLE
+// This feature will be turned on in the second phase.
+//TRAP_IGNORE( iDBManager->UpdateDBsFromRamL(iAddedCount) );
+#endif // __RAMDISK_PERF_ENABLE
 MPX_DEBUG1("CMPXHarvesterFileHandlerImp::AddPlaylistToCollectionL --->");
 }
 // ---------------------------------------------------------------------------
 //
 void CMPXHarvesterFileHandlerImp::OpenDBForPathL( const TDesC& aPath )
 {
 Reset();
 TDriveNumber num = ::ExtractDrive( aPath );
+#ifdef __RAMDISK_PERF_ENABLE
+// EnsureRamSpaceL will copy dbs from ram if ram space is low or dbs exceeded max space.
+iDBManager->EnsureRamSpaceL();
+#endif // __RAMDISK_PERF_ENABLE
 iCurDB = &iDBManager->GetDatabaseL( num );
 iCurTable = iCurDB->OpenFileL( aPath );
 }
 // ---------------------------------------------------------------------------
 else
 {
 // Rollback the changes on databases in transaction
 iDBManager->Rollback();
 }
+#ifdef __RAMDISK_PERF_ENABLE
+// copy dbs from ram drive
+iDBManager->CopyDBsFromRamL();
+#endif //__RAMDISK_PERF_ENABLE
 if( aErr == KErrNone || aErr == KErrCancel )
 {
 aErr = iAddedCount;
 }

branch	RCL_3
changeset 8	bee149131e4b
parent 0	a2952bb97e68
child 12	51035f0751c2