X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FSystemcall.cpp;h=bc7790adb17cdd8f8dbd4f123836e6bb5610a09d;hb=f8cc30a1f20de97425d17fc1779041d0f963f74a;hp=170a85a34949e57eb0d768014f0087bececbb907;hpb=0f8003c25a2462e163012373b860fe3cd4ee92e4;p=lyx.git diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp index 170a85a349..bc7790adb1 100644 --- a/src/support/Systemcall.cpp +++ b/src/support/Systemcall.cpp @@ -14,6 +14,7 @@ #include #include "support/debug.h" +#include "support/filetools.h" #include "support/lstrings.h" #include "support/qstring_helpers.h" #include "support/Systemcall.h" @@ -21,6 +22,7 @@ #include "support/os.h" #include "support/ProgressInterface.h" +#include "LyXRC.h" #include #include @@ -61,6 +63,10 @@ public: void appendMessage(QString const &) {} void appendError(QString const &) {} void clearMessages() {} + void lyxerrFlush() {} + + void lyxerrConnect() {} + void lyxerrDisconnect() {} void warning(QString const &, QString const &) {} void toggleWarning(QString const &, QString const &, QString const &) {} @@ -92,9 +98,15 @@ ProgressInterface* ProgressInterface::instance() // Reuse of instance #ifndef USE_QPROCESS int Systemcall::startscript(Starttype how, string const & what, - bool /*process_events*/) + std::string const & path, bool /*process_events*/) { - string command = what; + string const python_call = "python -tt"; + string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path))); + + if (prefixIs(what, python_call)) + command += os::python() + what.substr(python_call.length()); + else + command += what; if (how == DontWait) { switch (os::shell()) { @@ -105,7 +117,8 @@ int Systemcall::startscript(Starttype how, string const & what, command = "start /min " + command; break; } - } + } else if (os::shell() == os::CMD_EXE) + command = subst(command, "cmd /d /c ", ""); return ::system(command.c_str()); } @@ -154,9 +167,16 @@ string const parsecmd(string const & inputcmd, string & outfile) bool in_single_quote = false; bool in_double_quote = false; bool escaped = false; + string const python_call = "python -tt"; string cmd; + int start = 0; + + if (prefixIs(inputcmd, python_call)) { + cmd = os::python(); + start = python_call.length(); + } - for (size_t i = 0; i < inputcmd.length(); ++i) { + for (size_t i = start; i < inputcmd.length(); ++i) { char c = inputcmd[i]; if (c == '\'') { if (in_double_quote || escaped) { @@ -200,15 +220,16 @@ string const parsecmd(string const & inputcmd, string & outfile) -int Systemcall::startscript(Starttype how, string const & what, bool process_events) +int Systemcall::startscript(Starttype how, string const & what, + string const & path, bool process_events) { string outfile; - QString cmd = toqstr(parsecmd(what, outfile)); + QString cmd = QString::fromLocal8Bit(parsecmd(what, outfile).c_str()); SystemcallPrivate d(outfile); - d.startProcess(cmd); + d.startProcess(cmd, path); if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) { LYXERR0("Systemcall: '" << cmd << "' did not start!"); LYXERR0("error " << d.errorMessage()); @@ -221,8 +242,9 @@ int Systemcall::startscript(Starttype how, string const & what, bool process_eve return 0; } - if (!d.waitWhile(SystemcallPrivate::Running, process_events, 180000)) { - LYXERR0("Systemcall: '" << cmd << "' did not finished!"); + if (!d.waitWhile(SystemcallPrivate::Running, process_events, + os::timeout_min() * 60 * 1000)) { + LYXERR0("Systemcall: '" << cmd << "' did not finish!"); LYXERR0("error " << d.errorMessage()); LYXERR0("status " << d.exitStatusMessage()); return 20; @@ -237,41 +259,40 @@ int Systemcall::startscript(Starttype how, string const & what, bool process_eve } -SystemcallPrivate::SystemcallPrivate(const std::string& of) : - proc_(new QProcess), outindex_(0), errindex_(0), - outfile(of), showout_(false), showerr_(false), process_events(false) +SystemcallPrivate::SystemcallPrivate(const std::string& of) : + process_(new QProcess), + out_index_(0), + err_index_(0), + out_file_(of), + process_events_(false) { - if (!outfile.empty()) { + if (!out_file_.empty()) { // Check whether we have to simply throw away the output. - if (outfile != os::nulldev()) - proc_->setStandardOutputFile(toqstr(outfile)); - } else if (os::is_terminal(os::STDOUT)) - setShowOut(true); - if (os::is_terminal(os::STDERR)) - setShowErr(true); - - connect(proc_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut())); - connect(proc_, SIGNAL(readyReadStandardError()), SLOT(stdErr())); - connect(proc_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError))); - connect(proc_, SIGNAL(started()), this, SLOT(processStarted())); - connect(proc_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus))); -} + if (out_file_ != os::nulldev()) + process_->setStandardOutputFile(QString::fromLocal8Bit(out_file_.c_str())); + } + connect(process_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut())); + connect(process_, SIGNAL(readyReadStandardError()), SLOT(stdErr())); + connect(process_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError))); + connect(process_, SIGNAL(started()), this, SLOT(processStarted())); + connect(process_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus))); +} -void SystemcallPrivate::startProcess(const QString& cmd) +void SystemcallPrivate::startProcess(QString const & cmd, string const & path) { cmd_ = cmd; - if (proc_) { + if (process_) { state = SystemcallPrivate::Starting; - proc_->start(cmd_); + process_->start(toqstr(latexEnvCmdPrefix(path)) + cmd_); } } void SystemcallPrivate::processEvents() { - if(process_events) { + if(process_events_) { QCoreApplication::processEvents(/*QEventLoop::ExcludeUserInputEvents*/); } } @@ -284,20 +305,20 @@ void SystemcallPrivate::waitAndProcessEvents() } -bool SystemcallPrivate::waitWhile(State waitwhile, bool proc_events, int timeout) +bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int timeout) { - if (!proc_) + if (!process_) return false; - process_events = proc_events; + process_events_ = process_events; // Block GUI while waiting, // relay on QProcess' wait functions - if (!process_events) { + if (!process_events_) { if (waitwhile == Starting) - return proc_->waitForStarted(timeout); + return process_->waitForStarted(timeout); if (waitwhile == Running) - return proc_->waitForFinished(timeout); + return process_->waitForFinished(timeout); return false; } @@ -321,20 +342,16 @@ bool SystemcallPrivate::waitWhile(State waitwhile, bool proc_events, int timeout SystemcallPrivate::~SystemcallPrivate() { - flush(); - - if (outindex_) { - outdata_[outindex_] = '\0'; - outindex_ = 0; - if (showout_) - cout << outdata_; + if (out_index_) { + out_data_[out_index_] = '\0'; + out_index_ = 0; + cout << out_data_; } cout.flush(); - if (errindex_) { - errdata_[errindex_] = '\0'; - errindex_ = 0; - if (showerr_) - cerr << errdata_; + if (err_index_) { + err_data_[err_index_] = '\0'; + err_index_ = 0; + cerr << err_data_; } cerr.flush(); @@ -342,74 +359,48 @@ SystemcallPrivate::~SystemcallPrivate() } -void SystemcallPrivate::flush() -{ - if (proc_) { - // If the output has been redirected, we write it all at once. - // Even if we are not running in a terminal, the output could go - // to some log file, for example ~/.xsession-errors on *nix. - if (!os::is_terminal(os::STDOUT) && outfile.empty()) - cout << fromqstr(QString::fromLocal8Bit( - proc_->readAllStandardOutput().data())); - if (!os::is_terminal(os::STDERR)) - cerr << fromqstr(QString::fromLocal8Bit( - proc_->readAllStandardError().data())); - } -} - - void SystemcallPrivate::stdOut() { - if (proc_) { + if (process_) { char c; - proc_->setReadChannel(QProcess::StandardOutput); - while (proc_->getChar(&c)) { - outdata_[outindex_++] = c; - if (c == '\n' || outindex_ + 1 == bufsize_) { - outdata_[outindex_] = '\0'; - outindex_ = 0; - if (showout_) - cout << outdata_; + process_->setReadChannel(QProcess::StandardOutput); + while (process_->getChar(&c)) { + out_data_[out_index_++] = c; + if (c == '\n' || out_index_ + 1 == buffer_size_) { + out_data_[out_index_] = '\0'; + out_index_ = 0; + ProgressInterface::instance()->appendMessage(QString::fromLocal8Bit(out_data_)); + cout << out_data_; } } } - const QString data = QString::fromLocal8Bit(outdata_); - if (!data.isEmpty()) { - // TODO No good messages from the processes. Disable batch mode? - //ProgressInterface::instance()->appendMessage(data); - } - processEvents(); } void SystemcallPrivate::stdErr() { - if (proc_) { + if (process_) { char c; - proc_->setReadChannel(QProcess::StandardError); - while (proc_->getChar(&c)) { - errdata_[errindex_++] = c; - if (c == '\n' || errindex_ + 1 == bufsize_) { - errdata_[errindex_] = '\0'; - errindex_ = 0; - if (showerr_) - cerr << errdata_; + process_->setReadChannel(QProcess::StandardError); + while (process_->getChar(&c)) { + err_data_[err_index_++] = c; + if (c == '\n' || err_index_ + 1 == buffer_size_) { + err_data_[err_index_] = '\0'; + err_index_ = 0; + ProgressInterface::instance()->appendError(QString::fromLocal8Bit(err_data_)); + cerr << err_data_; } } } - const QString data = QString::fromLocal8Bit(errdata_); - if (!data.isEmpty()) - ProgressInterface::instance()->appendError(data); - processEvents(); } void SystemcallPrivate::processStarted() { if (state != Running) { - state = Running; - ProgressInterface::instance()->processStarted(cmd_); - } + state = Running; + ProgressInterface::instance()->processStarted(cmd_); + } } @@ -431,11 +422,11 @@ void SystemcallPrivate::processError(QProcess::ProcessError) QString SystemcallPrivate::errorMessage() const { - if (!proc_) + if (!process_) return "No QProcess available"; QString message; - switch (proc_->error()) { + switch (process_->error()) { case QProcess::FailedToStart: message = "The process failed to start. Either the invoked program is missing, " "or you may have insufficient permissions to invoke the program."; @@ -465,11 +456,11 @@ QString SystemcallPrivate::errorMessage() const QString SystemcallPrivate::exitStatusMessage() const { - if (!proc_) + if (!process_) return "No QProcess available"; QString message; - switch (proc_->exitStatus()) { + switch (process_->exitStatus()) { case QProcess::NormalExit: message = "The process exited normally."; break; @@ -486,24 +477,24 @@ QString SystemcallPrivate::exitStatusMessage() const int SystemcallPrivate::exitCode() { - if (!proc_) + if (!process_) return -1; - return proc_->exitCode(); + return process_->exitCode(); } QProcess* SystemcallPrivate::releaseProcess() { - QProcess* released = proc_; - proc_ = 0; + QProcess* released = process_; + process_ = 0; return released; } void SystemcallPrivate::killProcess() { - killProcess(proc_); + killProcess(process_); }