FCL/sf/app/musicplayer: comparison mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/src/mpxdbhandler.cpp

equal deleted inserted replaced

-:3de6c4cf6b67
+:2cbbefa9af78
 // Create the db infrastructure,
 //
 iDbMusic = CMPXDbMusic::NewL(*iDbManager, iResource, *this);
 iDbPlaylist = CMPXDbPlaylist::NewL(*iDbManager, *this);
-iDbArtist = CMPXDbArtist::NewL(*iDbManager, EMPXArtist, *this);
+iDbArtist = CMPXDbArtist::NewL(*iDbManager, EMPXArtist);
 iDbAlbum = CMPXDbAlbum::NewL(*iDbManager, EMPXAlbum, *this);
 iDbGenre = CMPXDbGenre::NewL(*iDbManager, EMPXGenre);
 iDbComposer = CMPXDbComposer::NewL(*iDbManager, EMPXComposer);
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 iDbAbstractAlbum = CMPXDbAbstractAlbum::NewL(*iDbManager, EMPXAbstractAlbum, iFs);
 if (contentId == KMPXMediaIdGeneral && attributeId & EMPXMediaGeneralCount)
 {
 MPX_DEBUG1("    EMPXMediaGeneralCount");
-attributes.Append(TMPXAttribute(KMPXMediaIdGeneral, attributeId & ~EMPXMediaGeneralCount));
+attributes.AppendL(TMPXAttribute(KMPXMediaIdGeneral, attributeId & ~EMPXMediaGeneralCount));
 tryGetSongCount = ETrue;
 break;
 }
-attributes.Append(aAttrs[i]);
+attributes.AppendL(aAttrs[i]);
 }
 for (TInt j = i+1; j < attrCount; j++)
 {
-attributes.Append(aAttrs[j]);
+attributes.AppendL(aAttrs[j]);
 }
 iDbAlbum->GetSubCategoryItemsL(EMPXArtist, aArtistId, attributes.Array(), aMediaArray);
 CleanupStack::PopAndDestroy(&attributes);
 TInt pPath(0);
 CleanupStack::PopAndDestroy(uri);
 // Update the category records
 TBool categoryExist( EFalse );
 iDbArtist->DecrementSongsForCategoryL(artistID, drive, &aItemChangedMessages, categoryExist);
-iDbAlbum->DecrementSongsForCategoryL(albumID, drive, &aItemChangedMessages, categoryExist, artistID, *art);
+iDbAlbum->DecrementSongsForAlbumL(albumID, drive, &aItemChangedMessages, categoryExist, *art);
 iDbGenre->DecrementSongsForCategoryL(genreID, drive, &aItemChangedMessages, categoryExist);
 iDbComposer->DecrementSongsForCategoryL(composerID, drive, &aItemChangedMessages, categoryExist);
 CleanupStack::PopAndDestroy(art);
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 if (abstractAlbumID)
 // Find all songs, all songs in a particular album and/or artist, or
 // a particular song
 //////////////////////////////////////////////////////////////////////
 else
 {
-iDbMusic->FindSongsL(id, containerId, type, aCriteria, aAttrs, aMediaArray);
+TBool sortByTrackOrder = EFalse;
+// construct the sort order depending on category. Albums are always sorted by track,
+// then name, except for unknown album. Songs are sorted by name for unknown album.
+// NULL track number is stored as KMaxTInt so that they will be sorted to the end
+if ((type == EMPXGroup) && (MPX_ITEM_CATEGORY(id) == EMPXAlbum) && !iDbAlbum->IsUnknownAlbumL(id))
+{
+sortByTrackOrder = ETrue;
+}
+iDbMusic->FindSongsL(id, containerId, type, aCriteria, aAttrs, aMediaArray, sortByTrackOrder);
 }
 }
 // ----------------------------------------------------------------------------
 // Get song(s) in the specified playlist
 }
 #endif // RD_MULTIPLE_DRIVE
 // ----------------------------------------------------------------------------
-// CMPXDbHandler::AddCategoryItemL
+// CMPXDbHandler::AddAbstractAlbumItemL
 // ----------------------------------------------------------------------------
 //
