FCL/sf/app/musicplayer: comparison mpserviceplugins/mpxsqlitedbhgplugin/src/mpxdbplugin.cpp

equal deleted inserted replaced

-:ecf06a08d4d9
+:2c5162224003
 iMusicMenuTitle = iResource->ReadHBufCL(R_MPX_QTN_MP_TITLE_MY_MUSIC_MENU_NSERIES);
 #else
 iMusicMenuTitle = iResource->ReadHBufCL(R_MPX_QTN_MUS_TITLE_MUSIC_MENU);
 #endif // __ENABLE_MUSIC_TEXT_ALIGNMENT
 iActiveTask = CMPXDbActiveTask::NewL(*this);
 CRepository* cenrep(NULL);
 TRAPD( err, cenrep = CRepository::NewL( KCRUIDMusicPlayerFeatures ) );
 if( err == KErrNone )
 // Remove EVERYthing from the collection
 iDbHandler->RemoveEntireCollectionL();
 break;
 }
 case EMcCmdClose:
+	  // called before destructing this plug-in: no actions required
+	  break;
 case EMcCloseCollection:
 {
-MPX_DEBUG1("CMPXDbPlugin::CommandL - EMcCloseCollection");
+MPX_DEBUG2("CMPXDbPlugin::CommandL - EMcCloseCollection %d", aArg);
 // Close the specified database
 TRAP_IGNORE(iDbHandler->PreCloseCollectionL());
 #ifdef RD_MULTIPLE_DRIVE
 MPX_DEBUG1("Multiple drives closing databases");
 if ( aArg <0)
 User::LeaveIfError ( DriveInfo::GetUserVisibleDrives( iFs, driveArray));
 TInt count( driveArray.Count ());
 for (TInt i=0; i<count; ++i)
 {
 MPX_DEBUG2("At drive %i", driveArray[i]);
 if (( driveArray[i] != EDriveC) && (!iDbHandler->IsRemoteDrive(static_cast<TDriveNumber>(driveArray[i]))))
 {
 MPX_DEBUG2("Closing database %i", driveArray[i]);
 TRAP_IGNORE( iDbHandler->CloseDatabaseL( driveArray[i] ) );
 }
 }
 }
 else
 {
-iDbHandler->CloseDatabaseL(aArg);
+TRAP_IGNORE( iDbHandler->CloseDatabaseL(aArg) ); //Closing can fail if physical media has been removed or forced disk dismount has occurred.
 }
 #else
 iDbHandler->CloseDatabaseL(aArg);
 #endif // RD_MULTIPLE_DRIVE
-iDbHandler->CollectionClosed();
 break;
 }
 case EMcReOpenCollection:
 {
 MPX_DEBUG1("CMPXDbPlugin::CommandL - EMcReOpenCollection");
 User::LeaveIfError( DriveInfo::GetUserVisibleDrives( iFs, driveArray ) );
 TInt count( driveArray.Count() );
 for( TInt i=0; i<count; ++i )
 {
 MPX_DEBUG2("At drive %i", driveArray[i]);
 if( (driveArray[i] != EDriveC)  && (!iDbHandler->IsRemoteDrive(static_cast<TDriveNumber>(driveArray[i]))))
 {
 TUint driveStatus(0);
 User::LeaveIfError( DriveInfo::GetDriveStatus(
 iFs, driveArray[i], driveStatus ) );
 if( driveStatus & DriveInfo::EDrivePresent )
 }
 }
 #else
 iDbHandler->OpenDatabaseL(aArg);
 #endif // RD_MULTIPLE_DRIVE
-TRAP_IGNORE(iDbHandler->CollectionOpenedL());
 break;
 }
 case EMcRefreshStarted:
 {
 MPX_DEBUG1("CMPXDbPlugin::CommandL - EMcRefreshStarted");
 break;
 }
 case EMcCmdMtpStart:
 iDbHandler->CheckDiskSpaceOnDrivesL();
 iMtpInUse = ETrue;
 iDbHandler->MtpStartL();
 break;
 case EMcCmdMtpEnd:
 iDbHandler->CheckDiskSpaceOnDrivesL();
 iMtpInUse = EFalse;
 iDbHandler->MtpEndL();
 break;
 default:
 {
 User::Leave(KErrNotSupported);
 }
 TInt err( KErrNone );
 CMPXMediaArray* array = CMPXMediaArray::NewL();
 CleanupStack::PushL(array);
