rm -f $work/info.log
for d in `find $private/metadata -mindepth 1 -maxdepth 1 -type d | sort`; do
if [ `basename $d` != ".git" ]; then
- $dcpinfo -k -s $d 2> /dev/null >> $work/info.log
+ $dcpinfo --ignore-missing-assets -k -s $d 2> /dev/null >> $work/info.log
if [ "$?" != "0" ]; then
echo "FAIL: dcpinfo failed for $d"
exit 1
for d in `find $work/private/metadata -mindepth 1 -maxdepth 1 -type d | sort`; do
if [ `basename $d` != ".git" ]; then
$work/rewrite_subs $d
- $dcpinfo -k -s $d 2>&1 >> $work/info2.log
+ $dcpinfo --ignore-missing-assets -k -s $d >> $work/info2.log
fi
done
}
template<class T> void
-survivable_error (bool keep_going, list<shared_ptr<DCPReadError> >* errors, T const & e)
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
{
if (keep_going) {
if (errors) {
}
void
-DCP::read (bool keep_going, list<shared_ptr<DCPReadError> >* errors)
+DCP::read (bool keep_going, ReadErrors* errors)
{
/* Read the ASSETMAP */
*/
DCP (boost::filesystem::path directory);
+ typedef std::list<boost::shared_ptr<DCPReadError> > ReadErrors;
+
/** Read the DCP's structure into this object.
* @param keep_going true to try to keep going in the face of (some) errors.
* @param errors List of errors that will be added to if keep_going is true.
*/
- void read (bool keep_going = false, std::list<boost::shared_ptr<DCPReadError> >* errors = 0);
+ void read (bool keep_going = false, ReadErrors* errors = 0);
/** Compare this DCP with another, according to various options.
* @param other DCP to compare this one to.
--- /dev/null
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "common.h"
+#include "dcp.h"
+
+using std::list;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+
+void
+dcp::filter_errors (dcp::DCP::ReadErrors& errors, bool ignore_missing_assets)
+{
+ for (DCP::ReadErrors::iterator i = errors.begin(); i != errors.end(); ) {
+
+ DCP::ReadErrors::iterator tmp = i;
+ ++tmp;
+
+ if (ignore_missing_assets && dynamic_pointer_cast<MissingAssetError> (*i)) {
+ errors.erase (i);
+ }
+
+ i = tmp;
+ }
+}
+
--- /dev/null
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "exceptions.h"
+
+namespace dcp {
+
+extern void filter_errors (std::list<boost::shared_ptr<DCPReadError> >& errors, bool ignore_missing_assets);
+
+}
+/*
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
#include <iostream>
#include <boost/filesystem.hpp>
#include <getopt.h>
#include "dcp.h"
#include "exceptions.h"
+#include "common.h"
using namespace std;
using namespace boost;
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"
- << " -n, --names allow differing MXF names\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"
- << " -k, --keep-going carry on in the event of errors, if possible\n"
+ << " -V, --version show libdcp version\n"
+ << " -h, --help show this help\n"
+ << " -v, --verbose be verbose\n"
+ << " -n, --names allow differing MXF names\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"
+ << " -k, --keep-going carry on in the event of errors, if possible\n"
+ << " --ignore-missing-assets ignore missing asset files\n"
<< "\n"
<< "The <DCP>s are the DCP directories to compare.\n"
<< "Comparison is of metadata and content, ignoring timestamps\n"
}
}
+DCP *
+load_dcp (boost::filesystem::path path, bool keep_going, bool ignore_missing_assets)
+{
+ DCP* dcp = 0;
+ try {
+ dcp = new DCP (path);
+ DCP::ReadErrors errors;
+ dcp->read (keep_going, &errors);
+ filter_errors (errors, ignore_missing_assets);
+ for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) {
+ cerr << (*i)->what() << "\n";
+ }
+ } catch (FileError& e) {
+ cerr << "Could not read DCP " << path.string() << "; " << e.what() << " " << e.filename() << "\n";
+ exit (EXIT_FAILURE);
+ }
+
+ return dcp;
+}
+
int
main (int argc, char* argv[])
{
options.max_mean_pixel_error = 5;
options.max_std_dev_pixel_error = 5;
bool keep_going = false;
+ bool ignore_missing_assets = false;
int option_index = 0;
while (1) {
{ "mean-pixel", required_argument, 0, 'm'},
{ "std-dev-pixel", required_argument, 0, 's'},
{ "keep-going", no_argument, 0, 'k'},
+ { "ignore-missing-assets", no_argument, 0, 'A'},
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "Vhvnm:s:k", long_options, &option_index);
+ int c = getopt_long (argc, argv, "Vhvnm:s:kA", long_options, &option_index);
if (c == -1) {
break;
case 'k':
keep_going = true;
break;
+ case 'A':
+ ignore_missing_assets = true;
+ break;
}
}
exit (EXIT_FAILURE);
}
- DCP* a = 0;
- try {
- a = new DCP (argv[optind]);
- list<shared_ptr<DCPReadError> > errors;
- a->read (keep_going, &errors);
- for (list<shared_ptr<DCPReadError> >::const_iterator i = errors.begin(); i != errors.end(); ++i) {
- cerr << (*i)->what() << "\n";
- }
- } catch (FileError& e) {
- cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << " " << e.filename() << "\n";
- exit (EXIT_FAILURE);
- }
-
- DCP* b = 0;
- try {
- b = new DCP (argv[optind + 1]);
- list<shared_ptr<DCPReadError> > errors;
- b->read (keep_going, &errors);
- for (list<shared_ptr<DCPReadError> >::const_iterator i = errors.begin(); i != errors.end(); ++i) {
- cerr << (*i)->what() << "\n";
- }
- } catch (FileError& e) {
- cerr << "Could not read DCP " << argv[optind + 1] << "; " << e.what() << " " << e.filename() << "\n";
- exit (EXIT_FAILURE);
- }
+ DCP* a = load_dcp (argv[optind], keep_going, ignore_missing_assets);
+ DCP* b = load_dcp (argv[optind + 1], keep_going, ignore_missing_assets);
/* I think this is just below the LSB at 16-bits (ie the 8th most significant bit at 24-bit) */
options.max_audio_sample_error = 255;
#include "reel_subtitle_asset.h"
#include "subtitle_string.h"
#include "cpl.h"
+#include "common.h"
using std::string;
using std::cerr;
help (string n)
{
cerr << "Syntax: " << n << " [options] <DCP>\n"
- << " -s, --subtitles list all subtitles\n"
- << " -k, --keep-going carry on in the event of errors, if possible\n";
+ << " -s, --subtitles list all subtitles\n"
+ << " -k, --keep-going carry on in the event of errors, if possible\n"
+ << " --ignore-missing-assets ignore missing asset files\n";
}
static void
{
bool subtitles = false;
bool keep_going = false;
+ bool ignore_missing_assets = false;
int option_index = 0;
while (1) {
static struct option long_options[] = {
- { "version", no_argument, 0, 'v'},
- { "help", no_argument, 0, 'h'},
- { "subtitles", no_argument, 0, 's'},
- { "keep-going", no_argument, 0, 'k'},
+ { "version", no_argument, 0, 'v' },
+ { "help", no_argument, 0, 'h' },
+ { "subtitles", no_argument, 0, 's' },
+ { "keep-going", no_argument, 0, 'k' },
+ { "ignore-missing-assets", no_argument, 0, 'A' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhsk", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhskA", long_options, &option_index);
if (c == -1) {
break;
case 'k':
keep_going = true;
break;
+ case 'A':
+ ignore_missing_assets = true;
+ break;
}
}
}
DCP* dcp = 0;
- list<shared_ptr<DCPReadError> > errors;
+ DCP::ReadErrors errors;
try {
dcp = new DCP (argv[optind]);
dcp->read (keep_going, &errors);
cout << "DCP: " << boost::filesystem::path(argv[optind]).filename().string() << "\n";
- for (list<shared_ptr<DCPReadError> >::const_iterator i = errors.begin(); i != errors.end(); ++i) {
+ dcp::filter_errors (errors, ignore_missing_assets);
+ for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) {
cerr << "Error: " << (*i)->what() << "\n";
}
main_picture (*j);
} catch (UnresolvedRefError& e) {
if (keep_going) {
- cerr << e.what() << " (for main picture)\n";
+ if (!ignore_missing_assets) {
+ cerr << e.what() << " (for main picture)\n";
+ }
} else {
throw;
}
main_sound (*j);
} catch (UnresolvedRefError& e) {
if (keep_going) {
- cerr << e.what() << " (for main sound)\n";
+ if (!ignore_missing_assets) {
+ cerr << e.what() << " (for main sound)\n";
+ }
} else {
throw;
}
main_subtitle (*j, subtitles);
} catch (UnresolvedRefError& e) {
if (keep_going) {
- cerr << e.what() << " (for main subtitle)\n";
+ if (!ignore_missing_assets) {
+ cerr << e.what() << " (for main subtitle)\n";
+ }
} else {
throw;
}
obj = bld(features = 'cxx cxxprogram')
obj.use = ['libdcp%s' % bld.env.API_VERSION]
obj.uselib = 'OPENJPEG CXML'
- obj.source = 'dcpdiff.cc'
+ obj.source = 'dcpdiff.cc common.cc'
obj.target = 'dcpdiff'
obj = bld(features = 'cxx cxxprogram')
obj.use = ['libdcp%s' % bld.env.API_VERSION]
obj.uselib = 'OPENJPEG CXML'
- obj.source = 'dcpinfo.cc'
+ obj.source = 'dcpinfo.cc common.cc'
obj.target = 'dcpinfo'
projects / libdcp.git / commitdiff