-TUint32 CMPXDbHandler::AddCategoryItemL(
+#ifdef ABSTRACTAUDIOALBUM_INCLUDED
-TMPXGeneralCategory aCategory,
+TUint32 CMPXDbHandler::AddAbstractAlbumItemL(
 const TDesC& aName,
 TInt aDriveId,
 CMPXMessageArray* aItemChangedMessages,
-TBool& aItemExist
+TBool& aItemExist,
-#ifdef ABSTRACTAUDIOALBUM_INCLUDED
+const TDesC& aUri,
-,const TDesC& aUri
+const TDesC& aAlbumArtist
-,const TDesC& aAlbumArtist
-#endif // ABSTRACTAUDIOALBUM_INCLUDED
 )
 {
+MPX_FUNC("CMPXDbHandler::AddAbstractAlbumItemL()");
+MPX_PERF_START(CMPXDbHandler_AddAbstractAlbumItemL);
+TBool newRecord(EFalse);
+TUint32 id(0);
+//AbstractAlbum is not case sensitive
+id =  iDbAbstractAlbum->AddItemL(aUri, aName, aAlbumArtist, aDriveId, newRecord, EFalse);
+MPX_PERF_END(CMPXDbHandler_AddAbstractAlbumItemL);
+return id;
+}
+#endif
+// ----------------------------------------------------------------------------
+// CMPXDbHandler::AddCategoryItemL
+// ----------------------------------------------------------------------------
+//
+TUint32 CMPXDbHandler::AddCategoryItemL(
+TMPXGeneralCategory aCategory,
+const CMPXMedia& aMedia,
+TInt aDriveId,
+CMPXMessageArray* aItemChangedMessages,
+TBool& aItemExist)
+{
 MPX_FUNC("CMPXDbHandler::AddCategoryItemL()");
 MPX_PERF_START(CMPXDbHandler_AddCategoryItemL);
+ASSERT(aCategory != EMPXAbstractAlbum);
 TBool newRecord(EFalse);
-#ifdef ABSTRACTAUDIOALBUM_INCLUDED
-TUint32 id(0);
+TUint32 id = DbCategoryL(aCategory)->AddItemL(aCategory, aMedia, aDriveId, newRecord, aCategory != EMPXGenre);
-//for AbstractAlbum, SetAbstractAlbum, associate songs with abstractalbum.
-//only called with newRecord as EFalse
-//increment songCount if id exist in AbstractAlbum table, otherwise do nothing.
-//only Genre, AbstractAlbum are not case sensitive
-TBool caseSensitive = ETrue;
-if ((aCategory == EMPXGenre) || (aCategory == EMPXAbstractAlbum))
-caseSensitive = EFalse;
-if (aCategory == EMPXAbstractAlbum)
-{
-id =  iDbAbstractAlbum->AddItemL(aUri, aName, aAlbumArtist, aDriveId, newRecord, caseSensitive);
-}
-else
-{
-id = DbCategoryL(aCategory)->AddItemL(aName, aDriveId, newRecord, caseSensitive);
-#else
-TUint32 id(DbCategoryL(aCategory)->AddItemL(aName, aDriveId, newRecord, (aCategory != EMPXGenre)));
-#endif // ABSTRACTAUDIOALBUM_INCLUDED
 if (newRecord && aItemChangedMessages)
 {
 MPXDbCommonUtil::AddItemChangedMessageL(*aItemChangedMessages, id, EMPXItemInserted,
 aCategory, KDBPluginUid);
 }
-// when the added item's category is Genre or Composer,
+// when the added item's category is Genre, Composer or Artist, and it is NOT a new record,
-// and it is NOT a new record,
 // we should send the item number changed message
-else if ( ( aCategory == EMPXGenre || aCategory == EMPXComposer ) &&
+else if ( ( aCategory == EMPXGenre || aCategory == EMPXComposer || aCategory == EMPXArtist) &&
 !newRecord && aItemChangedMessages )
 {
 MPXDbCommonUtil::AddItemChangedMessageL(*aItemChangedMessages, id, EMPXItemModified,
 aCategory, KDBPluginUid);
 }
 aItemExist = !newRecord;
-#ifdef ABSTRACTAUDIOALBUM_INCLUDED
-}
-#endif // ABSTRACTAUDIOALBUM_INCLUDED
 MPX_PERF_END(CMPXDbHandler_AddCategoryItemL);
-return id;
-}
+return id;
+}
-TUint32 CMPXDbHandler::AddCategoryItemL(
-TMPXGeneralCategory aCategory,
+// ----------------------------------------------------------------------------
-const TDesC& aName,
+// CMPXDbHandler::UpdateCategoryItemL
-const TDesC& aArtistName,
+// ----------------------------------------------------------------------------
-const TDesC& aArt,
+//
-TInt aDriveId,
-CMPXMessageArray* aItemChangedMessages,
-TBool& aItemExist)
-	{
-MPX_FUNC("CMPXDbHandler::AddCategoryItemL()");
-MPX_PERF_START(CMPXDbHandler_AddCategoryItemL);
-TBool newRecord(EFalse);
-TUint32 id = 0;
-if(aCategory == EMPXAlbum)
-{
-id = iDbAlbum->AddItemL(aName, aArtistName, aArt, aDriveId, newRecord, (aCategory != EMPXGenre));
-}
-else
-{
-id = iDbArtist->AddItemL(aName, aArt, aDriveId, newRecord, (aCategory != EMPXGenre));
-}
-if (newRecord && aItemChangedMessages)
-{
-MPXDbCommonUtil::AddItemChangedMessageL(*aItemChangedMessages, id, EMPXItemInserted,
-aCategory, KDBPluginUid);
-}
-// when the added item's category is Artist, and it is NOT a new record,
-// we should send the item number changed message
-else if (  aCategory == EMPXArtist &&
-!newRecord && aItemChangedMessages )
-{
-MPXDbCommonUtil::AddItemChangedMessageL(*aItemChangedMessages, id, EMPXItemModified,
-aCategory, KDBPluginUid);
-}
-aItemExist = !newRecord;
-MPX_PERF_END(CMPXDbHandler_AddCategoryItemL);
-return id;
-}
 void CMPXDbHandler::UpdateCategoryItemL(
 TMPXGeneralCategory aCategory,
 TUint32 aCategoryId,
 const CMPXMedia& aMedia,
 TInt aDrive,
 CMPXMessageArray* aItemChangedMessages)
 {
-switch(aCategory)
+DbCategoryL(aCategory)->UpdateItemL(aCategoryId, aMedia, aDrive, aItemChangedMessages);
-{
+}
-case EMPXAlbum:
-iDbAlbum->UpdateItemL(aCategoryId, aMedia, aDrive, aItemChangedMessages);
-break;
-case EMPXArtist:
-iDbArtist->UpdateItemL(aCategoryId, aMedia, aDrive, aItemChangedMessages);
-break;
-default:
-DbCategoryL(aCategory)->UpdateItemL(aCategoryId, aMedia, aDrive, aItemChangedMessages);
-break;
-}
-}
 // ----------------------------------------------------------------------------
 // CMPXDbHandler::DeleteSongForCategoryL
 // ----------------------------------------------------------------------------
 //
 void CMPXDbHandler::DeleteSongForCategoryL(
 TMPXGeneralCategory aCategory,
 TUint32 aCategoryId,
 TInt aDriveId,
 CMPXMessageArray* aItemChangedMessages,
-TBool& aItemExist)
+TBool& aItemExist,
+const TDesC& aArt
+)
 {
 MPX_FUNC("CMPXDbHandler::DeleteSongForCategoryL");
-DbCategoryL(aCategory)->DecrementSongsForCategoryL(aCategoryId, aDriveId,
+switch(aCategory)
-aItemChangedMessages, aItemExist);
+{
+case EMPXAlbum:
+iDbAlbum->DecrementSongsForAlbumL(aCategoryId, aDriveId, aItemChangedMessages, aItemExist, aArt);
+break;
+default:
+DbCategoryL(aCategory)->DecrementSongsForCategoryL(aCategoryId, aDriveId,
+aItemChangedMessages, aItemExist);
+break;
+}
 }
 // ----------------------------------------------------------------------------
 // CMPXDbHandler::HandlePlayCountModifiedL
 // ----------------------------------------------------------------------------
 // Force the deprecated ID attribute
 aItemChangedMessages[aItemChangedMessages.Count() - 1]->
 SetTObjectValueL<TMPXItemId>(KMPXMessageMediaDeprecatedId, plId);
 }
 // ---------------------------------------------------------------------------
 // CMPXDbHandler::IsRemoteDrive
 // ---------------------------------------------------------------------------
 //
 CleanupStack::PopAndDestroy(mediaArray);
 CleanupStack::PopAndDestroy(&attributes);
 }
