X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupload_job.cc;h=fbfbb92d83459bc1c89189cf3016a5880ad1c273;hb=8902a7adb63e2dac24e877ed1035bf344397c260;hp=89ce5252d2a0d976eb7186755bf3fc42d25c3662;hpb=b00389305af83dfd1e3b41ab3b108cb591f18c5d;p=dcpomatic.git

diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index 89ce5252d..fbfbb92d8 100644
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,28 +22,22 @@
  *  @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 "dcpomatic_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);
-
 using std::string;
 using std::min;
 using boost::shared_ptr;
+using boost::scoped_ptr;
 
 UploadJob::UploadJob (shared_ptr<const Film> film)
 	: Job (film)
@@ -51,6 +46,11 @@ UploadJob::UploadJob (shared_ptr<const Film> film)
 
 }
 
+UploadJob::~UploadJob ()
+{
+	stop_thread ();
+}
+
 string
 UploadJob::name () const
 {
@@ -68,8 +68,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 FILE_TRANSFER_PROTOCOL_SCP:
+		uploader.reset (new SCPUploader (bind (&UploadJob::set_status, this, _1), bind (&UploadJob::set_progress, this, _1, false)));
+		break;
+	case FILE_TRANSFER_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_(""));