MCL/sf/app/videoplayer: comparison videocollection/mpxmyvideoscollection/src/vcxmyvideosasyncfileoperations.cpp

equal deleted inserted replaced

-:8f0df5c82986
+:67eb01668b0e
 #include <drmutility.h>
 #include <bautils.h>
 #include "vcxmyvideoscollectionplugin.h"
 #include "vcxmyvideoscollection.hrh"
 #include "vcxmyvideoscollectionutil.h"
-#include "vcxmyvideosdownloadutil.h"
 #include "vcxmyvideosvideocache.h"
 #include "vcxmyvideoscategories.h"
 #include "vcxmyvideosmessagelist.h"
 #include "vcxmyvideosasyncfileoperations.h"
 #include "vcxmyvideosasyncfilecopy.h"
 // ----------------------------------------------------------------------------
 // Destructor.
 // ----------------------------------------------------------------------------
 //
 CVcxMyVideosAsyncFileOperations::~CVcxMyVideosAsyncFileOperations()
 {
 iOperationIdArray.Close();
 iOperationResult.Close();
 delete iFileCopier;
 delete iMediaForMoveOp;
 delete iMediaForCopyOp;
 // ----------------------------------------------------------------------------
 // CVcxMyVideosAsyncFileOperations::HandleMoveOrCopyStepL
 // ----------------------------------------------------------------------------
 //
-TBool CVcxMyVideosAsyncFileOperations::HandleMoveOrCopyStepL()
+MVcxMyVideosActiveTaskObserver::TStepResult
+CVcxMyVideosAsyncFileOperations::HandleMoveOrCopyStepL()
 {
 // Reset inactivity timer. This will prevent ThumbAGDaemon start running while
 // Move/copy is ongoing and failing the operation due to locked file handle.
 User::ResetInactivityTime();
 CMPXMedia& cmd = iCollection.iActiveTask->GetCommand();
-TBool done;
+MVcxMyVideosActiveTaskObserver::TStepResult stepResult;
 if ( iCurrentOperationIndex == 0 && !iFileCopier->CopyIsOngoing() )
 {
 InitMoveOrCopyOperationsL( cmd );
 }
-TRAPD( err, MoveOrCopyVideoL( iOperationIdArray[iCurrentOperationIndex],
+TRAPD( err, MoveOrCopyVideoL( iOperationIdArray[iCurrentOperationIndex] ) );
-iTargetDrive ));
 if ( iFileCopier->CopyIsOngoing() && err == KErrNone )
 {
 // copy didnt finish yet, lets do some more steps before jumping to next file
-return EFalse;
+return MVcxMyVideosActiveTaskObserver::EMoreToCome;
 }
 iOperationResult.AppendL( err );
 iCurrentOperationIndex++;
 // End operations
 if ( iCurrentOperationIndex > (iOperationIdArray.Count() - 1) )
 {
 iCurrentOperationIndex = 0;
-done                   = ETrue;
+stepResult             = MVcxMyVideosActiveTaskObserver::EDone;
 if ( iIsMoveOperation )
 {
 SendOperationRespL( KVcxMessageMyVideosMoveResp );
 }
 else
 SendOperationRespL( KVcxMessageMyVideosCopyResp );
 }
 }
 else
 {
-done = EFalse;
+stepResult = MVcxMyVideosActiveTaskObserver::EMoreToCome;
 }
-return done;
+return stepResult;
 }
 // ----------------------------------------------------------------------------
 // CVcxMyVideosAsyncFileOperations::InitMoveOrCopyOperationsL
 // ----------------------------------------------------------------------------
 // CVcxMyVideosAsyncFileOperations::CancelOperationL
 // Called when leave or cancel occurs for the operation, generates resp msg.
 // ----------------------------------------------------------------------------
 //
 void CVcxMyVideosAsyncFileOperations::CancelOperationL( TInt aErr )
 {
 if ( iCollection.iActiveTask->IsActive() )
 {
 TInt mvCmdId = -1;
 CMPXMedia& cmd = iCollection.iActiveTask->GetCommand();
 TMPXCommandId commandId = *cmd.Value<TMPXCommandId>( KMPXCommandGeneralId );
 // ----------------------------------------------------------------------------
 // CVcxMyVideosAsyncFileOperations::MoveOrCopyVideoL
 // ----------------------------------------------------------------------------
 //
-void CVcxMyVideosAsyncFileOperations::MoveOrCopyVideoL( TUint32 aMdsId, TInt aTargetDrive )
+void CVcxMyVideosAsyncFileOperations::MoveOrCopyVideoL( TUint32 aMdsId )
 {
 if ( iFileCopier->CopyIsOngoing() )
 {
 TInt err = iFileCopier->DoNextBlockCopy();
 if ( err != KErrNone || !iFileCopier->CopyIsOngoing() )
 }
 return;
 }
 //New file copy starts -> do sanity checks and mds and collection preparations
-InitSingleMoveOrCopyL( aMdsId, aTargetDrive );
+InitSingleMoveOrCopyL( aMdsId );
 MPX_DEBUG2("CVcxMyVideosAsyncFileOperations:: copying: %S", &iSourcePath);
 MPX_DEBUG2("CVcxMyVideosAsyncFileOperations:: to     : %S", &iTargetPath);
 TBool completed = ETrue; // set to avoid warning
 // ----------------------------------------------------------------------------
 // CVcxMyVideosAsyncFileOperations::InitSingleMoveOrCopyL
 // ----------------------------------------------------------------------------
 //
-void CVcxMyVideosAsyncFileOperations::InitSingleMoveOrCopyL( TUint32 aMdsId, TInt aTargetDrive )
+void CVcxMyVideosAsyncFileOperations::InitSingleMoveOrCopyL( TUint32 aMdsId )
 {
 //get media from cache or mds
 TInt pos;
 CMPXMedia* videoInCache = iCollection.iCache->FindVideoByMdsIdL( aMdsId, pos );
 }
 CleanupStack::PushL( video ); // 1->
 // sanity checks
-if ( video->ValueTObjectL<TUint32>( KVcxMediaMyVideosDownloadId ) != 0 )
+if ( TVcxMyVideosCollectionUtil::DownloadIdL( *video ) != 0 )
 {
 MPX_DEBUG1("CVcxMyVideosAsyncFileOperations:: file is being downloaded, fail, leaving with KErrInUse code.");
 User::Leave( KErrInUse );
 }
 iSourcePath = video->ValueText( KMPXMediaGeneralUri );
-if ( !DriveHasEnoughFreeSpaceL( iSourcePath, aTargetDrive ) )
+if ( !DriveHasEnoughFreeSpaceL( iSourcePath, iTargetDrive ) )
 {
 MPX_DEBUG1("CVcxMyVideosAsyncFileOperations:: target drive full -> skipping");
 User::Leave( KErrDiskFull );
 }
 }
 TInt sourceDrive;
 User::LeaveIfError( iCollection.iFs.CharToDrive( iSourcePath[0], sourceDrive ) );
-if ( sourceDrive == aTargetDrive )
+if ( sourceDrive == iTargetDrive )
 {
 MPX_DEBUG1("CVcxMyVideosAsyncFileOperations:: source and target drives are the same, leaving with KErrAlreadyExists.");
 CleanupStack::PopAndDestroy( video ); // <-1
 User::Leave( KErrAlreadyExists );
 }
-GenerateTargetPathForMoveOrCopyL( iSourcePath, iTargetPath, aTargetDrive );
+GenerateTargetPathForMoveOrCopyL( iSourcePath, iTargetPath, iTargetDrive );
 MPX_DEBUG2("CVcxMyVideosAsyncFileOperations:: target path = %S", &iTargetPath );
 // update mds and cache
 delete iMediaForMoveOp;
 _LIT(KDataDes, "data");
 if ( sourceDrive == systemDrive )
 {
 //remove *:\data\* from the path
-TPtrC pathData( aSourcePath.Mid(3,4) );
+const TInt dataWordStartPos = 3;
+const TInt dataWordLength   = 4;
+TPtrC pathData( aSourcePath.Mid( dataWordStartPos, dataWordLength ) );
 MPX_DEBUG2("CVcxMyVideosAsyncFileOperations:: sourcePath.Mid(3,4)= %S", &pathData);
-if ( aSourcePath.Mid(3,4) == KDataDes )
+if ( pathData == KDataDes )
 {
 MPX_DEBUG1("CVcxMyVideosAsyncFileOperations:: source drive is system drive and 'data' exists in sourcePath");
 MPX_DEBUG1("CVcxMyVideosAsyncFileOperations:: not copying 'data' to the target path");
-aTargetPath.Append( aSourcePath.Mid( 7 ) );
+const TInt skipDataWordPos = 7;
+aTargetPath.Append( aSourcePath.Mid( skipDataWordPos ) );
 }
 else
 {
-aTargetPath.Append( aSourcePath.Mid( 2 ) );
+const TInt dontSkipDataWordPos = 2;
+aTargetPath.Append( aSourcePath.Mid( dontSkipDataWordPos ) );
 }
 }
 else if ( aTargetDrive == systemDrive )
 {
 MPX_DEBUG1("CVcxMyVideosAsyncFileOperations:: target drive is system drive -> adding 'data' to path");
 // ----------------------------------------------------------------------------
 // CVcxMyVideosAsyncFileOperations::HandleDeleteStepL
 // ----------------------------------------------------------------------------
 //
-TBool CVcxMyVideosAsyncFileOperations::HandleDeleteStepL()
+MVcxMyVideosActiveTaskObserver::TStepResult CVcxMyVideosAsyncFileOperations::HandleDeleteStepL()
 {
 // Reset inactivity timer. This will prevent ThumbAGDaemon start running while
 // delete is ongoing and failing the operation due to locked file handle.
 User::ResetInactivityTime();
 CMPXMedia& cmd = iCollection.iActiveTask->GetCommand();
 //no sanity checks for array items, since we want to generate all events, even if there is nothing to delete
-TBool done;
+MVcxMyVideosActiveTaskObserver::TStepResult stepResult;
 TUint32 cmdId = cmd.ValueTObjectL<TUint32>( KVcxMediaMyVideosCommandId );
 // Start operations
 if ( iCurrentOperationIndex == 0 )
 // End operations
 if ( iCurrentOperationIndex > (iOperationIdArray.Count() - 1) )
 {
 iCurrentOperationIndex = 0;
-done                   = ETrue;
+stepResult = MVcxMyVideosActiveTaskObserver::EDone;
 SendOperationRespL( KVcxMessageMyVideosDeleteResp );
 }
 else
 {
-done = EFalse;
+stepResult = MVcxMyVideosActiveTaskObserver::EMoreToCome;
 }
-return done;
+return stepResult;
 }

branch	RCL_3
changeset 16	67eb01668b0e
parent 15	8f0df5c82986
child 21	315810614048