Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / upload_job.cc

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index 89ce5252d2a0d976eb7186755bf3fc42d25c3662..90ebafd52160ab3c2f8e8d5cccc239779404de92 100644 (file)
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -21,28 +21,23 @@
  *  @brief A job to copy DCPs to a server using libcurl.
  */
 
-#include <iostream>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <boost/filesystem.hpp>
-#include <libssh/libssh.h>
 #include "compose.hpp"
 #include "upload_job.h"
-#include "exceptions.h"
 #include "config.h"
 #include "log.h"
 #include "film.h"
-#include "cross.h"
 #include "scp_uploader.h"
+#include "curl_uploader.h"
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
 
 using std::string;
 using std::min;
 using boost::shared_ptr;
+using boost::scoped_ptr;
 
 UploadJob::UploadJob (shared_ptr<const Film> film)
        : Job (film)
@@ -68,8 +63,17 @@ UploadJob::run ()
 {
        LOG_GENERAL_NC (N_("Upload job starting"));
 
-       SCPUploader uploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false));
-       uploader.upload (_film->dir (_film->dcp_name ()));
+       scoped_ptr<Uploader> uploader;
+       switch (Config::instance()->tms_protocol ()) {
+       case PROTOCOL_SCP:
+               uploader.reset (new SCPUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
+               break;
+       case PROTOCOL_FTP:
+               uploader.reset (new CurlUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
+               break;
+       }
+
+       uploader->upload (_film->dir (_film->dcp_name ()));
 
        set_progress (1);
        set_status (N_(""));