#include <boost/filesystem/operations.hpp>
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::contains;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::package;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+using support::contains;
+using support::FileName;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::package;
+using support::prefixIs;
using std::find;
using std::string;
using std::vector;
+namespace Alert = frontend::Alert;
namespace fs = boost::filesystem;
namespace {
/// ask the user what to do if a file already exists
-int checkOverwrite(string const & filename)
+int checkOverwrite(FileName const & filename)
{
- if (fs::exists(filename)) {
- string text = bformat(_("The file %1$s already exists.\n\n"
- "Do you want to over-write that file?"),
- makeDisplayPath(filename));
+ if (fs::exists(filename.toFilesystemEncoding())) {
+ docstring text = bformat(_("The file %1$s already exists.\n\n"
+ "Do you want to over-write that file?"),
+ makeDisplayPath(filename.absFilename()));
return Alert::prompt(_("Over-write file?"),
text, 0, 2,
_("&Over-write"), _("Over-write &all"),
* - CANCEL if the export should be cancelled
*/
CopyStatus copyFile(string const & format,
- string const & sourceFile, string const & destFile,
+ FileName const & sourceFile, FileName const & destFile,
string const & latexFile, bool force)
{
CopyStatus ret = force ? FORCE : SUCCESS;
// overwrite themselves. This check could be changed to
// boost::filesystem::equivalent(sourceFile, destFile) if export to
// other directories than the document directory is desired.
- if (!prefixIs(onlyPath(sourceFile), package().temp_dir()))
+ if (!prefixIs(onlyPath(sourceFile.absFilename()), package().temp_dir()))
return ret;
if (!force) {
if (!mover.copy(sourceFile, destFile, latexFile))
Alert::error(_("Couldn't copy file"),
bformat(_("Copying %1$s to %2$s failed."),
- makeDisplayPath(sourceFile),
- makeDisplayPath(destFile)));
+ makeDisplayPath(sourceFile.absFilename()),
+ makeDisplayPath(destFile.absFilename())));
return ret;
}
// Ascii backend
if (backend_format == "text")
- writeFileAscii(*buffer, filename, runparams);
+ writeFileAscii(*buffer, FileName(filename), runparams);
// no backend
else if (backend_format == "lyx")
- buffer->writeFile(filename);
+ buffer->writeFile(FileName(filename));
// Docbook backend
else if (buffer->isDocBook()) {
runparams.nice = !put_in_tempdir;
- buffer->makeDocBookFile(filename, runparams);
+ buffer->makeDocBookFile(FileName(filename), runparams);
}
// LaTeX backend
else if (backend_format == format) {
runparams.nice = true;
- buffer->makeLaTeXFile(filename, string(), runparams);
+ if (!buffer->makeLaTeXFile(FileName(filename), string(), runparams))
+ return false;
} else if (!lyxrc.tex_allows_spaces
&& contains(buffer->filePath(), ' ')) {
Alert::error(_("File name error"),
return false;
} else {
runparams.nice = false;
- buffer->makeLaTeXFile(filename, buffer->filePath(), runparams);
+ if (!buffer->makeLaTeXFile(FileName(filename), buffer->filePath(), runparams))
+ return false;
}
string const error_type = (format == "program")? "Build" : bufferFormat(*buffer);
- bool const success = converters.convert(buffer, filename, filename,
- backend_format, format, result_file,
+ string const ext = formats.extension(format);
+ FileName const tmp_result_file(changeExtension(filename, ext));
+ bool const success = converters.convert(buffer, FileName(filename),
+ tmp_result_file, FileName(buffer->fileName()), backend_format, format,
buffer->errorList(error_type));
// Emit the signal to show the error list.
buffer->errors(error_type);
if (!success)
return false;
- if (!put_in_tempdir) {
- string const tmp_result_file = result_file;
- result_file = changeExtension(buffer->fileName(),
- formats.extension(format));
+ if (put_in_tempdir)
+ result_file = tmp_result_file.absFilename();
+ else {
+ result_file = changeExtension(buffer->fileName(), ext);
// We need to copy referenced files (e. g. included graphics
// if format == "dvi") to the result dir.
vector<ExportedFile> const files =
string const fmt =
formats.getFormatFromFile(it->sourceName);
status = copyFile(fmt, it->sourceName,
- makeAbsPath(it->exportName, dest),
+ FileName(makeAbsPath(it->exportName, dest)),
it->exportName, status == FORCE);
}
if (status == CANCEL) {
buffer->message(_("Document export cancelled."));
- } else if (fs::exists(tmp_result_file)) {
+ } else if (fs::exists(tmp_result_file.toFilesystemEncoding())) {
// Finally copy the main file
status = copyFile(format, tmp_result_file,
- result_file, result_file,
+ FileName(result_file), result_file,
status == FORCE);
buffer->message(bformat(_("Document exported as %1$s "
- "to file `%2$s'"),
+ "to file `%2$s'"),
formats.prettyName(format),
makeDisplayPath(result_file)));
} else {
string result_file;
if (!Export(buffer, format, true, result_file))
return false;
- return formats.view(*buffer, result_file, format);
+ return formats.view(*buffer, FileName(result_file), format);
}
}
-ExportedFile::ExportedFile(string const & s, string const & e) :
+ExportedFile::ExportedFile(FileName const & s, string const & e) :
sourceName(s), exportName(e) {}
void ExportData::addExternalFile(string const & format,
- string const & sourceName,
+ FileName const & sourceName,
string const & exportName)
{
- BOOST_ASSERT(lyx::support::absolutePath(sourceName));
-
// Make sure that we have every file only once, otherwise copyFile()
// would ask several times if it should overwrite a file.
vector<ExportedFile> & files = externalfiles[format];
void ExportData::addExternalFile(string const & format,
- string const & sourceName)
+ FileName const & sourceName)
{
- addExternalFile(format, sourceName, onlyFilename(sourceName));
+ addExternalFile(format, sourceName, onlyFilename(sourceName.absFilename()));
}
return cit->second;
return vector<ExportedFile>();
}
+
+
+} // namespace lyx