-//    TInt count(0);
 TInt levels(aPath.Levels());
 TBool isASong(EFalse);
 	if ( 1 == levels )
 total += temp;
 }
 // Add "all" item under an artist
 MPXDbCommonUtil::PrependMediaL(*aArray, *iAllSongsForArtistTitle, EMPXItem, EMPXAlbum,
 aPath.Id(idIndex), 0, 0, 1);
 (*aArray)[1]->SetTObjectValueL<TInt>(KMPXMediaGeneralCount, total);
 TMPXItemId allId = ((*aArray)[1]->ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId));
 if (aArray->Count() > 2)
 { // path media, all id  and at least one media
 ((CMPXCollectionPath*)pPath)->InsertL(allId, 0);
 }
 }
 else
 {
 iDbHandler->GetSongsMatchingPlaylistL(aPath.Id (idIndex).iId2, aAttrs, aArray);
 }
 SetMediaGeneralAttributesL(aEntries, EMPXItem, EMPXPlaylist, aPath.Id(idIndex).iId2);
 // populate EMPXMediaGeneralNonPermissibleActions
 if (iDbHandler->IsAutoPlaylistL(aPath.Id(idIndex).iId2))
 else if (category == EMPXPlaylist)
 {
 mediaId = iDbHandler->GetPlaylistIdMatchingUriL(uri);
 iDbHandler->RemovePlaylistL(mediaId, *fp, *itemChangedMessages);
 }
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 else if (category == EMPXAbstractAlbum )
 {
 mediaId = iDbHandler->GetAbstractAlbumIdMatchingUriL(uri);
-iDbHandler->RemoveAbstractAlbumL(mediaId, *fp, *itemChangedMessages);
+iDbHandler->RemoveAbstractAlbumL(mediaId, *itemChangedMessages, EFalse);
 }
 #endif // ABSTRACTAUDIOALBUM_INCLUDED
 else
 {
 // otherwise unable to process this item
 TUint32 itemId(0);
 CMPXMessageArray* changeMsgAry = CMPXMessageArray::NewL();
 CleanupStack::PushL(changeMsgAry);
-	// start a transaction here
+// start a transaction here
-	if (!iDbHandler->InTransaction())
+if (!iDbHandler->InTransaction())
-		{
+{
-		iDbHandler->BeginTransactionL();
+iDbHandler->BeginTransactionL();
-		}
+}
 // Group of items
 if (aMedia.ValueTObjectL<TMPXGeneralType>(KMPXMediaGeneralType) == EMPXGroup)
 {
 CMPXMediaArray* array = aMedia.Value<CMPXMediaArray>(KMPXMediaArrayContents);
 else // single item
 {
 itemId = DoAddItemL(aMedia, *changeMsgAry);
 }
-	// end transaction here.
+// end transaction here.
-	iDbHandler->EndTransactionL(KErrNone);
+iDbHandler->EndTransactionL(KErrNone);
 iActiveTask->SetVisibleChange(CMPXDbActiveTask::EAllVisible);
 DoHandleChangeL(changeMsgAry);
 CleanupStack::PopAndDestroy(changeMsgAry);
 break;
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 case EMPXAbstractAlbum:
 {
 if (aMedia.IsSupported(KMPXMediaGeneralUri))
 {
+//add abstractalbum to AbstractAlbum table
 itemId = iDbHandler->AddAbstractAlbumL(aMedia, &aMessageArray);
+//in case aMedia as mediaArray which contains songs as arrayContents, need to update all songs associated
 if ( aMedia.IsSupported(KMPXMediaArrayContents))
 {
-//need to update songs information to music table
+iDbHandler->UpdateSongsAbstractAlbumInfoL(aMedia, aMessageArray);
-CMPXMediaArray* array = aMedia.Value<CMPXMediaArray>(KMPXMediaArrayContents);
-if (array->Count())
-{
-iDbHandler->UpdateAbstractAlbumSongsL(aMedia, aMessageArray);
-}
 }
 }
 else
 {
 User::Leave(KErrArgument);
 break;
 #endif // ABSTRACTAUDIOALBUM_INCLUDED
 case EMPXSong:
 {
 // For the use case of adding thousands of songs at once,
 // we do not create a new database transaction for each song;
 // Instead DoAddL() will batch 100 songs under a single transaction.
 // This enhancement improves performance with MMC-based databases.
 if (aBatchCommit)
 {
 itemId = iDbHandler->AddSongWithNoTransactionL(aMedia, &aMessageArray);
 }
 else
 {
 itemId = iDbHandler->AddSongL(aMedia, &aMessageArray);
 }
 MPXDbCommonUtil::AddItemChangedMessageL(aMessageArray, itemId, EMPXItemInserted,
 EMPXSong, KDBPluginUid);
 }
 break;
 }
 break;
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 case EMPXAbstractAlbum:
 {
-visibleChange = iDbHandler->UpdateAbstractAlbumSongsL(aMedia, aMessageArray);
+//update all songes which associate with ABSTRACTALBUM
+if (aMedia.IsSupported(KMPXMediaGeneralUri))
+{
+//in case aMedia as mediaArray which contains songs as arrayContents, need to update all songs associated
+if ( aMedia.IsSupported(KMPXMediaArrayContents))
+{
+iDbHandler->UpdateSongsAbstractAlbumInfoL(aMedia, aMessageArray);
+}
+//only update field values in abstractalbum table, or renaming (change uri) for abstractalbum table
+else
+{
+visibleChange = iDbHandler->UpdateAbstractAlbumL(aMedia, aMessageArray);
+}
+}
 }
 break;
 #endif // ABSTRACTAUDIOALBUM_INCLUDED
 case EMPXSong:
 {
 case EBrowsePlaylist:
 case EBrowseGenre:
 case EBrowseComposer:
 {
 aAttrs.AppendL( TMPXAttribute(KMPXMediaIdMusic,
 //                    EMPXMediaMusicArtist | EMPXMediaMusicAlbumArtFileName ) );
 //added ganes
 EMPXMediaMusicArtist | EMPXMediaMusicAlbumArtFileName | EMPXMediaMusicAlbum) );
 aSupportedIds.AppendL( KMPXMediaIdMusic );
 break;
 }
 }
 }

changeset 34	2c5162224003
parent 22	ecf06a08d4d9
child 29	8192e5b5c935