commit 5a01424bf0dbb939cbff1c72ecd99359803a4675
Author: Georg Baum <b...@lyx.org>
Date: Sat Jul 5 15:11:24 2014 +0200
Make GraphicsConverter threadsafe
build_script() was already threadsafe, since it used a TempFile, and the
counter was basically not needed, but the new solution makes this obvious
and has the additional advantage that TempFile constructs the real output
file, not a dummy without extension which is not needed.
diff --git a/src/graphics/GraphicsConverter.cpp
b/src/graphics/GraphicsConverter.cpp
index e833a35..83d895e 100644
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -143,10 +143,9 @@ Converter::Impl::Impl(FileName const & from_file, string
const & to_file_base,
<< "\n--------------------------------------\n");
// Output the script to file.
- // 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();
ofstream fs(script_file_.toFilesystemEncoding().c_str());
if (!fs.good()) {
@@ -289,19 +288,16 @@ static void build_script(string const & from_file,
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++);
- TempFile tempfile(tmp);
+ string const from_ext = getExtension(from_file);
+ TempFile tempfile(addExtension("gconvertXXXXXX", from_ext));
tempfile.setAutoRemove(false);
- string const to_base = tempfile.name().toFilesystemEncoding();
+ 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.
- string outfile = addExtension(to_base, getExtension(from_file));
script << "infile = "
<< quoteName(from_file, quote_python)
<< "\n"
@@ -369,10 +365,9 @@ static void build_script(string const & from_file,
// If two formats share the same extension we may get identical
names
if (outfile == infile && conv.result_file.empty()) {
- TempFile tempfile(tmp);
+ TempFile tempfile(addExtension("gconvertXXXXXX",
conv.To->extension()));
tempfile.setAutoRemove(false);
- string const new_base =
tempfile.name().toFilesystemEncoding();
- outfile = addExtension(new_base, conv.To->extension());
+ outfile = tempfile.name().toFilesystemEncoding();
}
// Store these names in the python script
