FCL/sf/app/files: comparison filemanager/src/fmbkupenginewrapper/private/symbian/fmbkupengine

equal deleted inserted replaced

-:ada7962b4308
+:15bc28c9dd51
 bool FmBkupEnginePrivate::startBackup(QList<FmBkupDrivesAndOperation* > drivesAndOperationList,
 	    QList<FmBkupBackupCategory*> backupCategoryList,
 	    QString drive, quint32 content)
 {
+FM_LOG( "FmBkupEnginePrivate::startBackup_with drive: " + drive +
+"_number:" + QString::number(DriverNameToNumber( drive )));
 if( drive.isEmpty() ) {
 iError = KErrPathNotFound;
+FM_LOG( "FmBkupEnginePrivate::startBackup_with return with KErrPathNotFound because drive is empty" );
+return false;
+}
+QStringList backupableDriveList;
+getBackupDriveList( backupableDriveList );
+if( !backupableDriveList.contains( drive, Qt::CaseInsensitive ) ) {
+iError = KErrPathNotFound;
+FM_LOG( "FmBkupEnginePrivate::startBackup_with return with KErrPathNotFound because drive is not available" );
 return false;
 }
 QString logString;
 logString = "startBackup";
-FmLogger::log( logString );
+FM_LOG( logString );
 iDrvAndOpList->Reset();
 iBkupCategoryList->ResetAndDestroy();
 logString = "startBackup_driveroperation count:" + QString::number(drivesAndOperationList.count());
-FmLogger::log( logString );
+FM_LOG( logString );
 for( QList<FmBkupDrivesAndOperation* >::iterator it = drivesAndOperationList.begin();
 it != drivesAndOperationList.end(); ++it ) {
 		FmBkupDrivesAndOperation* fmDrvAndOp = *it;
 		TBkupDrivesAndOperation drvAndOp;
 		drvAndOp.setDrvCategories( fmDrvAndOp->drvCategories() );
 		iDrvAndOpList->AppendL( drvAndOp );
 		}
 logString = "startBackup_backupCategoryList count:" + QString::number(backupCategoryList.count());
-FmLogger::log( logString );
+FM_LOG( logString );
 	for( QList<FmBkupBackupCategory* >::iterator it = backupCategoryList.begin();
 		    it != backupCategoryList.end(); ++it ) {
 FmBkupBackupCategory* fmbkupCategory = *it;
 	TUint32 bkupContent( FmgrToBkupMask( content ) );
 	//TUint32 bkupContent = 63;
 logString = "startBackup_new param";
-FmLogger::log( logString );
+FM_LOG( logString );
 	CMMCScBkupOpParamsBackupFull* params =
 CMMCScBkupOpParamsBackupFull::NewL(
 iDrvAndOpList,
 iBkupCategoryList,
 mProcess = FmBkupEngine::ProcessBackup;
 logString = "startBackup_param ok";
-FmLogger::log( logString );
+FM_LOG( logString );
 CCoeEnv* coeEnv = CCoeEnv::Static();
 CEikonEnv* eikonEnv = (STATIC_CAST(CEikonEnv*,coeEnv));
 eikonEnv->SetSystem(ETrue);
 logString = "startBackup_StartOperationL";
-FmLogger::log( logString );
+FM_LOG( logString );
 QList< FmRestoreInfo > restoreInfoList;
-TInt driveNumber = DriverNameToNumber( drive );
+GetRestoreInfoArray( drivesAndOperationList, restoreInfoList, drive );
-GetRestoreInfoArray( drivesAndOperationList, restoreInfoList, driveNumber );
+for ( TInt i( 0 ); i < restoreInfoList.count(); ++i )
-for ( TInt i( 0 ); i < restoreInfoList.count(); i++ )
 {
 bool toContinue = false;
 FmRestoreInfo &info = restoreInfoList[ i ];
 TUint32 existContent( FmgrToBkupMask( info.content() ) );
 if ( bkupContent & existContent )
 TRAPD( err, iBkupEngine->StartOperationL(
 EMMCScBkupOperationTypeFullBackup, *this, params ) );
 logString = "startBackup_end with error:" + QString::number(err) ;
-FmLogger::log( logString );
+FM_LOG( logString );
 return (err == KErrNone);
 }
 void FmBkupEnginePrivate::cancelBackup()
 {
 	QString logString  = "cancelBackup";
-	FmLogger::log(logString);
+	FM_LOG(logString);
 	switch( mProcess )
 {
 case FmBkupEngine::ProcessBackup: // FALLTHROUGH
 case FmBkupEngine::ProcessRestore:
 {
 {
 logString  = "default";
 break;
 }
 }
-FmLogger::log( logString );
+FM_LOG( logString );
 return ret;
 }
 int FmBkupEnginePrivate::error()
 {
+FM_LOG( "FmBkupEnginePrivate::error:" + QString::number( iError ) );
 switch (iError)
 {
 case KErrNone:
 return FmErrNone;
 case KErrNotFound:
 return FmErrAlreadyExists;
 case KErrCancel:
 return FmErrCancel;
 case KErrPathNotFound:
 return FmErrPathNotFound;
+case KErrLocked:
+return FmErrLocked;
+case KErrCorrupt:
+return FmErrCorrupt;
+case KErrNotReady:
+return FmErrNotReady;
+case KErrDisMounted:
+return FmErrDisMounted;
 default:
 return FmErrUnKnown;
 }
 }
 drvAndOp.setOwnerDataType( fmDrvAndOp->ownerDataType() );
 drvAndOp.setDrvCategories( fmDrvAndOp->drvCategories() );
 iDrvAndOpList->AppendL( drvAndOp );
 }
 ////////
-FmBackupSettings& bkupSettings( *( q->BackupSettingsL() ) );
 // Create restore params - ownership is transferred to
 // secure backup engine
 #ifdef RD_FILE_MANAGER_BACKUP
 CMMCScBkupOpParamsRestoreFull* params =
 CMMCScBkupOpParamsRestoreFull::NewL( driveReader, EBUCatAllInOne );
 CleanupStack::PopAndDestroy(); // driveReader
+FmBackupSettings& bkupSettings( *( q->BackupSettingsL() ) );
 // Get list of all archives
 RPointerArray< CMMCScBkupArchiveInfo > archives;
 TCleanupItem cleanupItem( ResetAndDestroyArchives, &archives );
 CleanupStack::PushL( cleanupItem );
 iBkupEngine->ListArchivesL(
 return true;
 }
 void FmBkupEnginePrivate::GetRestoreInfoArray( QList<FmBkupDrivesAndOperation* > drivesAndOperationList,
 QList< FmRestoreInfo > &restoreInfoList,
-const TInt aDrive )
+const QString& aDrive )
 {
-FmBackupSettings& settings( *( q->BackupSettingsL() ) );
+int targetDrive = DriverNameToNumber( aDrive );
 restoreInfoList.clear();
 ///////
 iDrvAndOpList->Reset();
 CleanupStack::PushL( cleanupItem );
 iBkupEngine->ListArchivesL(
 archives,
 params,
 AllowedDriveAttMatchMask(),
-aDrive );
+targetDrive );
 // Fill restore info
 TInt count( archives.Count() );
 //    restoreInfoList.ReserveL( count );
 int h       = iDateTime.Hour();
 int m       = iDateTime.Minute();
 int s       = iDateTime.Second();
 int year    = iDateTime.Year();
 int month   = iDateTime.Month() + 1;
-int day     = iDateTime.Day();
+int day     = iDateTime.Day()+1;
 QTime time( h, m, s);
 QDate date( year, month, day );
 QDateTime dateTime( date, time );
 dateTime = dateTime.toLocalTime();
 return KDriveAttRemovable;//KDriveAttRemovable;
 }
 TInt FmBkupEnginePrivate::DriverNameToNumber( QString driverName )
 {
+if( driverName.isEmpty() ) {
+return KErrNotFound;
+}
 TInt drive = 0;
 drive = driverName[0].toUpper().toAscii() - 'A' + EDriveA;
 return drive;
 }
 QString FmBkupEnginePrivate::NumberToDriverName( TInt driver )
 {
 driveList.append( NumberToDriverName( i ) );
 }
 }
 }
 fs.Close();
 }
 // -----------------------------------------------------------------------------
 // CFileManagerEngine::PublishBurStatus()

changeset 37	15bc28c9dd51
parent 16	ada7962b4308