FCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserver.cpp

equal deleted inserted replaced

-:60bb012f1157
+:9e8b0cc88842
 _LIT8( KThumbnailMimeWildCard, "*" );
 _LIT8( KThumbnailMimeImage, "image" );
 _LIT8( KThumbnailMimeVideo, "video" );
 _LIT8( KThumbnailMimeAudio, "audio" );
-_LIT8( KThumbnailMimeContact, "contact" );
 const TChar KThumbnailMimeSeparatorChar = '/';
 const TChar KThumbnailMimeWildCardChar = '*';
 const TChar KThumbnailMimeTypeSeparatorChar = ' ';
 CActiveScheduler::Start();
 TN_DEBUG1(
 "CThumbnailServer::ThreadFunctionL() -- CActiveScheduler::Start() out" );
 // Comes here if server gets shut down
 delete server;
-server = NULL;
 CleanupStack::PopAndDestroy( scheduler );
 }
 }
 {
 if ( ref->iSession == aSession )
 {
 TN_DEBUG2( "CThumbnailServer::DropSession() - ref->iSession = 0x%08x", ref->iSession );
 delete ref->iBitmap;
 bpiter.RemoveCurrent();
 TN_DEBUG2( "CThumbnailServer::DropSession() - deleted bitmap, left=%d", iBitmapPool.Count());
 }
 #endif
 if (!aCheckExist)
 {
 StoreForPathL( aPath )->StoreThumbnailL( aPath, aBitmap, aOriginalSize,
-aCropped, aThumbnailSize, aModified, aThumbFromPath, EFalse );
+aCropped, aThumbnailSize, aModified, aThumbFromPath );
 }
 else if(BaflUtils::FileExists( iFs, aPath))
 {
 StoreForPathL( aPath )->StoreThumbnailL( aPath, aBitmap, aOriginalSize,
-aCropped, aThumbnailSize, aModified, aThumbFromPath, EFalse );
+aCropped, aThumbnailSize, aModified, aThumbFromPath );
 }
 else
 {
 TN_DEBUG1( "CThumbnailServer::StoreThumbnailL() - file doesn't exists anymore, skip store!");
 }
 if( iFetchedChecker )
 {
-iFetchedChecker->SetFetchResult( aPath, aThumbnailSize, KErrNone );
+iFetchedChecker->SetFetchResult( aPath, KErrNone );
 }
 }
 // -----------------------------------------------------------------------------
 aThumbnail, TDesC8* & aData, const TThumbnailSize aThumbnailSize, TSize &aOriginalSize )
 {
 TN_DEBUG3( "CThumbnailServer::FetchThumbnailL(aPath=%S aThumbnailSize=%d)", &aPath, aThumbnailSize );
 if( iFetchedChecker )
 {
-TInt err( iFetchedChecker->LastFetchResult( aPath, aThumbnailSize ) );
+TInt err( iFetchedChecker->LastFetchResult( aPath ) );
 if ( err == KErrNone ) // To avoid useless sql gets that fails for sure
 {
 // custom sizes are not stored to db, skip fetching
 if ( aThumbnailSize == ECustomThumbnailSize )
 {
 }
 TRAP( err, StoreForPathL( aPath )->FetchThumbnailL( aPath, aThumbnail, aData, aThumbnailSize, aOriginalSize) );
 if ( err != KErrNone )
 {
-iFetchedChecker->SetFetchResult( aPath, aThumbnailSize, err );
+iFetchedChecker->SetFetchResult( aPath, err );
 }
 }
 User::LeaveIfError( err );
 }
 else
 StoreForPathL( aPath )->DeleteThumbnailsL( aPath );
 if( iFetchedChecker )
 {
-iFetchedChecker->DeleteFetchResult( aPath );
+iFetchedChecker->SetFetchResult( aPath, KErrNone );
 }
 }
 // -----------------------------------------------------------------------------
 // CThumbnailServer::ResolveMimeTypeL()
 TN_DEBUG2( "CThumbnailServer::DequeTask() - ref->iRequestId = %d", ref->iRequestId );
 if ( ref->iSession == aRequestId.iSession &&
 ref->iRequestId == aRequestId.iRequestId )
 {
 delete ref->iBitmap;
 bpiter.RemoveCurrent();
 TN_DEBUG2( "CThumbnailServer::DequeTask() - deleted bitmap, left=%d",
 iBitmapPool.Count());
 }
 {
 res = * resPtr;
 }
 else
 {
-if( iFormatting )
+if(iFormatting)
 {
 TN_DEBUG1( "CThumbnailServer::StoreForDriveL() - FORMATTING! - ABORT");
 User::Leave( KErrNotSupported );
 }
 TVolumeInfo volumeInfo;
 TInt err = iFs.Volume( volumeInfo, aDrive );
-if ( err )
+if ( err || volumeInfo.iDrive.iDriveAtt& KDriveAttRom ||
-{
-// Locked
-TN_DEBUG2( "CThumbnailServer::StoreForDriveL() - err %d", err);
-User::Leave( err);
-}
-else if( volumeInfo.iDrive.iMediaAtt& KMediaAttLocked )
-{
-TN_DEBUG1( "CThumbnailServer::StoreForDriveL() - locked");
-User::Leave( KErrAccessDenied );
-}
-		else if ( volumeInfo.iDrive.iDriveAtt& KDriveAttRom ||
 volumeInfo.iDrive.iDriveAtt& KDriveAttRemote ||
-volumeInfo.iDrive.iMediaAtt& KMediaAttWriteProtected )
+volumeInfo.iDrive.iMediaAtt& KMediaAttWriteProtected ||
-{
+volumeInfo.iDrive.iMediaAtt& KMediaAttLocked )
-// We support ROM disks and remote disks in read only mode.
+{
-TN_DEBUG1( "CThumbnailServer::StoreForDriveL() - rom/remote/write protected");
+// We don't support ROM disks or remote mounts. Media
-res = CThumbnailStore::NewL( iFs, aDrive, iImei, this, ETrue );
+// must be read-write and not locked.
-}
+User::Leave( KErrAccessDenied);
-else
+}
-{
-TN_DEBUG1( "CThumbnailServer::StoreForDriveL() - normal");
+res = CThumbnailStore::NewL( iFs, aDrive, iImei, this );
-res = CThumbnailStore::NewL( iFs, aDrive, iImei, this, EFalse );
-}
 CleanupStack::PushL( res );
 iStores.InsertL( aDrive, res );
 res->SetPersistentSizes(iPersistentSizes);
 CleanupStack::Pop( res );
 StartUnmountTimeout( aDrive);
 if (store)
 {
 delete *store;
-*store = NULL;
 iStores.Remove( aDrive );
 }
 }
 if( !driveList[drive] )
 {
 // If drive-list entry is zero, drive is not available
 continue;
 }
 TInt err = iFs.Volume(volumeInfo, drive);
 TInt err_drive = iFs.Drive(driveInfo, drive);
 // mount -- if removable drive, add new store
 if (!err && !err_drive
 const TInt /*aOrientation*/, const TInt64 aModified )
 {
 TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL()");
 // 1. check path change
-// 2. check timestamp change
+// 2. check orientation change
+// 3. check timestamp change
+TBool orientationChanged = EFalse;
 TBool modifiedChanged = EFalse;
 CThumbnailStore* store = StoreForPathL( aPath );
-TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - exist");
+// placeholder for orientation check
+orientationChanged = EFalse;
-TBool exists = store->CheckModifiedByPathL(aPath, aModified, modifiedChanged);
+if (orientationChanged)
+{
+TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - orientation updated");
+// orientation updated, no need to check further
+return ETrue;
+}
+else
+{
+TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - exist");
+TBool exists = store->CheckModifiedByPathL(aPath, aModified, modifiedChanged);
 if(!exists)
 {
 TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - exists NO");
 //not found, needs to be generated
 return EFalse;
 }
 TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - modified ?");
 if (modifiedChanged)
 {
 TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - modified YES");
 // delete old thumbs
 store->DeleteThumbnailsL(aPath, ETrue);
 if( iFetchedChecker )
 {
-iFetchedChecker->DeleteFetchResult( aPath );
+iFetchedChecker->SetFetchResult( aPath, KErrNone );
 }
 // need to create new thumbs
 }
 else
 {
 TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - modified NO");
 // not modified
 return ETrue;
 }
+}
 TN_DEBUG1( "CThumbnailServer::UpdateThumbnailsL() - no thumbs found, create new");
 return EFalse;
 }
 StoreForPathL( aCurrentPath )->RenameThumbnailsL( aCurrentPath, aNewPath );
 if( iFetchedChecker )
 {
-iFetchedChecker->RenameFetchResultL( aNewPath, aCurrentPath );
+iFetchedChecker->SetFetchResult( aNewPath, iFetchedChecker->LastFetchResult(aCurrentPath) );
+iFetchedChecker->SetFetchResult( aCurrentPath, KErrNone );
 }
 }
 // -----------------------------------------------------------------------------
 // CThumbnailServer::MimeTypeFromFileExt()
 // -----------------------------------------------------------------------------
 //
 TInt CThumbnailServer::MimeTypeFromFileExt( const TDesC& aFileName, TDataType& aMimeType )
 {
 TBool found = ETrue;
-TPtrC ext( aFileName.Right(KExtLength) ); // tparse panics with virtual URI
+TParsePtrC parse( aFileName );
+TPtrC ext( parse.Ext() );
 if ( ext.CompareF( KJpegExt ) == 0 || ext.CompareF( KJpgExt ) == 0)
 {
 aMimeType = TDataType( KJpegMime );
 }
 }
 else if ( ext.CompareF( KMatroskaVideoExt ) == 0 )
 {
 aMimeType = TDataType( KMatroskaVideoMime );
 }
