#include "util.h"
#include "job_manager.h"
#include "transcode_job.h"
-#include "scp_dcp_job.h"
+#include "upload_job.h"
#include "log.h"
#include "exceptions.h"
#include "examine_content_job.h"
void
Film::send_dcp_to_tms ()
{
- shared_ptr<Job> j (new SCPDCPJob (shared_from_this()));
+ shared_ptr<Job> j (new UploadJob (shared_from_this()));
JobManager::instance()->add (j);
}
+++ /dev/null
-/*
- Copyright (C) 2012-2015 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.
-
-*/
-
-/** @file src/scp_dcp_job.cc
- * @brief A job to copy DCPs to a SCP-enabled server.
- */
-
-#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 "scp_dcp_job.h"
-#include "exceptions.h"
-#include "config.h"
-#include "log.h"
-#include "film.h"
-#include "cross.h"
-
-#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;
-
-class SSHSession
-{
-public:
- SSHSession ()
- : _connected (false)
- {
- session = ssh_new ();
- if (session == 0) {
- throw NetworkError (_("could not start SSH session"));
- }
- }
-
- int connect ()
- {
- int r = ssh_connect (session);
- if (r == 0) {
- _connected = true;
- }
- return r;
- }
-
- ~SSHSession ()
- {
- if (_connected) {
- ssh_disconnect (session);
- }
- ssh_free (session);
- }
-
- ssh_session session;
-
-private:
- bool _connected;
-};
-
-class SSHSCP
-{
-public:
- SSHSCP (ssh_session s)
- {
- scp = ssh_scp_new (s, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
- if (!scp) {
- throw NetworkError (String::compose (_("could not start SCP session (%1)"), ssh_get_error (s)));
- }
- }
-
- ~SSHSCP ()
- {
- ssh_scp_free (scp);
- }
-
- ssh_scp scp;
-};
-
-
-SCPDCPJob::SCPDCPJob (shared_ptr<const Film> film)
- : Job (film)
- , _status (_("Waiting"))
-{
-
-}
-
-string
-SCPDCPJob::name () const
-{
- return _("Copy DCP to TMS");
-}
-
-string
-SCPDCPJob::json_name () const
-{
- return N_("scp_dcp");
-}
-
-void
-SCPDCPJob::run ()
-{
- LOG_GENERAL_NC (N_("SCP DCP job starting"));
-
- SSHSession ss;
-
- set_status (_("connecting"));
-
- ssh_options_set (ss.session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
- ssh_options_set (ss.session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
- int const port = 22;
- ssh_options_set (ss.session, SSH_OPTIONS_PORT, &port);
-
- int r = ss.connect ();
- if (r != SSH_OK) {
- throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (ss.session)));
- }
-
- int const state = ssh_is_server_known (ss.session);
- if (state == SSH_SERVER_ERROR) {
- throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (ss.session)));
- }
-
- r = ssh_userauth_password (ss.session, 0, Config::instance()->tms_password().c_str ());
- if (r != SSH_AUTH_SUCCESS) {
- throw NetworkError (String::compose (_("Failed to authenticate with server (%1)"), ssh_get_error (ss.session)));
- }
-
- SSHSCP sc (ss.session);
-
- r = ssh_scp_init (sc.scp);
- if (r != SSH_OK) {
- throw NetworkError (String::compose (_("Could not start SCP session (%1)"), ssh_get_error (ss.session)));
- }
-
- r = ssh_scp_push_directory (sc.scp, _film->dcp_name().c_str(), S_IRWXU);
- if (r != SSH_OK) {
- throw NetworkError (String::compose (_("Could not create remote directory %1 (%2)"), _film->dcp_name(), ssh_get_error (ss.session)));
- }
-
- boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name());
-
- boost::uintmax_t bytes_to_transfer = 0;
- for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
- bytes_to_transfer += boost::filesystem::file_size (*i);
- }
-
- boost::uintmax_t buffer_size = 64 * 1024;
- char buffer[buffer_size];
- boost::uintmax_t bytes_transferred = 0;
-
- for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
-
- string const leaf = boost::filesystem::path(*i).leaf().generic_string ();
-
- set_status (String::compose (_("copying %1"), leaf));
-
- boost::uintmax_t to_do = boost::filesystem::file_size (*i);
- ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
-
- FILE* f = fopen_boost (boost::filesystem::path (*i), "rb");
- if (f == 0) {
- throw NetworkError (String::compose (_("Could not open %1 to send"), *i));
- }
-
- while (to_do > 0) {
- int const t = min (to_do, buffer_size);
- size_t const read = fread (buffer, 1, t, f);
- if (read != size_t (t)) {
- fclose (f);
- throw ReadFileError (boost::filesystem::path (*i).string());
- }
-
- r = ssh_scp_write (sc.scp, buffer, t);
- if (r != SSH_OK) {
- fclose (f);
- throw NetworkError (String::compose (_("Could not write to remote file (%1)"), ssh_get_error (ss.session)));
- }
- to_do -= t;
- bytes_transferred += t;
-
- if (bytes_to_transfer > 0) {
- set_progress ((double) bytes_transferred / bytes_to_transfer);
- }
- }
-
- fclose (f);
- }
-
- set_progress (1);
- set_status (N_(""));
- set_state (FINISHED_OK);
-}
-
-string
-SCPDCPJob::status () const
-{
- boost::mutex::scoped_lock lm (_status_mutex);
- string s = Job::status ();
- if (!_status.empty ()) {
- s += N_("; ") + _status;
- }
- return s;
-}
-
-void
-SCPDCPJob::set_status (string s)
-{
- boost::mutex::scoped_lock lm (_status_mutex);
- _status = s;
-}
+++ /dev/null
-/*
- Copyright (C) 2012 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.
-
-*/
-
-/** @file src/scp_dcp_job.h
- * @brief A job to copy DCPs to a SCP-enabled server.
- */
-
-#include "job.h"
-
-class SCPDCPJob : public Job
-{
-public:
- SCPDCPJob (boost::shared_ptr<const Film>);
-
- std::string name () const;
- std::string json_name () const;
- void run ();
- std::string status () const;
-
-private:
- void set_status (std::string);
-
- mutable boost::mutex _status_mutex;
- std::string _status;
-};
--- /dev/null
+/*
+ Copyright (C) 2012-2015 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.
+
+*/
+
+/** @file src/upload_job.cc
+ * @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 "i18n.h"
+
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+
+using std::string;
+using std::min;
+using boost::shared_ptr;
+
+class SSHSession
+{
+public:
+ SSHSession ()
+ : _connected (false)
+ {
+ session = ssh_new ();
+ if (session == 0) {
+ throw NetworkError (_("could not start SSH session"));
+ }
+ }
+
+ int connect ()
+ {
+ int r = ssh_connect (session);
+ if (r == 0) {
+ _connected = true;
+ }
+ return r;
+ }
+
+ ~SSHSession ()
+ {
+ if (_connected) {
+ ssh_disconnect (session);
+ }
+ ssh_free (session);
+ }
+
+ ssh_session session;
+
+private:
+ bool _connected;
+};
+
+class SSHSCP
+{
+public:
+ SSHSCP (ssh_session s)
+ {
+ scp = ssh_scp_new (s, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
+ if (!scp) {
+ throw NetworkError (String::compose (_("could not start SCP session (%1)"), ssh_get_error (s)));
+ }
+ }
+
+ ~SSHSCP ()
+ {
+ ssh_scp_free (scp);
+ }
+
+ ssh_scp scp;
+};
+
+
+UploadJob::UploadJob (shared_ptr<const Film> film)
+ : Job (film)
+ , _status (_("Waiting"))
+{
+
+}
+
+string
+UploadJob::name () const
+{
+ return _("Copy DCP to TMS");
+}
+
+string
+UploadJob::json_name () const
+{
+ return N_("upload");
+}
+
+void
+UploadJob::run ()
+{
+ LOG_GENERAL_NC (N_("Upload job starting"));
+
+ SSHSession ss;
+
+ set_status (_("connecting"));
+
+ ssh_options_set (ss.session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
+ ssh_options_set (ss.session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
+ int const port = 22;
+ ssh_options_set (ss.session, SSH_OPTIONS_PORT, &port);
+
+ int r = ss.connect ();
+ if (r != SSH_OK) {
+ throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (ss.session)));
+ }
+
+ int const state = ssh_is_server_known (ss.session);
+ if (state == SSH_SERVER_ERROR) {
+ throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (ss.session)));
+ }
+
+ r = ssh_userauth_password (ss.session, 0, Config::instance()->tms_password().c_str ());
+ if (r != SSH_AUTH_SUCCESS) {
+ throw NetworkError (String::compose (_("Failed to authenticate with server (%1)"), ssh_get_error (ss.session)));
+ }
+
+ SSHSCP sc (ss.session);
+
+ r = ssh_scp_init (sc.scp);
+ if (r != SSH_OK) {
+ throw NetworkError (String::compose (_("Could not start SCP session (%1)"), ssh_get_error (ss.session)));
+ }
+
+ r = ssh_scp_push_directory (sc.scp, _film->dcp_name().c_str(), S_IRWXU);
+ if (r != SSH_OK) {
+ throw NetworkError (String::compose (_("Could not create remote directory %1 (%2)"), _film->dcp_name(), ssh_get_error (ss.session)));
+ }
+
+ boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name());
+
+ boost::uintmax_t bytes_to_transfer = 0;
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
+ bytes_to_transfer += boost::filesystem::file_size (*i);
+ }
+
+ boost::uintmax_t buffer_size = 64 * 1024;
+ char buffer[buffer_size];
+ boost::uintmax_t bytes_transferred = 0;
+
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
+
+ string const leaf = boost::filesystem::path(*i).leaf().generic_string ();
+
+ set_status (String::compose (_("copying %1"), leaf));
+
+ boost::uintmax_t to_do = boost::filesystem::file_size (*i);
+ ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
+
+ FILE* f = fopen_boost (boost::filesystem::path (*i), "rb");
+ if (f == 0) {
+ throw NetworkError (String::compose (_("Could not open %1 to send"), *i));
+ }
+
+ while (to_do > 0) {
+ int const t = min (to_do, buffer_size);
+ size_t const read = fread (buffer, 1, t, f);
+ if (read != size_t (t)) {
+ fclose (f);
+ throw ReadFileError (boost::filesystem::path (*i).string());
+ }
+
+ r = ssh_scp_write (sc.scp, buffer, t);
+ if (r != SSH_OK) {
+ fclose (f);
+ throw NetworkError (String::compose (_("Could not write to remote file (%1)"), ssh_get_error (ss.session)));
+ }
+ to_do -= t;
+ bytes_transferred += t;
+
+ if (bytes_to_transfer > 0) {
+ set_progress ((double) bytes_transferred / bytes_to_transfer);
+ }
+ }
+
+ fclose (f);
+ }
+
+ set_progress (1);
+ set_status (N_(""));
+ set_state (FINISHED_OK);
+}
+
+string
+UploadJob::status () const
+{
+ boost::mutex::scoped_lock lm (_status_mutex);
+ string s = Job::status ();
+ if (!_status.empty ()) {
+ s += N_("; ") + _status;
+ }
+ return s;
+}
+
+void
+UploadJob::set_status (string s)
+{
+ boost::mutex::scoped_lock lm (_status_mutex);
+ _status = s;
+}
--- /dev/null
+/*
+ Copyright (C) 2012-2015 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.
+
+*/
+
+/** @file src/upload_job.h
+ * @brief A job to copy DCPs to a server using libcurl.
+ */
+
+#include "job.h"
+
+class UploadJob : public Job
+{
+public:
+ UploadJob (boost::shared_ptr<const Film>);
+
+ std::string name () const;
+ std::string json_name () const;
+ void run ();
+ std::string status () const;
+
+private:
+ void set_status (std::string);
+
+ mutable boost::mutex _status_mutex;
+ std::string _status;
+};
render_subtitles.cc
resampler.cc
safe_stringstream.cc
- scp_dcp_job.cc
scoped_temporary.cc
send_kdm_email_job.cc
send_problem_report_job.cc
types.cc
signal_manager.cc
update.cc
+ upload_job.cc
upmixer_a.cc
util.cc
video_content.cc