namespace Alert = frontend::Alert;
-/// Ask the user what to do if the destination file already exists
-/// and is different from the source file.
-static int checkOverwrite(FileName const & src_file, FileName const & dst_file)
+/// Ask the user what to do if a file already exists
+static int checkOverwrite(FileName const & filename)
{
- if (!dst_file.exists())
- return 0;
-
- if (src_file.checksum() == dst_file.checksum())
- return -1;
+ if (!filename.exists())
+ return 1;
docstring text = bformat(_("The file %1$s already exists.\n\n"
"Do you want to overwrite that file?"),
- makeDisplayPath(dst_file.absFilename()));
+ makeDisplayPath(filename.absFileName()));
return Alert::prompt(_("Overwrite file?"),
- text, 0, 2,
- _("&Overwrite"), _("Overwrite &all"),
- _("&Cancel export"));
+ text, 0, 3,
+ _("&Keep file"), _("&Overwrite"),
+ _("Overwrite &all"), _("&Cancel export"));
}
// 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.absFilename()), package().temp_dir().absFilename()))
+ // Also don't overwrite files that already exist and are identical
+ // to the source files.
+ if (!prefixIs(onlyPath(sourceFile.absFileName()), package().temp_dir().absFileName())
+ || sourceFile.checksum() == destFile.checksum())
return ret;
if (!force) {
- switch(checkOverwrite(sourceFile, destFile)) {
- case -1:
- return SUCCESS;
+ switch(checkOverwrite(destFile)) {
case 0:
+ return SUCCESS;
+ case 1:
ret = SUCCESS;
break;
- case 1:
+ case 2:
ret = FORCE;
break;
default:
if (!mover.copy(sourceFile, destFile, latexFile))
Alert::error(_("Couldn't copy file"),
bformat(_("Copying %1$s to %2$s failed."),
- makeDisplayPath(sourceFile.absFilename()),
- makeDisplayPath(destFile.absFilename())));
+ makeDisplayPath(sourceFile.absFileName()),
+ makeDisplayPath(destFile.absFileName())));
return ret;
}
void ExportData::addExternalFile(string const & format,
FileName const & sourceName)
{
- addExternalFile(format, sourceName, onlyFilename(sourceName.absFilename()));
+ addExternalFile(format, sourceName, onlyFileName(sourceName.absFileName()));
}