properties: overload operator<< in each class

Clement Champetier · Clement Champetier · commit 9c1948f619d8 · 2016-01-19T18:21:43.000+01:00
* Removed print files in properties folder. * Fix #215
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -1,6 +1,4 @@
 #include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/properties/print.hpp>
-
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 #include <iostream>
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -203,4 +203,51 @@ void InputFile::setupUnwrapping(const ProfileLoader::Profile& profile)
         }
     }
 }
+
+std::ostream& operator<<(std::ostream& flux, const InputFile& input)
+{
+    // wrapper
+    flux << input.getProperties();
+
+    // video streams
+    for(size_t videoStreamIndex = 0; videoStreamIndex < input.getProperties().getNbVideoStreams(); ++videoStreamIndex)
+    {
+        flux << input.getProperties().getVideoProperties().at(videoStreamIndex);
+    }
+
+    // audio streams
+    for(size_t audioStreamIndex = 0; audioStreamIndex < input.getProperties().getNbAudioStreams(); ++audioStreamIndex)
+    {
+        flux << input.getProperties().getAudioProperties().at(audioStreamIndex);
+    }
+
+    // data streams
+    for(size_t dataStreamIndex = 0; dataStreamIndex < input.getProperties().getNbDataStreams(); ++dataStreamIndex)
+    {
+        flux << input.getProperties().getDataProperties().at(dataStreamIndex);
+    }
+
+    // subtitle streams
+    for(size_t subtitleStreamIndex = 0; subtitleStreamIndex < input.getProperties().getNbSubtitleStreams();
+        ++subtitleStreamIndex)
+    {
+        flux << input.getProperties().getSubtitleProperties().at(subtitleStreamIndex);
+    }
+
+    // attachement streams
+    for(size_t attachementStreamIndex = 0; attachementStreamIndex < input.getProperties().getNbAttachementStreams();
+        ++attachementStreamIndex)
+    {
+        flux << input.getProperties().getAttachementProperties().at(attachementStreamIndex);
+    }
+
+    // unknown streams
+    for(size_t unknownStreamIndex = 0; unknownStreamIndex < input.getProperties().getNbUnknownStreams();
+        ++unknownStreamIndex)
+    {
+        flux << input.getProperties().getUnknownProperties().at(unknownStreamIndex);
+    }
+
+    return flux;
+}
 }
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -125,6 +125,10 @@ class AvExport InputFile
     std::string _filename;
     std::vector<InputStream*> _inputStreams; ///< Has ownership
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const InputFile& input);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/AttachementProperties.cpp b/src/AvTranscoder/properties/AttachementProperties.cpp
@@ -0,0 +1,20 @@
+#include "AttachementProperties.hpp"
+
+#include <AvTranscoder/properties/util.hpp>
+
+namespace avtranscoder
+{
+
+std::ostream& operator<<(std::ostream& flux, const AttachementProperties& attachementProperties)
+{
+    flux << detail::separator << " Attachement stream " << detail::separator << std::endl;
+
+    PropertyVector properties = attachementProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
+}
diff --git a/src/AvTranscoder/properties/AttachementProperties.hpp b/src/AvTranscoder/properties/AttachementProperties.hpp
@@ -14,6 +14,10 @@ class AvExport AttachementProperties : public StreamProperties
     {
     }
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const AttachementProperties& attachementProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/AudioProperties.cpp b/src/AvTranscoder/properties/AudioProperties.cpp
@@ -1,5 +1,7 @@
 #include "AudioProperties.hpp"
 
+#include <AvTranscoder/properties/util.hpp>
+
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -168,4 +170,18 @@ PropertyVector AudioProperties::asVector() const
 
     return data;
 }
+
+std::ostream& operator<<(std::ostream& flux, const AudioProperties& audioProperties)
+{
+    flux << std::left;
+    flux << detail::separator << " Audio stream " << detail::separator << std::endl;
+
+    PropertyVector properties = audioProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
 }
