*
* \author unknown
* \author Alfredo Braunstein
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean Marc Lasgouttes
* \author Angus Leeming
* \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include "Exporter.h"
-#include "gettext.h"
#include "Mover.h"
+
#include "frontends/alert.h"
#include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
#include "support/Package.h"
-#include <boost/filesystem/operations.hpp>
-
-using std::find;
-using std::string;
-using std::vector;
+#include <algorithm>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::onlyPath;
-using support::package;
-using support::prefixIs;
-
namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
-/// ask the user what to do if a file already exists
+/// Ask the user what to do if a file already exists
static int checkOverwrite(FileName const & filename)
{
if (!filename.exists())
- return 0;
+ return 1;
+
docstring text = bformat(_("The file %1$s already exists.\n\n"
- "Do you want to overwrite that file?"),
- makeDisplayPath(filename.absFilename()));
+ "Do you want to overwrite that file?"),
+ 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"));
}
/** copy file \p sourceFile to \p destFile. If \p force is false, the user
- * will be asked before existing files are overwritten.
+ * will be asked before existing files are overwritten. If \p only_tmp
+ * is true, then only copy files that are in our tmp dir (to avoid other files
+ * overwriting themselves).
* \return
* - SUCCESS if this file got copied
* - FORCE if subsequent calls should not ask for confirmation before
*/
CopyStatus copyFile(string const & format,
FileName const & sourceFile, FileName const & destFile,
- string const & latexFile, bool force)
+ string const & latexFile, bool force, bool only_tmp)
{
CopyStatus ret = force ? FORCE : SUCCESS;
- // Only copy files that are in our tmp dir, all other files would
- // overwrite themselves. This check could be changed to
+ // 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 ((only_tmp && !prefixIs(onlyPath(sourceFile.absFileName()), package().temp_dir().absFileName()))
+ || sourceFile.checksum() == destFile.checksum())
return ret;
if (!force) {
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;
}
{
// 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];
+ vector<ExportedFile> & files = externalfiles_[format];
ExportedFile file(sourceName, exportName);
if (find(files.begin(), files.end(), file) == files.end())
files.push_back(file);
void ExportData::addExternalFile(string const & format,
FileName const & sourceName)
{
- addExternalFile(format, sourceName, onlyFilename(sourceName.absFilename()));
+ addExternalFile(format, sourceName, onlyFileName(sourceName.absFileName()));
}
vector<ExportedFile> const
ExportData::externalFiles(string const & format) const
{
- FileMap::const_iterator cit = externalfiles.find(format);
- if (cit != externalfiles.end())
+ FileMap::const_iterator cit = externalfiles_.find(format);
+ if (cit != externalfiles_.end())
return cit->second;
return vector<ExportedFile>();
}