FileProperties: add private function to refactore try/catch of getPropertiesAsMap

Clement Champetier · Clement Champetier · commit 6295036fa014 · 2015-03-17T14:21:01.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -133,15 +133,16 @@ PropertiesMap FileProperties::getPropertiesAsMap() const
 {
 	PropertiesMap dataMap;
 
-	detail::add( dataMap, "filename", getFilename() );
-	detail::add( dataMap, "formatName", getFormatName() );
-	detail::add( dataMap, "formatLongName", getFormatLongName() );
-
-	detail::add( dataMap, "startTime", getStartTime() );
-	detail::add( dataMap, "duration", getDuration() );
-	detail::add( dataMap, "bitrate", getBitRate() );
-	detail::add( dataMap, "numberOfStreams", getNbStreams() );
-	detail::add( dataMap, "numberOfPrograms", getProgramsCount() );
+	addProperty( dataMap, "filename", &FileProperties::getFilename );
+	addProperty( dataMap, "formatName", &FileProperties::getFormatName );
+	addProperty( dataMap, "formatLongName", &FileProperties::getFormatLongName );
+
+	addProperty( dataMap, "startTime", &FileProperties::getStartTime );
+	addProperty( dataMap, "duration", &FileProperties::getDuration );
+	addProperty( dataMap, "bitrate", &FileProperties::getBitRate );
+	addProperty( dataMap, "numberOfStreams", &FileProperties::getNbStreams );
+	addProperty( dataMap, "numberOfPrograms", &FileProperties::getProgramsCount );
+
 	detail::add( dataMap, "numberOfVideoStreams", getNbVideoStreams() );
 	detail::add( dataMap, "numberOfAudioStreams", getNbAudioStreams() );
 	detail::add( dataMap, "numberOfDataStreams", getNbDataStreams() );
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -76,6 +76,22 @@ class AvExport FileProperties
 
 	void clearStreamProperties();  ///< Clear all array of stream properties
 
+private:
+#ifndef SWIG
+	template<typename T>
+	void addProperty( PropertiesMap& dataMap, const std::string& key, T (FileProperties::*getter)(void) const ) const
+	{
+		try
+		{
+			detail::add( dataMap, key, (this->*getter)() );
+		}
+		catch( const std::exception& e )
+		{
+			detail::add( dataMap, key, e.what() );
+		}
+	}
+#endif
+
 private:
 	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
 
