Runs.

[dcpomatic.git] / src / tools / makedcp.cc

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 772a12eca6dc1782aa99fcdf72cb67465e55c060..226cde113973faf361037f607f068ec3568e8334 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -22,32 +22,37 @@
 #include <getopt.h>
 #include <libdcp/test_mode.h>
 #include <libdcp/version.h>
-#ifdef DVDOMATIC_WINDOWS
-#include "winsock2.h"
-#endif
 #include "format.h"
 #include "film.h"
 #include "filter.h"
 #include "transcode_job.h"
-#include "make_dcp_job.h"
 #include "job_manager.h"
 #include "ab_transcode_job.h"
 #include "util.h"
 #include "scaler.h"
 #include "version.h"
 #include "cross.h"
+#include "config.h"
+#include "log.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cerr;
+using std::cout;
+using std::vector;
+using std::pair;
+using std::list;
+using boost::shared_ptr;
 
 static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
+            << "  -v, --version      show DVD-o-matic version\n"
             << "  -h, --help         show this help\n"
             << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
             << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
             << "  -n, --no-progress  do not print progress to stdout\n"
+            << "  -r, --no-remote    do not use any remote servers\n"
             << "\n"
             << "<FILM> is the film directory.\n";
 }
@@ -58,24 +63,32 @@ main (int argc, char* argv[])
        string film_dir;
        bool test_mode = false;
        bool progress = true;
+       bool no_remote = false;
+       int log_level = 1;
 
        int option_index = 0;
        while (1) {
                static struct option long_options[] = {
+                       { "version", no_argument, 0, 'v'},
                        { "help", no_argument, 0, 'h'},
                        { "deps", no_argument, 0, 'd'},
                        { "test", no_argument, 0, 't'},
                        { "no-progress", no_argument, 0, 'n'},
+                       { "no-remote", no_argument, 0, 'r'},
+                       { "log-level", required_argument, 0, 'l' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "hdtn", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhdtnrl:", long_options, &option_index);
 
                if (c == -1) {
                        break;
                }
 
                switch (c) {
+               case 'v':
+                       cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+                       exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
                        exit (EXIT_SUCCESS);
@@ -88,6 +101,12 @@ main (int argc, char* argv[])
                case 'n':
                        progress = false;
                        break;
+               case 'r':
+                       no_remote = true;
+                       break;
+               case 'l':
+                       log_level = atoi (optarg);
+                       break;
                }
        }
 
@@ -100,6 +119,10 @@ main (int argc, char* argv[])
                        
        dvdomatic_setup ();
 
+       if (no_remote) {
+               Config::instance()->set_servers (vector<ServerDescription*> ());
+       }
+
        cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
        char buf[256];
        if (gethostname (buf, 256) == 0) {
@@ -112,42 +135,47 @@ main (int argc, char* argv[])
                cout << dependency_version_summary() << "\n";
        }
 
-       Film* film = 0;
+       shared_ptr<Film> film;
        try {
-               film = new Film (film_dir, true);
+               film.reset (new Film (film_dir, true));
        } catch (std::exception& e) {
                cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
                exit (EXIT_FAILURE);
        }
 
+       film->log()->set_level ((Log::Level) log_level);
+
        cout << "\nMaking ";
-       if (film->dcp_ab ()) {
+       if (film->dcp_ab()) {
                cout << "A/B ";
        }
        cout << "DCP for " << film->name() << "\n";
        cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
-       cout << "Content: " << film->content() << "\n";
+//     cout << "Content: " << film->content() << "\n";
        pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
        cout << "Filters: " << f.first << " " << f.second << "\n";
 
-       film->make_dcp (true);
+       film->make_dcp ();
 
-       list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
-       bool all_done = false;
+       bool should_stop = false;
        bool first = true;
-       while (!all_done) {
+       bool error = false;
+       while (!should_stop) {
 
                dvdomatic_sleep (5);
 
+               list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+
                if (!first && progress) {
                        cout << "\033[" << jobs.size() << "A";
                        cout.flush ();
                }
 
                first = false;
-               
-               all_done = true;
+
+               int unfinished = 0;
+               int finished_in_error = 0;
+
                for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
                        if (progress) {
                                cout << (*i)->name() << ": ";
@@ -160,9 +188,14 @@ main (int argc, char* argv[])
                                        cout << ": Running           \n";
                                }
                        }
-                       
+
                        if (!(*i)->finished ()) {
-                               all_done = false;
+                               ++unfinished;
+                       }
+
+                       if ((*i)->finished_in_error ()) {
+                               ++finished_in_error;
+                               error = true;
                        }
 
                        if (!progress && (*i)->finished_in_error ()) {
@@ -172,9 +205,13 @@ main (int argc, char* argv[])
                                cout << (*i)->status() << "\n";
                        }
                }
+
+               if (unfinished == 0 || finished_in_error != 0) {
+                       should_stop = true;
+               }
        }
 
-       return 0;
+       return error ? EXIT_FAILURE : EXIT_SUCCESS;
 }