X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=76721835e61f271c181082ad7e3e04f0bf3c193f;hb=b4aadacc23ce68acd46920c17b023e6bd55d0326;hp=41785be3eed822faff41d18e281cedde74468481;hpb=456bc6a82900eeeb50dd2af76214d2a5ec5ebbb1;p=lyx.git diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp index 41785be3ee..76721835e6 100644 --- 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 +#include "support/lassert.h" #include #include @@ -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 (!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(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,18 +245,12 @@ void ConverterCache::init() } -static bool changeMode(FileName const & fname, unsigned long int mode) +void ConverterCache::writeIndex() const { - if (mode == (unsigned long int)-1) - return true; - - ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::binary | ios::out | ios::trunc); - if (!ofs) - return false; - ofs.close(); - if (!chmod(fname, mode)) - return false; - return true; + if (!lyxrc.use_converter_cache + || cache_dir.empty()) + return; + pimpl_->writeIndex(); } @@ -275,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(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(changeExtension(converted_file.absFilename(), "pdf")); + FileName const converted_pdf(changeExtension(converted_file.absFileName(), "pdf")); add(orig_from, "pdf", converted_pdf); } @@ -304,10 +294,10 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format, } item->checksum = checksum; if (!mover.copy(converted_file, item->cache_name, - onlyFilename(item->cache_name.absFilename()))) { + onlyFileName(item->cache_name.absFileName()))) { LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to " << item->cache_name); - } else if (!changeMode(item->cache_name, 0600)) { + } else if (!item->cache_name.changePermission(0600)) { LYXERR(Debug::FILES, "Could not change file mode" << item->cache_name); } @@ -315,10 +305,10 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format, CacheItem new_item(orig_from, to_format, timestamp, orig_from.checksum()); if (mover.copy(converted_file, new_item.cache_name, - onlyFilename(new_item.cache_name.absFilename()))) { - if (!changeMode(new_item.cache_name, 0600)) { + onlyFileName(new_item.cache_name.absFileName()))) { + if (!new_item.cache_name.changePermission(0600)) { LYXERR(Debug::FILES, "Could not change file mode" - << item->cache_name); + << new_item.cache_name); } FormatCache & format_cache = pimpl_->cache[orig_from]; if (format_cache.from_format.empty()) @@ -425,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; } @@ -439,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(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(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, - onlyFilename(dest.absFilename())); + onlyFileName(dest.absFileName())); } } // namespace lyx