#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
- Impl(FileName const &, string const &, string const &, string const &);
+ Impl(FileName const & doc_fname,
+ FileName const & from_file, string const & to_file_base,
+ string const & from_format, string const & to_format);
-Converter::Converter(FileName const & from_file, string const & to_file_base,
- string const & from_format, string const & to_format)
- : pimpl_(new Impl(from_file, to_file_base, from_format, to_format))
+Converter::Converter(FileName const & doc_fname,
+ FileName const & from_file, string const & to_file_base,
+ string const & from_format, string const & to_format)
+ : pimpl_(new Impl(doc_fname, from_file, to_file_base, from_format, to_format))
-static void build_script(string const & from_file, string const & to_file_base,
+static void build_script(string const & doc_fname,
+ string const & from_file, string const & to_file_base,
-Converter::Impl::Impl(FileName const & from_file, string const & to_file_base,
+Converter::Impl::Impl(FileName const & doc_fname,
+ FileName const & from_file, string const & to_file_base,
<< "\n\tto_file_base: " << to_file_base
<< "\n\tfrom_format: " << from_format
<< "\n\tto_format: " << to_format);
<< "\n\tto_file_base: " << to_file_base
<< "\n\tfrom_format: " << from_format
<< "\n\tto_format: " << to_format);
// The converted image is to be stored in this file (we do not
// use ChangeExtension because this is a basename which may
// nevertheless contain a '.')
// The converted image is to be stored in this file (we do not
// use ChangeExtension because this is a basename which may
// nevertheless contain a '.')
to_file_.toFilesystemEncoding(),
from_format, to_format, script);
LYXERR(Debug::GRAPHICS, "\tConversion script:"
to_file_.toFilesystemEncoding(),
from_format, to_format, script);
LYXERR(Debug::GRAPHICS, "\tConversion script:"
- // FIXME THREAD
- static int counter = 0;
- script_file_ = FileName(onlyPath(to_file_base) + "lyxconvert" +
- convert<string>(counter++) + ".py");
+ TempFile tempfile(to_file_.onlyPath(), "lyxconvertXXXXXX.py");
+ tempfile.setAutoRemove(false);
+ script_file_ = tempfile.name();
- ForkedCall::SignalTypePtr ptr =
- ForkedCallQueue::add(script_command_);
- ptr->connect(bind(&Impl::converted, this, _1, _2));
+ ForkedCall::sigPtr ptr = ForkedCallQueue::add(script_command_);
+ ptr->connect(ForkedCall::slot([this](pid_t pid, int retval){
+ converted(pid, retval);
+ }).track_foreign(tracker_.p()));
static void build_conversion_command(string const & command, ostream & script)
{
// Store in the python script
static void build_conversion_command(string const & command, ostream & script)
{
// Store in the python script
// Test that this was successful. If not, remove
// ${outfile} and exit the python script
// Test that this was successful. If not, remove
// ${outfile} and exit the python script
-static void build_script(string const & from_file,
+static void build_script(string const & doc_fname,
+ string const & from_file,
string const & to_file,
string const & from_format,
string const & to_format,
string const & to_file,
string const & from_format,
string const & to_format,
LYXERR(Debug::GRAPHICS, "build_script ... ");
typedef Graph::EdgePath EdgePath;
LYXERR(Debug::GRAPHICS, "build_script ... ");
typedef Graph::EdgePath EdgePath;
"import os, shutil, sys\n\n"
"def unlinkNoThrow(file):\n"
" ''' remove a file, do not throw if an error occurs '''\n"
"import os, shutil, sys\n\n"
"def unlinkNoThrow(file):\n"
" ''' remove a file, do not throw if an error occurs '''\n"
theConverters().getPath(from_format, to_format);
// Create a temporary base file-name for all intermediate steps.
theConverters().getPath(from_format, to_format);
// Create a temporary base file-name for all intermediate steps.
- // Remember to remove the temp file because we only want the name...
- // FIXME THREAD
- static int counter = 0;
- string const tmp = "gconvert" + convert<string>(counter++);
- string const to_base = FileName::tempName(tmp).toFilesystemEncoding();
+ string const from_ext = getExtension(from_file);
+ TempFile tempfile(addExtension("gconvertXXXXXX", from_ext));
+ tempfile.setAutoRemove(false);
+ string outfile = tempfile.name().toFilesystemEncoding();
+ string const to_base = from_ext.empty() ? outfile : removeExtension(outfile);
// Create a copy of the file in case the original name contains
// problematic characters like ' or ". We can work around that problem
// in python, but the converters might be shell scripts and have more
// troubles with it.
// Create a copy of the file in case the original name contains
// problematic characters like ' or ". We can work around that problem
// in python, but the converters might be shell scripts and have more
// troubles with it.
- << libScriptSearch("$$s/scripts/convertDefault.py",
- quote_python) << ' ';
- if (!from_format.empty())
- os << strip_digit(from_format) << ':';
+ << commandPrep("$$s/scripts/convertDefault.py") << ' ';
+ if (from_format.empty())
+ os << "unknown ";
+ else
+ os << strip_digit(from_format) << ' ';
// The extra " quotes around infile and outfile are needed
// because the filename may contain spaces and it is used
// as argument of os.system().
os << "' + '\"' + infile + '\"' + ' "
// The extra " quotes around infile and outfile are needed
// because the filename may contain spaces and it is used
// as argument of os.system().
os << "' + '\"' + infile + '\"' + ' "
// Build the conversion command
string const infile = outfile;
string const infile_base = changeExtension(infile, string());
// Build the conversion command
string const infile = outfile;
string const infile_base = changeExtension(infile, string());
- outfile = conv.result_file.empty()
- ? addExtension(to_base, conv.To->extension())
- : addName(subst(conv.result_dir,
+ outfile = conv.result_file().empty()
+ ? addExtension(to_base, conv.To()->extension())
+ : addName(subst(conv.result_dir(),
token_base, onlyFileName(infile_base)));
// If two formats share the same extension we may get identical names
token_base, onlyFileName(infile_base)));
// If two formats share the same extension we may get identical names
- if (outfile == infile && conv.result_file.empty()) {
- string const new_base = FileName::tempName(tmp).toFilesystemEncoding();
- outfile = addExtension(new_base, conv.To->extension());
+ if (outfile == infile && conv.result_file().empty()) {
+ TempFile tmpfile(addExtension("gconvertXXXXXX", conv.To()->extension()));
+ tmpfile.setAutoRemove(false);
+ outfile = tmpfile.name().toFilesystemEncoding();
// Store these names in the python script
script << "infile = "
<< quoteName(infile, quote_python) << "\n"
// Store these names in the python script
script << "infile = "
<< quoteName(infile, quote_python) << "\n"
// See comment about extra " quotes above (although that
// applies only for the first loop run here).
// See comment about extra " quotes above (although that
// applies only for the first loop run here).
command = subst(command, token_from, "' + '\"' + infile + '\"' + '");
command = subst(command, token_base, "' + '\"' + infile_base + '\"' + '");
command = subst(command, token_to, "' + '\"' + outfile + '\"' + '");
command = subst(command, token_todir, "' + '\"' + outdir + '\"' + '");
command = subst(command, token_from, "' + '\"' + infile + '\"' + '");
command = subst(command, token_base, "' + '\"' + infile_base + '\"' + '");
command = subst(command, token_to, "' + '\"' + outfile + '\"' + '");
command = subst(command, token_todir, "' + '\"' + outdir + '\"' + '");