--- a/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/src/mpxdbalbum.cpp Wed Sep 15 12:09:46 2010 +0300
+++ b/mpxplugins/serviceplugins/collectionplugins/mpxsqlitedbhgplugin/src/mpxdbalbum.cpp Wed Oct 13 14:28:40 2010 +0300
@@ -37,11 +37,6 @@
_LIT( KAbstractAlbumExt, ".alb" );
#endif // ABSTRACTAUDIOALBUM_INCLUDED
-_LIT( KAlbumAlbumArtistSeperator, "\t1");
-_LIT( KAlbumArtistSeperator, "\t2");
-
-const TInt KUnknownAlbumsGranularity = 250;
-
// ============================ MEMBER FUNCTIONS ==============================
// ----------------------------------------------------------------------------
@@ -84,9 +79,6 @@
CMPXDbAlbum::~CMPXDbAlbum()
{
MPX_FUNC("CMPXDbAlbum::~CMPXDbAlbum");
-
- iUnknownArtists.ResetAndDestroy();
- iUnknownAlbums.ResetAndDestroy();
}
// ----------------------------------------------------------------------------
@@ -98,9 +90,7 @@
TMPXGeneralCategory aCategory,
MMPXDbAlbumObserver& aObserver) :
CMPXDbCategory(aDbManager, aCategory),
- iObserver(aObserver),
- iUnknownArtists(KUnknownAlbumsGranularity),
- iUnknownAlbums(KUnknownAlbumsGranularity)
+ iObserver(aObserver)
{
MPX_FUNC("CMPXDbAlbum::CMPXDbAlbum");
}
@@ -121,81 +111,79 @@
// ----------------------------------------------------------------------------
//
TUint32 CMPXDbAlbum::AddItemL(
- TMPXGeneralCategory /*aCategory*/,
- const CMPXMedia& aMedia,
+ const TDesC& aName,
+ const TDesC& aArtistName,
+ const TDesC& aArt,
TInt aDriveId,
TBool& aNewRecord,
TBool aCaseSensitive)
{
MPX_FUNC("CMPXDbAlbum::AddItemL");
- TPtrC album(KNullDesC);
- TPtrC albumArtist(KNullDesC);
- TPtrC artist(KNullDesC);
- TPtrC albumArt(KNullDesC);
-
// try to find the item first
- TUint32 rowId(GenerateUniqueIdL(aMedia));
-
- // retrieve the existing record
- HBufC* query = PreProcessStringLC(KQueryCategoryItem);
- RSqlStatement recordset(
- iDbManager.ExecuteSelectQueryL(aDriveId, *query, rowId));
- CleanupStack::PopAndDestroy(query);
- CleanupClosePushL(recordset);
-
- TInt result = recordset.Next();
- if (result == KSqlAtEnd)
+ TUint32 rowId(MPXDbCommonUtil::GenerateUniqueIdL(iDbManager.Fs(), iCategory,
+ aName, aCaseSensitive));
+ aNewRecord = !CategoryItemExistsL(aDriveId, rowId);
+
+ if (aNewRecord)
+ {
+ // insert new
+ HBufC* query = PreProcessStringLC(KQueryAlbumInsert);
+ HBufC* name = MPXDbCommonUtil::ProcessSingleQuotesLC(aName);
+ HBufC* artistname = MPXDbCommonUtil::ProcessSingleQuotesLC(aArtistName);
+ HBufC* art = MPXDbCommonUtil::ProcessSingleQuotesLC(aArt);
+
+ iDbManager.ExecuteQueryL(aDriveId, *query, rowId, artistname, name, 1, art);
+
+ CleanupStack::PopAndDestroy(art);
+ CleanupStack::PopAndDestroy(artistname);
+ CleanupStack::PopAndDestroy(name);
+ CleanupStack::PopAndDestroy(query);
+ }
+ else
{
- aNewRecord = result;
-
- // check Album attribute
- if (aMedia.IsSupported(KMPXMediaMusicAlbum))
+ // retrieve the existing record
+ HBufC* query = NULL;
+ query = PreProcessStringLC(KQueryCategoryItem);
+ RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(*query, rowId));
+ CleanupStack::PopAndDestroy(query);
+
+ CleanupClosePushL(recordset);
+
+ if (recordset.Next() != KSqlAtRow)
{
- album.Set(aMedia.ValueText(KMPXMediaMusicAlbum).Left(KMCMaxTextLen));
- }
-
- // check AlbumArt attirbute
- if (aMedia.IsSupported(KMPXMediaMusicAlbumArtFileName))
+ User::Leave(KErrNotFound);
+ }
+
+ // Artist
+ TPtrC artistname(KNullDesC);
+ artistname.Set(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumArtistName));
+
+
+ // the current one is Unknown and the new one is Not Unknown.
+ if ( artistname == KNullDesC && aArtistName!= KNullDesC )
{
- albumArt.Set(aMedia.ValueText(KMPXMediaMusicAlbumArtFileName).Left(KMCMaxTextLen));
+ HBufC* artistnameReplaceSingleQuote =
+ MPXDbCommonUtil::ProcessSingleQuotesLC( aArtistName );
+ TPtrC criteria(KCriterionArtistName);
+ HBufC* setStr = HBufC::NewLC(criteria.Length() + artistnameReplaceSingleQuote->Length());
+ setStr->Des().Format( KCriterionArtistName, artistnameReplaceSingleQuote );
+
+ iDbManager.ExecuteQueryL(aDriveId, KQueryAlbumUpdate, setStr, rowId);
+ CleanupStack::PopAndDestroy(setStr);
+ CleanupStack::PopAndDestroy(artistnameReplaceSingleQuote);
+
}
- // insert new
- HBufC* name = MPXDbCommonUtil::ProcessSingleQuotesLC(album);
- TUint32 artistId(0);
- HBufC* artistName = NULL;
- if (RetrieveAlbumArtistL(aMedia, albumArtist))
- {
- artistId = iObserver.AddAlbumArtistL(albumArtist, albumArt, aDriveId);
- artistName = MPXDbCommonUtil::ProcessSingleQuotesLC(albumArtist);
- }
- else
- {
- RetrieveArtist(aMedia, artist);
- artistId = iObserver.AddAlbumArtistL(artist, albumArt, aDriveId);
- artistName = MPXDbCommonUtil::ProcessSingleQuotesLC(artist);
- }
-
- HBufC* art = MPXDbCommonUtil::ProcessSingleQuotesLC(albumArt);
-
- iDbManager.ExecuteQueryL(aDriveId, KQueryAlbumInsert, rowId, name, 1, artistId, artistName,art);
-
- CleanupStack::PopAndDestroy(art);
- CleanupStack::PopAndDestroy(artistName);
- CleanupStack::PopAndDestroy(name);
- }
- else if (result == KSqlAtRow)
- {
- // retrieve Art from Album table
+ // Album Art
TPtrC art(KNullDesC);
art.Set(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumArt));
// the current one is Unknown and the new one is Not Unknown
- if ( art == KNullDesC && albumArt != KNullDesC )
+ if ( art == KNullDesC && aArt != KNullDesC )
{
HBufC* artReplaceSingleQuote =
- MPXDbCommonUtil::ProcessSingleQuotesLC( albumArt );
+ MPXDbCommonUtil::ProcessSingleQuotesLC( aArt );
TPtrC criteria(KCriterionArt);
HBufC* setStr = HBufC::NewLC(criteria.Length() + artReplaceSingleQuote->Length());
@@ -206,57 +194,35 @@
CleanupStack::PopAndDestroy(artReplaceSingleQuote);
}
+ CleanupStack::PopAndDestroy(&recordset);
+
// increment the number of songs for the category
query = PreProcessStringLC(KQueryCategoryIncrementSongCount);
iDbManager.ExecuteQueryL(aDriveId, *query, rowId);
CleanupStack::PopAndDestroy(query);
- } // existing record
- else
- {
- MPX_DEBUG2("SQL error %d", result);
- User::Leave(result);
}
- CleanupStack::PopAndDestroy(&recordset);
-
return rowId;
}
// ----------------------------------------------------------------------------
-// CMPXDbAlbum::DecrementSongsForAlbumL
+// CMPXDbAlbum::DecrementSongsForCategoryL
// ----------------------------------------------------------------------------
//
-void CMPXDbAlbum::DecrementSongsForAlbumL(
+void CMPXDbAlbum::DecrementSongsForCategoryL(
const TUint32 aId,
TInt aDriveId,
CMPXMessageArray* aItemChangedMessages,
TBool& aItemExist,
- const TDesC& aArt)
+ const TUint32 aArtist,
+ const TDesC& aArt)
{
- MPX_FUNC("CMPXDbAlbum::DecrementSongsForAlbumL");
-
- // retrieve the existing record
- HBufC* query = PreProcessStringLC(KQueryCategoryItem);
- RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(*query, aId));
- CleanupStack::PopAndDestroy(query);
-
- CleanupClosePushL(recordset);
-
- if (recordset.Next() != KSqlAtRow)
- {
- User::Leave(KErrNotFound);
- }
+ MPX_FUNC("CMPXDbAlbum::DecrementSongsForCategoryL");
// if just one song uses this category. Use <= just in case
- if (recordset.ColumnInt64(EAlbumSongCount) <= 1)
+ if (GetSongsCountL(aDriveId, aId) <= 1)
{
aItemExist = EFalse;
-
- // Decrement albums count on artist
- TUint32 albumArtistId = recordset.ColumnInt64(EAlbumArtist);
- iObserver.DeleteAlbumForArtistL(albumArtistId, aDriveId, aItemChangedMessages);
- CleanupStack::PopAndDestroy(&recordset);
-
// delete the category
DeleteCategoryL(aId, aDriveId);
@@ -271,10 +237,63 @@
{
aItemExist = ETrue;
+ // retrieve the existing record
+ HBufC* query = PreProcessStringLC(KQueryCategoryItem);
+ RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(*query, aId));
+ CleanupStack::PopAndDestroy(query);
+
+ CleanupClosePushL(recordset);
+
+ if (recordset.Next() != KSqlAtRow)
+ {
+ User::Leave(KErrNotFound);
+ }
+
TBool itemModified = EFalse;
-
- TPtrC art(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumArt));
- if (NeedToUpdateArt(aArt, art))
+ TPtrC artistname(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumArtistName));
+ TUint32 artistId = MPXDbCommonUtil::GenerateUniqueIdL(iDbManager.Fs(), EMPXArtist,
+ artistname, ETrue);
+
+ // the current artist is equal to deleted song's artist
+ if ( artistId == aArtist )
+ {
+ HBufC* newArtistname = ArtistForAlbumL(aId);
+
+ CleanupStack::PushL(newArtistname);
+ if (newArtistname && newArtistname->CompareF(artistname)!=0)
+ {
+ HBufC* artistnameReplaceSingleQuote = MPXDbCommonUtil::ProcessSingleQuotesLC( *newArtistname );
+ TPtrC criteria(KCriterionArtistName);
+ HBufC* setStr = HBufC::NewLC(criteria.Length() + artistnameReplaceSingleQuote->Length());
+ setStr->Des().Format( KCriterionArtistName, artistnameReplaceSingleQuote );
+
+ iDbManager.ExecuteQueryL(aDriveId, KQueryAlbumUpdate, setStr, aId);
+ CleanupStack::PopAndDestroy(setStr);
+ CleanupStack::PopAndDestroy(artistnameReplaceSingleQuote);
+ itemModified = ETrue;
+ }
+ CleanupStack::PopAndDestroy(newArtistname);
+ }
+
+#ifdef ABSTRACTAUDIOALBUM_INCLUDED
+ TBool nonEmbeddedArt = EFalse;
+ if (aArt.Length()>0)
+ {
+ TParsePtrC parse(aArt);
+ TPtrC ext(parse.Ext());
+ //set flag to false, so .alb will not overwrite art field in album, artist table
+ // when song with embedded art
+ if (ext.CompareF(KAbstractAlbumExt)== 0)
+ {
+ nonEmbeddedArt = ETrue;
+ }
+ }
+ if (!nonEmbeddedArt)
+ {
+#endif // ABSTRACTAUDIOALBUM_INCLUDED
+ TPtrC art(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumArt));
+ // the current art is equal to deleted song's art
+ if(aArt.Length()>0 && art.Length()>0 && aArt.CompareF(art) ==0 )
{
MPX_DEBUG2("AlbumArt of the Song to be deleted is [%S]", &aArt);
@@ -285,7 +304,7 @@
//update Album table only if alternative albumart found
if (newArt)
{
- MPX_DEBUG1("CMPXDbAlbum::DecrementSongsForAlbumL, get newArt");
+ MPX_DEBUG1("CMPXDbAlbum::DecrementSongsForCategoryL, get newArt");
HBufC* artReplaceSingleQuote = MPXDbCommonUtil::ProcessSingleQuotesLC( *newArt );
TPtrC criteria(KCriterionArt);
HBufC* setStr = HBufC::NewLC(criteria.Length() + artReplaceSingleQuote->Length());
@@ -296,15 +315,17 @@
CleanupStack::PopAndDestroy(artReplaceSingleQuote);
itemModified = ETrue;
}
- CleanupStack::PopAndDestroy(newArt);
- }
-
+ CleanupStack::PopAndDestroy(newArt);
+ }
+#ifdef ABSTRACTAUDIOALBUM_INCLUDED
+ }
+#endif // ABSTRACTAUDIOALBUM_INCLUDED
if (aItemChangedMessages && itemModified)
- {
- // add the item changed message
- MPXDbCommonUtil::AddItemAlbumChangedMessageL(*aItemChangedMessages, aId, EMPXItemModified,
- EMPXAlbum, KDBPluginUid, ETrue, 0 );
- }
+ {
+ // add the item changed message
+ MPXDbCommonUtil::AddItemAlbumChangedMessageL(*aItemChangedMessages, aId, EMPXItemModified,
+ EMPXAlbum, KDBPluginUid, ETrue, 0 );
+ }
CleanupStack::PopAndDestroy(&recordset);
// decrement the number of songs for the category
@@ -324,16 +345,12 @@
{
MPX_FUNC("CMPXDbAlbum::GetAllCategoryItemsL");
- RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(KQueryAlbumAll()));
+ HBufC* query = PreProcessStringLC(KQueryAlbumAll);
+ RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(*query));
+ CleanupStack::PopAndDestroy(query);
CleanupClosePushL(recordset);
- TRAPD(err, ProcessAlbumRecordSetL(aAttrs, recordset, aMediaArray));
- if (err != KErrNone)
- {
- iUnknownArtists.ResetAndDestroy();
- iUnknownAlbums.ResetAndDestroy();
- User::LeaveIfError(err);
- }
+ ProcessRecordsetL(aAttrs, recordset, aMediaArray);
CleanupStack::PopAndDestroy(&recordset);
}
@@ -374,6 +391,39 @@
}
// ----------------------------------------------------------------------------
+// CMPXDbAlbum::GetAlbumsCountForArtistL
+// ----------------------------------------------------------------------------
+//
+TInt CMPXDbAlbum::GetAlbumsCountForArtistL(TUint32 aArtistId)
+ {
+ RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(KQueryCategorySubcategoryItems, aArtistId));
+
+ TInt prevId(0);
+ TInt count(0);
+ TInt err(KErrNone);
+
+ while ((err = recordset.Next()) == KSqlAtRow)
+ {
+ TUint32 rowId(recordset.ColumnInt64(EAlbumUniqueId));
+ if (prevId == rowId)
+ {
+ continue;
+ }
+
+ count++;
+ prevId = rowId;
+ }
+
+ if (err != KSqlAtEnd)
+ {
+ User::Leave(err);
+ }
+
+ return count;
+
+ }
+
+// ----------------------------------------------------------------------------
// CMPXDbAlbum::GetSongsCountInAlbumMatchingArtistL
// ----------------------------------------------------------------------------
//
@@ -435,7 +485,14 @@
{
MPX_DEBUG1(" EMPXMediaMusicArtist");
- TPtrC artistName(MPXDbCommonUtil::GetColumnTextL(aRecord, EAlbumArtistName));
+ TPtrC artistName(KNullDesC);
+
+ // if album is unknown, ignore arist name
+ if (MPXDbCommonUtil::GetColumnTextL(aRecord, EAlbumName) != KNullDesC)
+ {
+ artistName.Set(MPXDbCommonUtil::GetColumnTextL(aRecord, EAlbumArtistName));
+ }
+
aMedia.SetTextValueL(KMPXMediaMusicArtist, artistName);
MPX_DEBUG2(" Artist[%S]", &artistName);
}
@@ -461,7 +518,14 @@
{
MPX_DEBUG1(" EMPXMediaMusicAlbumArtFileName");
- TPtrC art(MPXDbCommonUtil::GetColumnTextL(aRecord, EAlbumArt));
+ TPtrC art(KNullDesC);
+
+ // if album is unknown, ignore album art name
+ if (MPXDbCommonUtil::GetColumnTextL(aRecord, EAlbumName) != KNullDesC)
+ {
+ art.Set(MPXDbCommonUtil::GetColumnTextL(aRecord, EAlbumArt));
+ }
+
aMedia.SetTextValueL(KMPXMediaMusicAlbumArtFileName, art);
MPX_DEBUG2(" Art[%S]", &art);
}
@@ -482,10 +546,34 @@
{
const TDesC& albumArtFilename = aMedia.ValueText(KMPXMediaMusicAlbumArtFileName).Left(KMCMaxTextLen);
MPXDbCommonUtil::AppendValueL(aFields, aValues, KMCMusicArt, albumArtFilename);
- }
+ }
+
+ if (aMedia.IsSupported(KMPXMediaMusicArtist))
+ {
+ const TDesC& artistName = aMedia.ValueText(KMPXMediaMusicArtist).Left(KMCMaxTextLen);
+ MPXDbCommonUtil::AppendValueL(aFields, aValues, KMCAlbumArtistName, artistName);
+ }
}
// ----------------------------------------------------------------------------
+// CMPXDbAlbum::IsUnknownArtistL
+// ----------------------------------------------------------------------------
+//
+TBool CMPXDbAlbum::IsUnknownArtistL(TUint32 aId)
+ {
+ return iObserver.HandleIsUnknownArtistL(aId);
+ }
+
+// ----------------------------------------------------------------------------
+// CMPXDbAlbum::ArtistForAlbumL
+// ----------------------------------------------------------------------------
+//
+HBufC* CMPXDbAlbum::ArtistForAlbumL(const TUint32 aId)
+ {
+ return iObserver.HandleArtistForAlbumL(aId);
+ }
+
+// ----------------------------------------------------------------------------
// CMPXDbAlbum::AlbumartForAlbumL
// ----------------------------------------------------------------------------
//
@@ -495,361 +583,6 @@
}
// ----------------------------------------------------------------------------
-// CMPXDbAlbum::ProcessAlbumRecordSetL
-// Unknown album or Unknown artist are stored in the database as NULL (Name field and ArtistName field).
-// The available unknown album is saved for later and will be appended to the array
-// as the last item among items which have the same artist.
-// The available unknown artists are saved for later and will be appended to the array
-// as the last items after all known artists are appended.
-// The unknown album and unknown artist is saved for later and will be appended to the array
-// as the last item.
-//
-// NOTE: putting unknown album to the end of the array only takes place when title
-// field is requested. normal sorting algorithm occurs if title isn't
-// requested.
-//
-// Example:
-// Album X of artist A
-// Album Y of artist A
-// Unknown album of artist A
-// Album X of artist B
-// Album Z of artist B
-// Unknown album of artist B
-// Album X of unknown artist
-// Album Y of unknown artist
-// Unknown album of unknown artist
-// ----------------------------------------------------------------------------
-//
-void CMPXDbAlbum::ProcessAlbumRecordSetL(
- const TArray<TMPXAttribute>& aAttrs,
- RSqlStatement& aRecordset,
- CMPXMediaArray& aMediaArray)
- {
- // populate the array
- TBool firstRecord(ETrue);
- CMPXMedia* unknownAlbumUnknownArtistMedia(NULL);
- CMPXMedia* unknownMedia(NULL);
- TUint32 prevId(0);
- TUint32 artistId(0);
- TUint32 prevArtistId(0);
- TInt count(0);
- TInt err(KErrNone);
-
- // Reset array for unknown artists
- if (iUnknownArtists.Count() > 0)
- {
- iUnknownArtists.ResetAndDestroy();
- }
-
- // Reset array for unknown albums
- if (iUnknownAlbums.Count() > 0)
- {
- iUnknownAlbums.ResetAndDestroy();
- }
-
- TInt pPath(0);
- if (aMediaArray.Count())
- {
- CMPXMedia* pMedia = aMediaArray[0];
- if (pMedia->IsSupported(KMPXMediaGeneralValue))
- { // Query excuted by OpenL
- pPath = pMedia->ValueTObjectL<TInt>(KMPXMediaGeneralValue);
- MPX_ASSERT(pPath);
- }
- }
-
- RArray<TMPXItemId> ids;
- CleanupClosePushL(ids);
-
- while ((err = aRecordset.Next()) == KSqlAtRow)
- {
- TUint32 rowId(aRecordset.ColumnInt64(EAlbumUniqueId));
- if (prevId == rowId)
- {
- continue;
- }
-
- prevId = rowId;
- CMPXMedia* media = CMPXMedia::NewL();
- CleanupStack::PushL(media);
-
- UpdateMediaL(aRecordset, aAttrs, *media);
-
- artistId = aRecordset.ColumnInt64(EAlbumArtist);
-
- // Append Known artist and Unknown albums
- count = iUnknownAlbums.Count();
- if (prevArtistId != artistId && count > 0)
- {
- unknownMedia = NULL;
-
- for (TInt i = 0; i < count; i++)
- {
- unknownMedia = iUnknownAlbums[i];
- if (unknownMedia->IsSupported(KMPXMediaGeneralId) && pPath)
- {
- ids.Append(unknownMedia->ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId));
- }
- aMediaArray.AppendL(*unknownMedia);
- }
-
- iUnknownAlbums.ResetAndDestroy();
- }
-
- // for Unknown artist and Unknown album
- if (firstRecord && (MPXDbCommonUtil::GetColumnTextL(aRecordset, EAlbumName).Length() == 0) &&
- (MPXDbCommonUtil::GetColumnTextL(aRecordset, EAlbumArtistName).Length() == 0))
- {
- unknownAlbumUnknownArtistMedia = media;
- }
- // for Unknown artists and Known albums
- else if (MPXDbCommonUtil::GetColumnTextL(aRecordset, EAlbumArtistName).Length() == 0)
- {
- iUnknownArtists.Append(media);
- CleanupStack::Pop(media);
- }
- // for Known artist and Unknown album
- else if (MPXDbCommonUtil::GetColumnTextL(aRecordset, EAlbumName).Length() == 0)
- {
- iUnknownAlbums.Append(media);
- CleanupStack::Pop(media);
- prevArtistId = artistId;
- }
- else
- {
- if (media->IsSupported(KMPXMediaGeneralId) && pPath)
- {
- ids.AppendL(media->ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId));
- }
- aMediaArray.AppendL(*media);
- CleanupStack::PopAndDestroy(media);
- }
-
- firstRecord = EFalse;
- } // end while
-
- if (err != KSqlAtEnd)
- {
- User::LeaveIfError(err);
- }
-
- // Append Known artist and Unknown albums
- count = iUnknownAlbums.Count();
- if ( count > 0)
- {
- unknownMedia = NULL;
-
- for (TInt i = 0; i < count; i++)
- {
- unknownMedia = iUnknownAlbums[i];
- if (unknownMedia->IsSupported(KMPXMediaGeneralId) && pPath)
- {
- ids.Append(unknownMedia->ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId));
- }
- aMediaArray.AppendL(*unknownMedia);
- }
-
- iUnknownAlbums.ResetAndDestroy();
- }
-
- // Append Unknown artists to MediaArray
- count = iUnknownArtists.Count();
- if ( count > 0)
- {
- CMPXMedia* unknownMedia = NULL;
-
- for (TInt i = 0; i < count; i++)
- {
- unknownMedia = iUnknownArtists[i];
- if (unknownMedia->IsSupported(KMPXMediaGeneralId) && pPath)
- {
- ids.Append(unknownMedia->ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId));
- }
- aMediaArray.AppendL(*unknownMedia);
- }
-
- iUnknownArtists.ResetAndDestroy();
- }
-
- // the last item in the list
- if (unknownAlbumUnknownArtistMedia)
- {
- if (unknownAlbumUnknownArtistMedia->IsSupported(KMPXMediaGeneralId) && pPath)
- {
- ids.AppendL(unknownAlbumUnknownArtistMedia->ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId));
- }
- aMediaArray.AppendL(*unknownAlbumUnknownArtistMedia);
- CleanupStack::PopAndDestroy(unknownAlbumUnknownArtistMedia);
- }
-
- // Append ids to the returned path
- if (pPath)
- {
- ((CMPXCollectionPath*)pPath)->AppendL(ids.Array());
- }
- CleanupStack::PopAndDestroy(&ids);
- }
-
-// ----------------------------------------------------------------------------
-// CMPXDbAlbum::GenerateUniqueIdL
-// ----------------------------------------------------------------------------
-//
-TUint32 CMPXDbAlbum::GenerateUniqueIdL(const CMPXMedia& aMedia)
- {
- TPtrC album(KNullDesC);
- TPtrC albumArtist(KNullDesC);
- TPtrC artist(KNullDesC);
-
- // check Album attirbute
- if (aMedia.IsSupported(KMPXMediaMusicAlbum))
- {
- album.Set(aMedia.ValueText(KMPXMediaMusicAlbum).Left(KMCMaxTextLen));
- }
-
- HBufC* buf(NULL);
- if (RetrieveAlbumArtistL(aMedia, albumArtist))
- {
- buf = HBufC::NewLC(album.Length() + albumArtist.Length() + KAlbumAlbumArtistSeperator().Length());
-
- buf->Des().Append(album);
- buf->Des().Append(KAlbumAlbumArtistSeperator);
- buf->Des().Append(albumArtist);
- }
- else
- {
- RetrieveArtist(aMedia, artist);
-
- buf = HBufC::NewLC(album.Length() + artist.Length() + KAlbumArtistSeperator().Length());
-
- buf->Des().Append(album);
- buf->Des().Append(KAlbumArtistSeperator);
- buf->Des().Append(artist);
- }
-
- // try to find the item first
- TUint32 id(MPXDbCommonUtil::GenerateUniqueIdL(iDbManager.Fs(), EMPXAlbum,
- *buf, ETrue));
- CleanupStack::PopAndDestroy(buf);
-
- return id;
- }
-
-// ----------------------------------------------------------------------------
-// CMPXDbAlbum::IsUnknownAlbumL
-// ----------------------------------------------------------------------------
-//
-TBool CMPXDbAlbum::IsUnknownAlbumL(const TUint32 aId)
- {
- HBufC* query = PreProcessStringLC(KQueryCategoryItem);
- RSqlStatement recordset(iDbManager.ExecuteSelectQueryL(*query, aId));
- CleanupStack::PopAndDestroy(query);
- CleanupClosePushL(recordset);
-
- if (recordset.Next() != KSqlAtRow)
- {
- User::Leave(KErrNotFound);
- }
-
- TPtrC album(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumName));
- TPtrC artistName(MPXDbCommonUtil::GetColumnTextL(recordset, EAlbumArtistName));
-
- TBool ret = EFalse;
- if (album.Length() == 0 || artistName.Length() == 0)
- {
- ret = ETrue;
- }
- else
- {
- ret = EFalse;
- }
-
- CleanupStack::PopAndDestroy(&recordset);
-
- return ret;
- }
-
-// ----------------------------------------------------------------------------
-// CMPXDbAlbum::RetrieveAlbumArtistL
-// ----------------------------------------------------------------------------
-//
-TBool CMPXDbAlbum::RetrieveAlbumArtistL(const CMPXMedia& aMedia, TPtrC& aName)
- {
- // check AlbumArtist attribute
- if (aMedia.IsSupported(KMPXMediaMusicAlbumArtist))
- {
- aName.Set(aMedia.ValueText(KMPXMediaMusicAlbumArtist).Left(KMCMaxTextLen));
- }
- else
- {
- aName.Set(KNullDesC);
- }
-
- if (aName.Length() > 0 )
- {
- return ETrue;
- }
- else
- {
- return EFalse;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CMPXDbAlbum::RetrieveArtist
-// ----------------------------------------------------------------------------
-//
-void CMPXDbAlbum::RetrieveArtist(const CMPXMedia& aMedia, TPtrC& aName)
- {
- // check Artist attribute
- if (aMedia.IsSupported(KMPXMediaMusicArtist))
- {
- aName.Set(aMedia.ValueText(KMPXMediaMusicArtist).Left(KMCMaxTextLen));
- }
- else
- {
- aName.Set(KNullDesC);
- }
- }
-
-// ----------------------------------------------------------------------------
-// CMPXDbAlbum::NeedToUpdateArt
-// ----------------------------------------------------------------------------
-//
-TBool CMPXDbAlbum::NeedToUpdateArt(const TDesC& aDeletedSongArt, const TDesC& aCurrentAlbumArt)
- {
- if (aDeletedSongArt.Length() == 0)
- {
- // Deleted song's art has default album art
- return EFalse;
- }
-#ifdef ABSTRACTAUDIOALBUM_INCLUDED
- else
- if (aDeletedSongArt.Length() > 0)
- {
- TParsePtrC parse(aDeletedSongArt);
- TPtrC ext(parse.Ext());
- //set flag to false, so .alb will not overwrite art field in album, artist table
- // when song with embedded art
- if (ext.CompareF(KAbstractAlbumExt) == 0)
- {
- // Deleted song's art is Non-embedded album art
- return EFalse;
- }
- }
- else
-#endif
- if (aDeletedSongArt.Length() > 0 && aCurrentAlbumArt.Length() > 0 && aDeletedSongArt.CompareF(aCurrentAlbumArt) == 0)
- {
- // Deleted song's art is Embedded album art and it is the same as Album's current art
- return ETrue;
- }
- else
- {
- return EFalse;
- }
- }
-
-// ----------------------------------------------------------------------------
// CMPXDbAlbum::CreateTableL
// ----------------------------------------------------------------------------
//
@@ -860,7 +593,9 @@
MPX_FUNC("CMPXDbCategory::CreateTableL");
// create the table
- User::LeaveIfError(aDatabase.Exec(KAlbumCreateTable));
+ HBufC* query = PreProcessStringLC(KAlbumCreateTable);
+ User::LeaveIfError(aDatabase.Exec(*query));
+ CleanupStack::PopAndDestroy(query);
// do not create an index on the Name field
// as it only slows down the insert/update queries overall
@@ -875,7 +610,9 @@
{
MPX_FUNC("CMPXDbCategory::CheckTableL");
- TBool check(DoCheckTable(aDatabase, KAlbumCheckTable));
+ HBufC* query = PreProcessStringLC(KAlbumCheckTable);
+ TBool check(DoCheckTable(aDatabase, *query));
+ CleanupStack::PopAndDestroy(query);
return check;
}