Fix bug introduced in r39705 (was making .eps.gz not work anymore).

[lyx.git] / src / ConverterCache.cpp

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index ea3bfc70f3f4115bd16ec925f8641f0e45bba8d9..76721835e61f271c181082ad7e3e04f0bf3c193f 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -22,11 +22,10 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
-#include "support/lyxlib.h"
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -61,9 +60,9 @@ public:
                : timestamp(t), checksum(c)
        {
                ostringstream os;
-               os << setw(10) << setfill('0') << do_crc(orig_from.absFilename())
+               os << setw(10) << setfill('0') << do_crc(orig_from.absFileName())
                   << '-' << to_format;
-               cache_name = FileName(addName(cache_dir.absFilename(), os.str()));
+               cache_name = FileName(addName(cache_dir.absFileName(), os.str()));
                LYXERR(Debug::FILES, "Add file cache item " << orig_from
                                     << ' ' << to_format << ' ' << cache_name
                                     << ' ' << long(timestamp) << ' ' << checksum << '.');
@@ -106,9 +105,9 @@ public:
 void ConverterCache::Impl::readIndex()
 {
        time_t const now = current_time();
-       FileName const index(addName(cache_dir.absFilename(), "index"));
+       FileName const index(addName(cache_dir.absFileName(), "index"));
        ifstream is(index.toFilesystemEncoding().c_str());
-       Lexer lex(0, 0);
+       Lexer lex;
        lex.setStream(is);
        while (lex.isOK()) {
                if (!lex.next(true))
@@ -166,10 +165,10 @@ void ConverterCache::Impl::readIndex()
 
 void ConverterCache::Impl::writeIndex()
 {
-       FileName const index(addName(cache_dir.absFilename(), "index"));
+       FileName const index(addName(cache_dir.absFileName(), "index"));
        ofstream os(index.toFilesystemEncoding().c_str());
        os.close();
-       if (!lyx::support::chmod(index, 0600))
+       if (!index.changePermission(0600))
                return;
        os.open(index.toFilesystemEncoding().c_str());
        CacheType::iterator it1 = cache.begin();
@@ -179,7 +178,7 @@ void ConverterCache::Impl::writeIndex()
                FormatCacheType::const_iterator it2 = format_cache.begin();
                FormatCacheType::const_iterator const end2 = format_cache.end();
                for (; it2 != end2; ++it2)
-                       os << Lexer::quoteString(it1->first.absFilename())
+                       os << Lexer::quoteString(it1->first.absFileName())
                           << ' ' << it2->first << ' '
                           << it2->second.timestamp << ' '
                           << it2->second.checksum << '\n';
@@ -217,9 +216,6 @@ ConverterCache::ConverterCache()
 
 ConverterCache::~ConverterCache()
 {
-       if (!lyxrc.use_converter_cache)
-               return;
-       pimpl_->writeIndex();
        delete pimpl_;
 }
 
@@ -238,9 +234,9 @@ void ConverterCache::init()
                return;
        // We do this here and not in the constructor because package() gets
        // initialized after all static variables.
-       cache_dir = FileName(addName(support::package().user_support().absFilename(), "cache"));
+       cache_dir = FileName(addName(package().user_support().absFileName(), "cache"));
        if (!cache_dir.exists())
-               if (support::mkdir(cache_dir, 0700) != 0) {
+               if (!cache_dir.createDirectory(0700)) {
                        lyxerr << "Could not create cache directory `"
                               << cache_dir << "'." << endl;
                        exit(EXIT_FAILURE);
@@ -249,6 +245,15 @@ void ConverterCache::init()
 }
 
 
+void ConverterCache::writeIndex() const
+{
+       if (!lyxrc.use_converter_cache 
+                 || cache_dir.empty())
+               return;
+       pimpl_->writeIndex();
+}
+
+
 void ConverterCache::add(FileName const & orig_from, string const & to_format,
                FileName const & converted_file) const
 {
@@ -260,10 +265,10 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
 
        // FIXME: Should not hardcode this (see bug 3819 for details)
        if (to_format == "pstex") {
-               FileName const converted_eps(support::changeExtension(converted_file.absFilename(), "eps"));
+               FileName const converted_eps(changeExtension(converted_file.absFileName(), "eps"));
                add(orig_from, "eps", converted_eps);
        } else if (to_format == "pdftex") {
-               FileName const converted_pdf(support::changeExtension(converted_file.absFilename(), "pdf"));
+               FileName const converted_pdf(changeExtension(converted_file.absFileName(), "pdf"));
                add(orig_from, "pdf", converted_pdf);
        }
 
@@ -289,15 +294,22 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
                }
                item->checksum = checksum;
                if (!mover.copy(converted_file, item->cache_name,
-                               support::onlyFilename(item->cache_name.absFilename()), 0600)) {
-                       LYXERR(Debug::FILES, "ConverterCache::add(" << orig_from << "):\n"
-                                               "Could not copy file.");
+                             onlyFileName(item->cache_name.absFileName()))) {
+                       LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
+                               << item->cache_name);
+               } else if (!item->cache_name.changePermission(0600)) {
+                       LYXERR(Debug::FILES, "Could not change file mode"
+                               << item->cache_name);
                }
        } else {
                CacheItem new_item(orig_from, to_format, timestamp,
                                orig_from.checksum());
                if (mover.copy(converted_file, new_item.cache_name,
-                              support::onlyFilename(new_item.cache_name.absFilename()), 0600)) {
+                             onlyFileName(new_item.cache_name.absFileName()))) {
+                       if (!new_item.cache_name.changePermission(0600)) {
+                               LYXERR(Debug::FILES, "Could not change file mode"
+                                       << new_item.cache_name);
+                       }
                        FormatCache & format_cache = pimpl_->cache[orig_from];
                        if (format_cache.from_format.empty())
                                format_cache.from_format =
@@ -403,7 +415,7 @@ FileName const & ConverterCache::cacheName(FileName const & orig_from,
        LYXERR(Debug::FILES, orig_from << ' ' << to_format);
 
        CacheItem * const item = pimpl_->find(orig_from, to_format);
-       BOOST_ASSERT(item);
+       LASSERT(item, /**/);
        return item->cache_name;
 }
 
@@ -417,20 +429,20 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
 
        // FIXME: Should not hardcode this (see bug 3819 for details)
        if (to_format == "pstex") {
-               FileName const dest_eps(support::changeExtension(dest.absFilename(), "eps"));
+               FileName const dest_eps(changeExtension(dest.absFileName(), "eps"));
                if (!copy(orig_from, "eps", dest_eps))
                        return false;
        } else if (to_format == "pdftex") {
-               FileName const dest_pdf(support::changeExtension(dest.absFilename(), "pdf"));
+               FileName const dest_pdf(changeExtension(dest.absFileName(), "pdf"));
                if (!copy(orig_from, "pdf", dest_pdf))
                        return false;
        }
 
        CacheItem * const item = pimpl_->find(orig_from, to_format);
-       BOOST_ASSERT(item);
+       LASSERT(item, /**/);
        Mover const & mover = getMover(to_format);
        return mover.copy(item->cache_name, dest,
-                         support::onlyFilename(dest.absFilename()));
+                         onlyFileName(dest.absFileName()));
 }
 
 } // namespace lyx