#include "support/Package.h"
#include "support/qstring_helpers.h"
+#include <QCryptographicHash>
#include <QDateTime>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QList>
#include <QTemporaryFile>
-#include <QTime>
+#include <QElapsedTimer>
#ifdef _WIN32
#include <QThread>
{
LYXERR(Debug::FILES, "Renaming " << name << " as " << *this);
bool success = QFile::rename(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath());
+ d->refresh();
if (!success)
LYXERR0("Could not rename file " << *this << " to " << name);
return success;
// there's a locking problem on Windows sometimes, so
// we will keep trying for five seconds, in the hope
// that clears.
- bool removed = QFile::remove(name.d->fi.absoluteFilePath());
- int tries = 1;
- while (!removed && tries < 6) {
- QThread::sleep(1);
- removed = QFile::remove(name.d->fi.absoluteFilePath());
- tries++;
+ name.refresh();
+ if (name.exists()) {
+ bool removed = name.removeFile();
+ int tries = 1;
+ while (!removed && tries < 6) {
+ QThread::sleep(1);
+ removed = name.removeFile();
+ tries++;
+ }
}
#else
QFile::remove(name.d->fi.absoluteFilePath());
#endif
- bool const success = QFile::rename(d->fi.absoluteFilePath(),
- name.d->fi.absoluteFilePath());
+ bool const success = renameTo(name);
if (!success)
LYXERR0("Could not move file " << *this << " to " << name);
return success;
}
// This is used in the debug output at the end of the method.
- static QTime t;
+ static QElapsedTimer t;
if (lyxerr.debugging(Debug::FILES))
t.restart();
string DocFileName::mangledFileName(string const & dir) const
+{
+ return mangledFileName(dir, true, false);
+};
+
+string DocFileName::mangledFileName(string const & dir, bool use_counter, bool encrypt_path) const
{
// Concurrent access to these variables is possible.
string const name = absFileName();
// Now the real work. Remove the extension.
string mname = support::changeExtension(name, string());
+
+ if (encrypt_path) {
+ QString qname = toqstr(mname);
+#if QT_VERSION >= 0x050000
+ QByteArray hash = QCryptographicHash::hash(qname.toLocal8Bit(),QCryptographicHash::Sha256);
+#else
+ QByteArray hash = QCryptographicHash::hash(qname.toLocal8Bit(),QCryptographicHash::Sha1);
+#endif
+ hash = hash.toHex();
+ mname = fromqstr(QString(hash));
+ mname = mname + "_" + onlyFileName();
+ }
+
// The mangled name must be a valid LaTeX name.
// The list of characters to keep is probably over-restrictive,
// but it is not really a problem.
// Prepend a counter to the filename. This is necessary to make
// the mangled name unique.
static int counter = 0;
- ostringstream s;
- s << counter++ << mname;
- mname = s.str();
+
+ if (use_counter) {
+ ostringstream s;
+ s << counter++ << mname;
+ mname = s.str();
+ }
// MiKTeX's YAP (version 2.4.1803) crashes if the file name
// is longer than about 160 characters. MiKTeX's pdflatex