MCL/sf/mw/mds: comparison harvester/harvesterplugins/ImagePlugin/src/harvesterimageplugin.cpp

equal deleted inserted replaced

-:b73a2e62868f
+:6752808b2036
 #include "harvesterlog.h"
 #include "mdsutils.h"
 #include "harvesterexifutil.h"
 #include "harvesterimageplugin.h"
+#include "harvestercommon.h"
 #include "mdeobjectwrapper.h"
 using namespace MdeConstants;
 // image mime types
 User::LeaveIfError( iMimeTypeMappings.InsertInOrder( TMimeTypeMapping<TImageMetadataHandling>(
 		KExtWmf(), KWmfMime(), EOtherHandling ), cmp ) );
 User::LeaveIfError( iMimeTypeMappings.InsertInOrder( TMimeTypeMapping<TImageMetadataHandling>(
 KExtOtb(), KOtbMime(), EOtherHandling ), cmp ) );
+SetPriority( KHarvesterPriorityHarvestingPlugin + 1 );
 	}
 void CHarvesterImagePlugin::HarvestL( CHarvesterData* aHD )
 	{
 	WRITELOG( "CHarvesterImagePlugin::HarvestL()" );
 }
 // Delete image data.
 CleanupStack::PopAndDestroy( 2, fileData );
 	}
+// ---------------------------------------------------------------------------
+// CHarvesterImagePlugin::GetMimeType (from CHarvesterPlugin)
+// ---------------------------------------------------------------------------
+//
+void CHarvesterImagePlugin::GetMimeType( const TDesC& aUri, TDes& aMimeType )
+{
+aMimeType.Zero();
+TPtrC ext;
+if( !MdsUtils::GetExt( aUri, ext ) )
+{
+return;
+}
+TMimeTypeMapping<TImageMetadataHandling> finder(ext);
+TLinearOrder< TMimeTypeMapping<TImageMetadataHandling> > cmp(
+TMimeTypeMapping<TImageMetadataHandling>::CompareFunction);
+const TInt pos = iMimeTypeMappings.FindInOrder( finder, cmp );
+if ( pos == KErrNotFound )
+{
+return;
+}
+aMimeType = iMimeTypeMappings[pos].iMimeType;
+}
 // ---------------------------------------------------------------------------
 // GatherData
 // ---------------------------------------------------------------------------
 //
 if( !aFileData.iExifSupported || err != KErrNone )
 {
 // Exif couldn't be found. Open the image with ICL decoder instead.
 WRITELOG( "CHarvesterImagePlugin::GatherData() - Exif could not be read. Using ICL." );
-iDecoder->Reset();
 TPtr8 imageDataPtr = aFileData.iImageData->Des();
 TRAP( err, iDecoder->OpenL(imageDataPtr, aFileData.iMime8,
 CImageDecoder::TOptions( CImageDecoder::EPreferFastDecode | CImageDecoder::EOptionIgnoreExifMetaData ) ) );
 WRITELOG( "CHarvesterImagePlugin::GatherData() - Image decoder has opened the file." );
 if ( err != KErrNone )
 {
 WRITELOG1( "CHarvesterImagePlugin::GatherData() - ERROR: Decoder could not open image data! Code %d", err );
+iDecoder->Reset();
 return KErrCompletion; // metadata item still can be created, thus KErrCompletion
 }
 if ( !iDecoder->ValidDecoder() )
 	{
 				TInt readStatus = iFs.ReadFileSection(
 						*aFileData.iUri, aFileData.iImageDataSize, addPtr, additionalDataSize );
 				if ( readStatus != KErrNone )
 					{
 					CleanupStack::PopAndDestroy( additionalData );
+					iDecoder->Reset();
 					return KErrCompletion;
 					}
 				// append all remaining data to image decoder
 				TRAP( err, iDecoder->AppendDataL( addPtr ) );
 				}
 if ( err || !iDecoder->ValidDecoder() )
 	{
 	WRITELOG( "CHarvesterImagePlugin::GatherData() - ERROR: no valid decoder" );
+	iDecoder->Reset();
 	return KErrCompletion; // metadata item still can be created, thus KErrCompletion
 	}
 }
 // Get image width, frame count, height and bits per pixel from image decoder.
 const TInt framecount = iDecoder->FrameCount();
 aFileData.iFrameCount = framecount;
 aFileData.iImageWidth = imageSize.iWidth;
 aFileData.iImageHeight = imageSize.iHeight;
 aFileData.iBitsPerPixel = info.iBitsPerPixel;
+iDecoder->Reset();
 }
 WRITELOG( "CHarvesterImagePlugin::GatherData() - end" );
 #ifdef _DEBUG
 	TMimeTypeMapping<TImageMetadataHandling> finder(ext);
 	TLinearOrder< TMimeTypeMapping<TImageMetadataHandling> > cmp(
 			TMimeTypeMapping<TImageMetadataHandling>::CompareFunction);
-	TInt pos = iMimeTypeMappings.FindInOrder( finder, cmp );
+	const TInt pos = iMimeTypeMappings.FindInOrder( finder, cmp );
 	TImageMetadataHandling handler( EOtherHandling );
 	if ( pos != KErrNotFound )
 		{
 TTimeIntervalSeconds timeOffsetSeconds = User::UTCOffset();
 TTime localModifiedDate = aFileData.iModified + timeOffsetSeconds;
-// Object - Creation date
 if( ! mdeObject.Placeholder() )
 	{
+// Object - Creation date
 	    if ( aFileData.iExifSupported && aHd.iDateOriginal8 )
 	        {
 	        TTime originalTime = iExifUtil->ConvertExifDateTimeToSymbianTimeL(
 	        		aHd.iDateOriginal8->Des() );
 	        CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iCreationDatePropertyDef, &originalTime, aIsAdd );
 	        }
 	    else if ( aIsAdd )
 	        {
 	        CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iCreationDatePropertyDef, &localModifiedDate, aIsAdd );
 	        }
-	}
+	    // Object - last aFileData.iModified date
-// Object - last aFileData.iModified date
+	    CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iLastModifiedDatePropertyDef, &aFileData.iModified, aIsAdd );
-if( ! mdeObject.Placeholder() )
-	{
+	    // Object - Size
-	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iLastModifiedDatePropertyDef, &aFileData.iModified, aIsAdd );
+	    CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iSizePropertyDef, &aFileData.iFileSize, aIsAdd );
+	    // Item Type
+	    CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iItemTypePropertyDef, &aFileData.iMime16, aIsAdd );
 	}
 if( aFileData.iJpeg )
 	{
 	// Time offset
 	TInt16 timeOffsetMinutes = timeOffsetSeconds.Int() / 60;
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iTimeOffsetPropertyDef, &timeOffsetMinutes, aIsAdd );
 	}
-// Object - Size
-if( ! mdeObject.Placeholder() )
-	{
-	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iSizePropertyDef, &aFileData.iFileSize, aIsAdd );
-	}
-// Item Type
-	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iItemTypePropertyDef, &aFileData.iMime16, aIsAdd );
 // MediaObject - Width
 if ( aFileData.iExifSupported )
 {
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iWidthPropertyDef, &aHd.iImageWidthExif, aIsAdd );

branch	RCL_3
changeset 3	6752808b2036
parent 1	acef663c1218
child 6	646a02f170b9