-TInt CMPXDbHandler::HandleGetAlbumsCountForArtistL(TUint32 aArtistId)
-{
-return iDbAlbum->GetAlbumsCountForArtistL(aArtistId);
-}
-TBool CMPXDbHandler::HandleIsUnknownArtistL(TUint32 aArtistId)
-{
-return iDbArtist->IsUnknownArtistL(aArtistId);
-}
-// ---------------------------------------------------------------------------
-// CMPXDbHandler::HandleArtistForAlbumL
-// ---------------------------------------------------------------------------
-//
-HBufC* CMPXDbHandler::HandleArtistForAlbumL(const TUint32 aAlbumId)
-{
-TUint32 artistId = iDbMusic->ArtistForAlbumL(aAlbumId);
-HBufC* artistname = GetNameMatchingIdL(artistId);
-return artistname;
-}
 // ---------------------------------------------------------------------------
 // CMPXDbHandler::HandleAlbumartForAlbumL
 // ---------------------------------------------------------------------------
 //
 HBufC*  CMPXDbHandler::HandleAlbumartForAlbumL(const TUint32 aAlbumId, TPtrC aArt)
 {
 return iDbMusic->AlbumartForAlbumL(aAlbumId, aArt);
 }
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 // ----------------------------------------------------------------------------------------------------------
 // CMPXDbHandler::HandleGetAlbumNameForSongL
 // ----------------------------------------------------------------------------------------------------------
 //
 HBufC* CMPXDbHandler::HandleGetAlbumNameFromIdL(TUint32 aId)
 {
 return iDbAbstractAlbum->GetUriL(aId);
 }
 #endif // ABSTRACTAUDIOALBUM_INCLUDED
