FCL/sf/mw/mmappfw: comparison mmappcomponents/collectionhelper/src/mpxcollectioncachedhelper.cpp

equal deleted inserted replaced

-:f4fd77a452f2
+:3b098142db83
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:  Extended collection helper with an internal caching array
-*  Version     : %version: da1mmcf#27.1.12.3.5 %
+*  Version     : %version: e003sa33#27.1.12.3.7 %
 *
 */
 #include <e32base.h>
 _LIT( K3GPFileExt, ".3gp" );
 _LIT( K3G2FileExt, ".3g2" );
 _LIT( KODFFileExt, ".odf" );
 _LIT( KO4AFileExt, ".o4a" );
+_LIT( KAACFileExt, ".aac" );
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // Constructor
 cacheCount = 1;
 if( iCache->Count() >= cacheCount)
 Commit();
 #ifdef ABSTRACTAUDIOALBUM_INCLUDED
 TBool extract = ETrue;
 if( aMedia->IsSupported( KMPXMediaMTPSampleDataFlag ) )
 {
 extract = aMedia->ValueTObjectL<TBool>( KMPXMediaMTPSampleDataFlag );
 TInt count( iCache->Count() );
 // Take advantage that MTP always try to access the most recent item
 //
 CMPXMedia* media( NULL );
+TBool anotherAbstractMediaFound = EFalse;
 for( TInt i=count-1; i>=0; --i )
 {
 const TDesC& uri = iCache->AtL(i)->ValueText( KMPXMediaGeneralUri );
+TMPXGeneralCategory category = iCache->AtL(i)->ValueTObjectL<TMPXGeneralCategory>(KMPXMediaGeneralCategory);
+MPX_DEBUG3("CMPXCollectionCachedHelper::SetL iCache[i].category = %d, uri = %S", category, &uri);
 if( newUri.CompareF( uri ) == 0 )
 {
 MPX_DEBUG2("Found existing media, index %i", i);
 media = iCache->AtL(i);
 break;
 }
+else if ( category == EMPXPlaylist || category == EMPXAbstractAlbum )
+anotherAbstractMediaFound = ETrue;
 }
 // Not found in the array
 if( !media )
 {
 // If the catched count is more than KCacheCount, commit it to database.
-if( count >= KCacheCount )
+		// could be song or alb coming, not in the cache, and there is at least one .alb on the cache
+// commit all if another AbstractMedia is found (anotherAbstractMediaFound is on ETrue if not the current one)
+if( ( count >= KCacheCount ) || anotherAbstractMediaFound )
 {
 Commit();
 }
 CMPXMedia* copy = CMPXMedia::NewL( *aMedia );
 CleanupStack::PushL( copy );
 iFoundMedia->ValueText(KMPXMediaGeneralUri).CompareF(aFile) != 0)
 {
 delete iFoundMedia;
 iFoundMedia = NULL;
-Commit();
+		MPX_DEBUG1("CMPXCollectionCachedHelper::GetL, not found on the cache");
+Commit( ETrue );    // leave AbstractAlbum in cache
 RArray<TMPXAttribute> attributes;
 CleanupClosePushL(attributes);
 attributes.AppendL(
 // ---------------------------------------------------------------------------
 //
 CMPXMedia* CMPXCollectionCachedHelper::FindAllL( CMPXMedia& aCriteria,
 const TArray<TMPXAttribute>& aAttrs )
 {
-Commit();
+TBool cacheAbstractAlbum = EFalse;
+TMPXGeneralCategory category = aCriteria.ValueTObjectL<TMPXGeneralCategory>( KMPXMediaGeneralCategory );
+// leave AbstractAlbum in cache, unless the new criteria is another abstract media
+if ( ( category != EMPXPlaylist ) && ( category != EMPXAbstractAlbum ) )
+cacheAbstractAlbum = ETrue;
+Commit( cacheAbstractAlbum );
 return CMPXCollectionHelperImp::FindAllL( aCriteria, aAttrs );
 }
 // ---------------------------------------------------------------------------
 // Close function to destroy this object
 // ---------------------------------------------------------------------------
 // Commits all transactions left in the helper
 // ---------------------------------------------------------------------------
 //
-void CMPXCollectionCachedHelper::Commit()
+void CMPXCollectionCachedHelper::Commit( TBool aCacheAbstractAlbum )
 {
 MPX_DEBUG2("CMPXCollectionCachedHelper::Commit %d <--", iCache->Count());
 TInt error( KErrNotFound );
 TInt count( iCache->Count() );
+TInt currentIndex = 0;
-for( TInt i=0; i<count; ++i )
-{
+for( TInt i = 0; i < count; ++i )
-CMPXMedia* media = (*iCache)[0];
+{
+CMPXMedia* media = (*iCache)[currentIndex];
+TMPXGeneralCategory category = media->ValueTObjectL<TMPXGeneralCategory>( KMPXMediaGeneralCategory );
+TBool needCache = EFalse;
+if ( ( category == EMPXAbstractAlbum ) && aCacheAbstractAlbum )
+needCache = ETrue;
 if( media )
 {
-switch( iOp[0] )
+switch( iOp[currentIndex] )
 {
 case EAdd:
 {
-TRAP( error, SetMissingMetadataL( media ) );    // doing this only before initial add
+if ( !needCache )
-MPX_DEBUG2( "CMPXCollectionCachedHelper::Commit, SetMissingMetadataL, err = %d", error );
+{
+TRAP( error, SetMissingMetadataL( media ) );    // doing this only before initial add
-TRAP(error,
+MPX_DEBUG2( "CMPXCollectionCachedHelper::Commit, SetMissingMetadataL, err = %d", error );
-CMPXCollectionHelperImp::AddL( media );
+TRAP( error, CMPXCollectionHelperImp::AddL( media ) );
-);
+}
 break;
 }
 case ESet:
 {
-TRAP(error,
+TRAP( error,
 CMPXCollectionHelperImp::SetL( media );
 );
 break;
 }
 default:
 DoAppendAudioL( *media, *iFoundMedia );
 DoAppendDRML( *media, *iFoundMedia );
 DoAppendContainerL( *media, *iFoundMedia );
 DoAppendMTPL( *media, *iFoundMedia );
 );
 }
-iCache->Remove(0);
+if ( needCache )
-iOp.Remove(0);
+{
+const TDesC& uri = media->ValueText(KMPXMediaGeneralUri);
+			MPX_DEBUG2("need cache uri %S", &uri);
+currentIndex++;
+}
+else
+{
+iCache->Remove( currentIndex );
+iOp.Remove( currentIndex );
+}
 }
 MPX_DEBUG1("CMPXCollectionCachedHelper::Commit -->");
 }
 TParsePtrC parse( path );
 // only do this for file that might not be natively supported by PC
 if ( ( parse.Ext().CompareF(K3GPFileExt) == 0 )
 || ( parse.Ext().CompareF(K3G2FileExt) == 0 )
+|| ( parse.Ext().CompareF(KAACFileExt) == 0 )
 || ( parse.Ext().CompareF(KODFFileExt) == 0 )
 || ( parse.Ext().CompareF(KO4AFileExt) == 0 ) )
 {
 TBool isTitleMissing = EFalse;
 TBool isArtistMissing = EFalse;

changeset 61	3b098142db83
parent 57	f4fd77a452f2