FCL/sf/mw/mds: comparison harvester/harvesterplugins/VideoPlugin/src/harvestervideoplugin.cpp

equal deleted inserted replaced

-:50bf9db68373
+:33ae025ac1e8
 */
 CHarvesterVideoPlugin::~CHarvesterVideoPlugin()
 	{
 	delete iPropDefs;
 	iMimeTypeMappings.Close();
+RMediaIdUtil::ReleaseInstance();
 	WRITELOG("CHarvesterVideoPlugin::CHarvesterVideoPlugin()");
 	}
 /**
 	TLinearOrder< THarvestingHandling > cmp( THarvestingHandling::CompareFunction );
 	// MPEG4
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtensionMp4(), KNullDesC(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KNullDesC(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KNullDesC(),
 				KMimeTypeVideoMp4(), KMimeTypeAudioMp4() ) ),
 		cmp ) );
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtensionMpg4(), KNullDesC(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KNullDesC(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KNullDesC(),
 				KMimeTypeVideoMp4(), KMimeTypeAudioMp4() ) ),
 		cmp ) );
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtensionMpeg4(), KNullDesC(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KNullDesC(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KNullDesC(),
 				KMimeTypeVideoMp4(), KMimeTypeAudioMp4() ) ),
 		cmp ) );
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtensionM4v(), KMimeTypeVideoMp4(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KVideo(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KVideo(),
 				KMimeTypeVideoMp4(), KMimeTypeAudioMp4() ) ),
 		cmp ) );
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtensionM4a(), KMimeTypeAudioMp4(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KAudio(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KAudio(),
 				KMimeTypeVideoMp4(), KMimeTypeAudioMp4() ) ),
 		cmp ) );
 	// 3GP
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtension3gp(), KNullDesC(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KNullDesC(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KNullDesC(),
 				KMimeTypeVideo3gpp(), KMimeTypeAudio3gpp() ) ),
 		cmp ) );
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtension3gpp(), KNullDesC(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KNullDesC(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KNullDesC(),
 				KMimeTypeVideo3gpp(), KMimeTypeAudio3gpp() ) ),
 		cmp ) );
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 		KExtension3g2(), KNullDesC(),
-		TVideoMetadataHandling( TVideoMetadataHandling::EMp4LibHandling, KNullDesC(),
+		TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KNullDesC(),
 				KMimeTypeVideo3gpp(), KMimeTypeAudio3gpp() ) ),
 		cmp ) );
 	// RealMedia
 	User::LeaveIfError( iMimeTypeMappings.InsertInOrder( THarvestingHandling(
 KExtensionWmv(), KMimeTypeWmv(),
 TVideoMetadataHandling( TVideoMetadataHandling::EHexilMetadataHandling, KVideo(),
 KMimeTypeWmv(), KMimeTypeWmv() ) ),
 cmp ) );
+iMediaIdUtil = &RMediaIdUtil::GetInstanceL();
 }
 // ---------------------------------------------------------------------------
 // GetObjectType
 CleanupStack::PopAndDestroy( 2 ); // content, data
 }
 }
 else if( mapping->iHandler.iLibrary == TVideoMetadataHandling::EMp4LibHandling )
 {
+#ifdef MDS_MP4LIB_USAGE
 MP4Handle handle( 0 );
 MP4Err mp4err = MP4_OK;
 WRITELOG( "CHarvesterVideoPlugin - Before open file handle to parse" );
 WRITELOG( "CHarvesterVideoPlugin - GatherDataL - MP4ParseClose - ready" );
 if ( mp4err != MP4_OK )
 {
 WRITELOG( "CHarvesterVideoPlugin - Error closing file handle" );
 }
+#endif
 }
 WRITELOG( "CHarvesterVideoPlugin - Closing file" );
 CleanupStack::PopAndDestroy( &file );
 WRITELOG( "CHarvesterVideoPlugin - Start adding data to object" );
 if( !iPropDefs )
 	{
 	CMdEObjectDef& objectDef = mdeObject.Def();
 	iPropDefs = CHarvesterVideoPluginPropertyDefs::NewL( objectDef );
+	// Prefetch max text lengt for validity checking
+	iMaxTextLength = iPropDefs->iCopyrightPropertyDef->MaxTextLengthL();
 	}
 TTimeIntervalSeconds timeOffsetSeconds = User::UTCOffset();
 TTime localModifiedDate = aVHD.iModified + timeOffsetSeconds;
 	        }
 		}
 	}
 // Copyright
-if( aVHD.iCopyright )
+if( aVHD.iCopyright && aVHD.iCopyright->Length() < iMaxTextLength )
 	{
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iCopyrightPropertyDef, aVHD.iCopyright, aIsAdd );
 	}
 // Author
-if( aVHD.iAuthor )
+if( aVHD.iAuthor && aVHD.iAuthor->Length() < iMaxTextLength )
 	{
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iAuthorPropertyDef, aVHD.iAuthor, aIsAdd );
 	}
 // Genre
-if( aVHD.iGenre )
+if( aVHD.iGenre && aVHD.iGenre->Length() < iMaxTextLength )
 	{
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iGenrePropertyDef, aVHD.iGenre, aIsAdd );
 	}
 // Artist
-if( aVHD.iPerformer )
+if( aVHD.iPerformer && aVHD.iPerformer->Length() < iMaxTextLength )
 	{
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iArtistPropertyDef, aVHD.iPerformer, aIsAdd );
 	}
 // Description
-if( aVHD.iDescription )
+if( aVHD.iDescription && aVHD.iDescription->Length() < iMaxTextLength )
 	{
 	CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iDescriptionPropertyDef, aVHD.iDescription, aIsAdd );
 	}
 // Codec
 {
 CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iAudioFourCCDef, &aVHD.iCodec, aIsAdd );
 }
 // Title
-if( aVHD.iTitle )
+if( aVHD.iTitle && aVHD.iTitle->Length() < iMaxTextLength )
 {
 CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iTitlePropertyDef, aVHD.iTitle, EFalse );
 }
 // DRM protection
 {
 CMdeObjectWrapper::HandleObjectPropertyL(mdeObject, *iPropDefs->iDrmPropertyDef, &aVHD.iDrmProtected, aIsAdd );
 }
 }
+#ifdef MDS_MP4LIB_USAGE
 void CHarvesterVideoPlugin::GetMp4Type( RFile64& aFile, TDes& aType )
-	{
+{
 WRITELOG( "CHarvesterVideoPlugin::GetMp4Mime - MP4ParseOpenFileHandle - start" );
 MP4Handle handle;
 MP4Err mp4err = MP4ParseOpenFileHandle64( &handle, &aFile );
 	aType.Copy( KVideo() );
 	}
 MP4ParseClose( handle );
 	}
+#else
+void CHarvesterVideoPlugin::GetMp4Type( RFile64& /*aFile*/, TDes& /*aType*/ )
+{
+}
+#endif
 void CHarvesterVideoPlugin::GetRmTypeL( RFile64& aFile, TDes& aType )
 	{
 	TBool possibleVideo = EFalse;
 	CHXMetaDataUtility* helixMetadata = CHXMetaDataUtility::NewL();
 	CleanupStack::PushL( helixMetadata );
+	TFileName tempName;
+	TUint32 mediaId( 0 );
+	TInt blackListError( KErrNone );
+if( iBlacklist )
+{
+WRITELOG( "CHarvesterVideoPlugin::GetRmTypeL - Adding URI to blacklist" );
+blackListError = aFile.FullName( tempName );
+if( blackListError == KErrNone )
+{
+blackListError = iMediaIdUtil->GetMediaId( tempName, mediaId );
+if( blackListError == KErrNone )
+{
+TTime modified ( 0 );
+blackListError = iFs.Modified( tempName, modified );
+if( blackListError == KErrNone )
+{
+iBlacklist->AddFile( tempName, mediaId, modified );
+}
+}
+}
+}
 	TRAPD( err, helixMetadata->OpenFileL( aFile ) );
 	if( err == KErrNone )
 		{
 		// doesn't own pointers to MIME types
 	// Set to Video, regardless how badly file is corrupted
 	else
 		{
 		aType.Copy( KVideo );
 		}
+if ( iBlacklist && blackListError == KErrNone )
+{
+WRITELOG( "CHarvesterVideoPlugin::GetRmTypeL - Removing URI from blacklist" );
+iBlacklist->RemoveFile( tempName, mediaId );
+}
 	helixMetadata->ResetL();
 CleanupStack::PopAndDestroy( helixMetadata );
 	}

changeset 23	33ae025ac1e8
parent 21	50bf9db68373
child 25	8e4539ab1889
child 41	2290317b9ec5