+// ----------------------------------------------------------------------------
+// CMPXDbHandler::DeleteAlbumForArtistL
+// ----------------------------------------------------------------------------
+//
+void CMPXDbHandler::DeleteAlbumForArtistL(TUint32 aCategoryId,
+TInt aDrive, CMPXMessageArray* aItemChangedMessages)
+{
+MPX_FUNC("CMPXDbHandler::DeleteAlbumForArtistL");
+iDbArtist->DecrementAlbumsForArtistL(aCategoryId, aDrive, aItemChangedMessages);
+}
+// ----------------------------------------------------------------------------
+// CMPXDbHandler::AddAlbumArtistL
+// ----------------------------------------------------------------------------
+//
+TUint32 CMPXDbHandler::AddAlbumArtistL(const TDesC& aName, const TDesC& aArt, TInt aDriveId)
+{
+MPX_FUNC("CMPXDbHandler::AddAlbumArtistL");
+return iDbArtist->AddAlbumArtistL(aName, aArt, aDriveId);
+}
+// ----------------------------------------------------------------------------
+// CMPXDbHandler::GenerateUniqueIdForAlbumL
+// ----------------------------------------------------------------------------
+//
+TUint32 CMPXDbHandler::GenerateUniqueIdForAlbumL(const CMPXMedia& aMedia)
+{
+return iDbAlbum->GenerateUniqueIdL(aMedia);
+}
+// ----------------------------------------------------------------------------
+// CMPXDbHandler::IsUnknownAlbumL
+// ----------------------------------------------------------------------------
+//
+TBool CMPXDbHandler::IsUnknownAlbumL(const TUint32 aId)
+{
+return iDbAlbum->IsUnknownAlbumL(aId);
+}
 // End of file

branch	RCL_3
changeset 56	2cbbefa9af78
parent 53	3de6c4cf6b67
child 66	1f1dad4af8f8