diff --git a/src/AvTranscoder/properties/AudioProperties.hpp b/src/AvTranscoder/properties/AudioProperties.hpp
@@ -48,6 +48,10 @@ class AvExport AudioProperties : public StreamProperties
     }
 #endif
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const AudioProperties& audioProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/DataProperties.cpp b/src/AvTranscoder/properties/DataProperties.cpp
@@ -1,5 +1,7 @@
 #include "DataProperties.hpp"
 
+#include <AvTranscoder/properties/util.hpp>
+
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
@@ -77,4 +79,17 @@ void DataProperties::detectAncillaryData()
             break;
     }
 }
+
+std::ostream& operator<<(std::ostream& flux, const DataProperties& dataProperties)
+{
+    flux << detail::separator << " Data stream " << detail::separator << std::endl;
+
+    PropertyVector properties = dataProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
 }
diff --git a/src/AvTranscoder/properties/DataProperties.hpp b/src/AvTranscoder/properties/DataProperties.hpp
@@ -17,6 +17,10 @@ class AvExport DataProperties : public StreamProperties
 private:
     void detectAncillaryData();
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const DataProperties& dataProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/FileProperties.cpp b/src/AvTranscoder/properties/FileProperties.cpp
@@ -1,5 +1,6 @@
 #include "FileProperties.hpp"
 
+#include <AvTranscoder/properties/util.hpp>
 #include <AvTranscoder/properties/JsonWriter.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
@@ -341,4 +342,18 @@ void FileProperties::clearStreamProperties()
     _attachementStreams.clear();
     _unknownStreams.clear();
 }
+
+std::ostream& operator<<(std::ostream& flux, const FileProperties& fileProperties)
+{
+    flux << std::left;
+    flux << detail::separator << " Wrapper " << detail::separator << std::endl;
+
+    PropertyVector properties = fileProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
 }
diff --git a/src/AvTranscoder/properties/FileProperties.hpp b/src/AvTranscoder/properties/FileProperties.hpp
@@ -120,6 +120,10 @@ class AvExport FileProperties
 
     PropertyVector _metadatas;
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const FileProperties& fileProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -1,5 +1,6 @@
 #include "StreamProperties.hpp"
 
+#include <AvTranscoder/properties/util.hpp>
 #include <AvTranscoder/properties/JsonWriter.hpp>
 
 #include <stdexcept>
@@ -138,4 +139,18 @@ std::string StreamProperties::asJson() const
         writer << std::make_pair(it->first.c_str(), it->second.c_str());
     return writer.build();
 }
+
+std::ostream& operator<<(std::ostream& flux, const StreamProperties& streamProperties)
+{
+    flux << std::left;
+    flux << detail::separator << " Stream " << detail::separator << std::endl;
+
+    PropertyVector properties = streamProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
 }
diff --git a/src/AvTranscoder/properties/StreamProperties.hpp b/src/AvTranscoder/properties/StreamProperties.hpp
@@ -59,6 +59,10 @@ class AvExport StreamProperties
     size_t _streamIndex;
     PropertyVector _metadatas;
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const StreamProperties& streamProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/SubtitleProperties.cpp b/src/AvTranscoder/properties/SubtitleProperties.cpp
@@ -0,0 +1,20 @@
+#include "SubtitleProperties.hpp"
+
+#include <AvTranscoder/properties/util.hpp>
+
+namespace avtranscoder
+{
+
+std::ostream& operator<<(std::ostream& flux, const SubtitleProperties& subtitleProperties)
+{
+    flux << detail::separator << " Subtitle stream " << detail::separator << std::endl;
+
+    PropertyVector properties = subtitleProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
+}
diff --git a/src/AvTranscoder/properties/SubtitleProperties.hpp b/src/AvTranscoder/properties/SubtitleProperties.hpp
@@ -14,6 +14,10 @@ class AvExport SubtitleProperties : public StreamProperties
     {
     }
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const SubtitleProperties& subtitleProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/UnknownProperties.cpp b/src/AvTranscoder/properties/UnknownProperties.cpp
@@ -0,0 +1,20 @@
+#include "UnknownProperties.hpp"
+
+#include <AvTranscoder/properties/util.hpp>
+
+namespace avtranscoder
+{
+
+std::ostream& operator<<(std::ostream& flux, const UnknownProperties& unknownProperties)
+{
+    flux << detail::separator << " Unknown stream " << detail::separator << std::endl;
+
+    PropertyVector properties = unknownProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
+}
diff --git a/src/AvTranscoder/properties/UnknownProperties.hpp b/src/AvTranscoder/properties/UnknownProperties.hpp
@@ -14,6 +14,10 @@ class AvExport UnknownProperties : public StreamProperties
     {
     }
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const UnknownProperties& unknownProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -1,5 +1,6 @@
 #include "VideoProperties.hpp"
 
+#include <AvTranscoder/properties/util.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 extern "C" {
@@ -602,4 +603,18 @@ PropertyVector VideoProperties::asVector() const
 
     return data;
 }
+
+std::ostream& operator<<(std::ostream& flux, const VideoProperties& videoProperties)
+{
+    flux << std::left;
+    flux << detail::separator << " Video stream " << detail::separator << std::endl;
+
+    PropertyVector properties = videoProperties.asVector();
+    for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)
+    {
+        flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;
+    }
+
+    return flux;
+}
 }
