Add wrappers around boost::filesystem methods that handle the

[libdcp.git] / tools / dcpdiff.cc

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 976a29193b31f60ce30fb102c9ebf82d173d604b..7c7c4b71da2ef8d3c70e2c4bf3342cbd612234f1 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -31,25 +31,32 @@
     files in the program, then also delete it here.
 */
 
+
+#include "common.h"
 #include "dcp.h"
+#include "equality_options.h"
 #include "exceptions.h"
-#include "common.h"
+#include "filesystem.h"
 #include "mxf.h"
 #include <getopt.h>
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <list>
 
+
 using std::list;
 using std::cerr;
 using std::cout;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::vector;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcp;
 
 static bool verbose = false;
@@ -58,17 +65,18 @@ static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <DCP> <DCP>\n"
-            << "  -V, --version                show libdcp version\n"
-            << "  -h, --help                   show this help\n"
-            << "  -v, --verbose                be verbose\n"
-            << "      --cpl-annotation-texts   allow differing CPL annotation texts\n"
-            << "      --reel-annotation-texts  allow differing reel annotation texts\n"
-            << "  -a, --annotation-texts       allow different CPL and reel annotation texts\n"
-            << "  -d, --issue-dates            allow different issue dates\n"
-            << "  -m, --mean-pixel             maximum allowed mean pixel error (default 5)\n"
-            << "  -s, --std-dev-pixel          maximum allowed standard deviation of pixel error (default 5)\n"
-            << "      --key                    hexadecimal key to use to decrypt MXFs\n"
-            << "      --ignore-missing-assets  ignore missing asset files\n"
+            << "  -V, --version                     show libdcp version\n"
+            << "  -h, --help                        show this help\n"
+            << "  -v, --verbose                     be verbose\n"
+            << "      --cpl-annotation-texts        allow differing CPL annotation texts\n"
+            << "      --reel-annotation-texts       allow differing reel annotation texts\n"
+            << "  -a, --annotation-texts            allow different CPL and reel annotation texts\n"
+            << "  -d, --issue-dates                 allow different issue dates\n"
+            << "  -m, --mean-pixel                  maximum allowed mean pixel error (default 5)\n"
+            << "  -s, --std-dev-pixel               maximum allowed standard deviation of pixel error (default 5)\n"
+            << "      --key                         hexadecimal key to use to decrypt MXFs\n"
+            << "      --ignore-missing-assets       ignore missing asset files\n"
+            << "      --export-differing-subtitles  export the first pair of differing image subtitles to the current working directory\n"
             << "\n"
             << "The <DCP>s are the DCP directories to compare.\n"
             << "Comparison is of metadata and content, ignoring timestamps\n"
@@ -78,7 +86,7 @@ help (string n)
 void
 note (NoteType t, string n)
 {
-       if (t == DCP_ERROR || verbose) {
+       if (t == NoteType::ERROR || verbose) {
                cout << " " << n << "\n";
                cout.flush ();
        }
@@ -91,17 +99,17 @@ load_dcp (boost::filesystem::path path, bool ignore_missing_assets, optional<str
        DCP* dcp = 0;
        try {
                dcp = new DCP (path);
-               list<dcp::VerificationNote> notes;
+               vector<dcp::VerificationNote> notes;
                dcp->read (&notes);
                filter_notes (notes, ignore_missing_assets);
-               BOOST_FOREACH (dcp::VerificationNote i, notes) {
+               for (auto i: notes) {
                        cerr << dcp::note_to_string(i) << "\n";
                }
 
                if (key) {
-                       list<shared_ptr<Asset> > assets = dcp->assets ();
-                       for (list<shared_ptr<Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
-                               shared_ptr<MXF> mxf = dynamic_pointer_cast<MXF> (*i);
+                       auto assets = dcp->assets ();
+                       for (auto i: assets) {
+                               auto mxf = dynamic_pointer_cast<MXF>(i);
                                if (mxf) {
                                        mxf->set_key (Key (key.get ()));
                                }
@@ -119,6 +127,8 @@ load_dcp (boost::filesystem::path path, bool ignore_missing_assets, optional<str
 int
 main (int argc, char* argv[])
 {
+       dcp::init ();
+
        EqualityOptions options;
        options.max_mean_pixel_error = 5;
        options.max_std_dev_pixel_error = 5;
@@ -142,10 +152,11 @@ main (int argc, char* argv[])
                        { "cpl-annotation-texts", no_argument, 0, 'C'},
                        { "key", required_argument, 0, 'D'},
                        { "reel-annotation-texts", no_argument, 0, 'E'},
+                       { "export-differing-subtitles", no_argument, 0, 'F' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "Vhvm:s:adACD:E", long_options, &option_index);
+               int c = getopt_long (argc, argv, "Vhvm:s:adACD:EF", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -153,7 +164,7 @@ main (int argc, char* argv[])
 
                switch (c) {
                case 'V':
-                       cout << "dcpdiff version " << LIBDCP_VERSION << "\n";
+                       cout << "dcpdiff version " << dcp::version << "\n";
                        exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
@@ -186,6 +197,9 @@ main (int argc, char* argv[])
                case 'E':
                        options.reel_annotation_texts_can_differ = true;
                        break;
+               case 'F':
+                       options.export_differing_subtitles = true;
+                       break;
                }
        }
 
@@ -194,12 +208,12 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       if (!boost::filesystem::exists (argv[optind])) {
+       if (!filesystem::exists(argv[optind])) {
                cerr << argv[0] << ": DCP " << argv[optind] << " not found.\n";
                exit (EXIT_FAILURE);
        }
 
-       if (!boost::filesystem::exists (argv[optind + 1])) {
+       if (!filesystem::exists(argv[optind + 1])) {
                cerr << argv[0] << ": DCP " << argv[optind + 1] << " not found.\n";
                exit (EXIT_FAILURE);
        }