Refactor checksum calculation

[lyx.git] / src / support / FileName.cpp

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 179fef46ee92e2b419fd8f18e33d74b162a3472c..3d31c7d37c607d971a4639d0c0ca2510ac9cd7c4 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -22,6 +22,7 @@
 #include "support/Package.h"
 #include "support/qstring_helpers.h"
 
+#include <QCryptographicHash>
 #include <QDateTime>
 #include <QDir>
 #include <QFile>
@@ -34,7 +35,7 @@
 #include <QThread>
 #endif
 
-#include <boost/crc.hpp>
+#include "support/checksum.h"
 
 #include <algorithm>
 #include <iterator>
@@ -88,7 +89,7 @@ struct FileName::Private
                : fi(toqstr(handleTildeName(abs_filename)))
        {
                name = fromqstr(fi.absoluteFilePath());
-               fi.setCaching(fi.exists() ? true : false);
+               fi.setCaching(fi.exists());
        }
        ///
        inline void refresh()
@@ -536,20 +537,14 @@ bool FileName::link(FileName const & name) const
 
 unsigned long checksum_ifstream_fallback(char const * file)
 {
-       unsigned long result = 0;
        //LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)");
        ifstream ifs(file, ios_base::in | ios_base::binary);
        if (!ifs)
-               return result;
-
-       istreambuf_iterator<char> beg(ifs);
-       istreambuf_iterator<char> end;
-       boost::crc_32_type crc;
-       crc = for_each(beg, end, crc);
-       result = crc.checksum();
-       return result;
+               return 0;
+       return support::checksum(ifs);
 }
 
+
 unsigned long FileName::checksum() const
 {
        if (!exists()) {
@@ -582,11 +577,9 @@ unsigned long FileName::checksum() const
        qint64 size = fi.size();
        uchar * ubeg = qf.map(0, size);
        uchar * uend = ubeg + size;
-       boost::crc_32_type ucrc;
-       ucrc.process_block(ubeg, uend);
+       result = support::checksum(ubeg, uend);
        qf.unmap(ubeg);
        qf.close();
-       result = ucrc.checksum();
 
 #else // QT_VERSION
 
@@ -618,9 +611,7 @@ unsigned long FileName::checksum() const
        char * beg = static_cast<char*>(mm);
        char * end = beg + info.st_size;
 
-       boost::crc_32_type crc;
-       crc.process_block(beg, end);
-       result = crc.checksum();
+       result = support::checksum(beg, end);
 
        munmap(mm, info.st_size);
        close(fd);
@@ -955,6 +946,11 @@ string DocFileName::outputFileName(string const & path) const
 
 
 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.
 
@@ -972,6 +968,19 @@ string DocFileName::mangledFileName(string const & dir) const
        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.
@@ -991,9 +1000,12 @@ string DocFileName::mangledFileName(string const & dir) const
        // 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