diff --git a/src/AvTranscoder/properties/VideoProperties.hpp b/src/AvTranscoder/properties/VideoProperties.hpp
@@ -118,6 +118,10 @@ class AvExport VideoProperties : public StreamProperties
      */
     int64_t _firstGopTimeCode;
 };
+
+#ifndef SWIG
+AvExport std::ostream& operator<<(std::ostream& flux, const StreamProperties& streamProperties);
+#endif
 }
 
 #endif
diff --git a/src/AvTranscoder/properties/print.cpp b/src/AvTranscoder/properties/print.cpp
diff --git a/src/AvTranscoder/properties/print.hpp b/src/AvTranscoder/properties/print.hpp
diff --git a/src/AvTranscoder/properties/util.hpp b/src/AvTranscoder/properties/util.hpp
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
diff --git a/src/AvTranscoder/reader/IReader.cpp b/src/AvTranscoder/reader/IReader.cpp
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ class AvExport AttachementProperties : public StreamProperties`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`	`};`
	`17`	`+`
	`18`	`+#ifndef SWIG`
	`19`	`+AvExport std::ostream& operator<<(std::ostream& flux, const AttachementProperties& attachementProperties);`
	`20`	`+#endif`
`17`	`21`	`}`
`18`	`22`
`19`	`23`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ class AvExport AudioProperties : public StreamProperties`
`48`	`48`	`}`
`49`	`49`	`#endif`
`50`	`50`	`};`
	`51`	`+`
	`52`	`+#ifndef SWIG`
	`53`	`+AvExport std::ostream& operator<<(std::ostream& flux, const AudioProperties& audioProperties);`
	`54`	`+#endif`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include "DataProperties.hpp"`
`2`	`2`
	`3`	`+#include <AvTranscoder/properties/util.hpp>`
	`4`	`+`
`3`	`5`	`extern "C" {`
`4`	`6`	`#include <libavcodec/avcodec.h>`
`5`	`7`	`}`
`@@ -77,4 +79,17 @@ void DataProperties::detectAncillaryData()`
`77`	`79`	`break;`
`78`	`80`	`}`
`79`	`81`	`}`
	`82`	`+`
	`83`	`+std::ostream& operator<<(std::ostream& flux, const DataProperties& dataProperties)`
	`84`	`+{`
	`85`	`+ flux << detail::separator << " Data stream " << detail::separator << std::endl;`
	`86`	`+`
	`87`	`+ PropertyVector properties = dataProperties.asVector();`
	`88`	`+ for(PropertyVector::iterator it = properties.begin(); it != properties.end(); ++it)`
	`89`	`+ {`
	`90`	`+ flux << std::setw(detail::keyWidth) << it->first << ": " << it->second << std::endl;`
	`91`	`+ }`
	`92`	`+`
	`93`	`+ return flux;`
	`94`	`+}`
`80`	`95`	`}`