-else if ( ext.CompareF( KContactExt ) == 0 )
-{
-aMimeType = TDataType( KContactMime );
-}
-else if ( ext.CompareF( KAlbumArtExt ) == 0 )
-{
-aMimeType = TDataType( KAlbumArtMime );
-}
 else
 {
 aMimeType = TDataType( KNullDesC8 );
 found = EFalse;
 }
 return TThumbnailPersistentSize::EVideo;
 }
 else if (mediaType.Compare(KThumbnailMimeAudio) == 0)
 {
 return TThumbnailPersistentSize::EAudio;
-}
-else if (mediaType.Compare(KThumbnailMimeContact) == 0)
-{
-return TThumbnailPersistentSize::EContact;
 }
 return TThumbnailPersistentSize::EUnknownSourceType;
 }
 case EAudioGridThumbnailSize:
 case EAudioListThumbnailSize:
 case EAudioFullScreenThumbnailSize:
 sourceType = TThumbnailPersistentSize::EAudio;
 break;
-case EContactListThumbnailSize:
-case EContactGridThumbnailSize:
-case EContactFullScreenThumbnailSize:
-sourceType = TThumbnailPersistentSize::EContact;
-break;
 default:
 sourceType = TThumbnailPersistentSize::EUnknownSourceType;
 }
 return sourceType;
 if ( mimeType.CompareF( KJpegMime ) == 0 ||
 mimeType.CompareF( KJpeg2000Mime ) == 0 ||
 mimeType.CompareF( KGifMime ) == 0 ||
 mimeType.CompareF( KPngMime ) == 0 ||
-mimeType.CompareF( KSvgMime ) == 0 ||
+mimeType.CompareF( KBmpMime ) == 0 ||
 mimeType.CompareF( KMpgMime1 ) == 0 ||
 mimeType.CompareF( KMpeg4Mime ) == 0 ||
 mimeType.CompareF( KMp4Mime ) == 0 ||
 mimeType.CompareF( KAviMime ) == 0 ||
+mimeType.CompareF( KVideo3gppMime ) == 0 ||
+mimeType.CompareF( KVideoWmvMime ) == 0 ||
+mimeType.CompareF( KRealVideoMime ) == 0 ||
 mimeType.CompareF( KMp3Mime ) == 0 ||
-mimeType.CompareF( KNonEmbeddArtMime ) == 0 ||
-mimeType.CompareF( KM4aMime ) == 0  ||
 mimeType.CompareF( KAacMime ) == 0 ||
 mimeType.CompareF( KWmaMime ) == 0 ||
-mimeType.CompareF( KBmpMime ) == 0 ||
-mimeType.CompareF( KAudio3gppMime ) == 0 ||
-mimeType.CompareF( KVideo3gppMime ) == 0 ||
 mimeType.CompareF( KAudioAmrMime ) == 0 ||
-mimeType.CompareF( KVideoWmvMime ) == 0 ||
 mimeType.CompareF( KRealAudioMime ) == 0 ||
-mimeType.CompareF( KPmRealAudioPluginMime ) == 0 ||
+mimeType.CompareF( KM4aMime ) == 0  ||
+mimeType.CompareF( KFlashVideoMime ) == 0 ||
 mimeType.CompareF( KPmRealVideoPluginMime ) == 0 ||
 mimeType.CompareF( KPmRealVbVideoPluginMime ) == 0 ||
-mimeType.CompareF( KRealVideoMime ) == 0 ||
+mimeType.CompareF( KPmRealAudioPluginMime ) == 0 )
-mimeType.CompareF( KFlashVideoMime ) == 0 ||
-mimeType.CompareF( KMatroskaVideoMime ) == 0 ||
-mimeType.CompareF( KContactMime ) == 0 ||
-mimeType.CompareF( KAlbumArtMime ) == 0 )
 {
 return ETrue;
 }
 return EFalse;
 TRAP( result, CThumbnailServer::ThreadFunctionL());
 TN_DEBUG2(
 "CThumbnailServer::E32Main() -- thread function out, result=%d",
 result );
 delete cleanup;
-cleanup = NULL;
 }
 if ( result != KErrNone )
 {
 // Signal the client that server creation failed
 TN_DEBUG1( "CThumbnailServer::E32Main() -- Rendezvous() in" );

branch	RCL_3
changeset 58	9e8b0cc88842
parent 47	3d743e824514