* src/LaTeX.C

[lyx.git] / src / graphics / GraphicsCacheItem.C

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 6ef2e65ff8f97e56111741bd1306f622c88b50a8..ac99adb2144a2a8eb97aec73c981485cec718260 100644 (file)
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -16,6 +16,7 @@
 #include "GraphicsConverter.h"
 #include "GraphicsImage.h"
 
+#include "ConverterCache.h"
 #include "debug.h"
 #include "format.h"
 
@@ -28,8 +29,8 @@
 
 namespace lyx {
 
-using support::changeExtension;
 using support::FileMonitor;
+using support::FileName;
 using support::isFileReadable;
 using support::makeDisplayPath;
 using support::onlyFilename;
@@ -48,7 +49,7 @@ class CacheItem::Impl : public boost::signals::trackable {
 public:
 
        ///
-       Impl(string const & file);
+       Impl(FileName const & file);
 
        /** Start the image conversion process, checking first that it is
         *  necessary. If it is necessary, then a conversion task is started.
@@ -100,16 +101,18 @@ public:
        void reset();
 
        /// The filename we refer too.
-       string const filename_;
+       FileName const filename_;
        ///
        FileMonitor const monitor_;
 
        /// Is the file compressed?
        bool zipped_;
        /// If so, store the uncompressed file in this temporary file.
-       string unzipped_filename_;
+       FileName unzipped_filename_;
+       /// The target format
+       string to_;
        /// What file are we trying to load?
-       string file_to_load_;
+       FileName file_to_load_;
        /** Should we delete the file after loading? True if the file is
         *  the result of a conversion process.
         */
@@ -134,7 +137,7 @@ public:
 };
 
 
-CacheItem::CacheItem(string const & file)
+CacheItem::CacheItem(FileName const & file)
        : pimpl_(new Impl(file))
 {}
 
@@ -143,7 +146,7 @@ CacheItem::~CacheItem()
 {}
 
 
-string const & CacheItem::filename() const
+FileName const & CacheItem::filename() const
 {
        return pimpl_->filename_;
 }
@@ -197,7 +200,7 @@ boost::signals::connection CacheItem::connect(slot_type const & slot) const
 //------------------------------
 
 
-CacheItem::Impl::Impl(string const & file)
+CacheItem::Impl::Impl(FileName const & file)
        : filename_(file),
          monitor_(file, 2000),
          zipped_(false),
@@ -228,6 +231,7 @@ void CacheItem::Impl::reset()
                unlink(file_to_load_);
        remove_loaded_file_ = false;
        file_to_load_.erase();
+       to_.erase();
 
        if (image_.get())
                image_.reset();
@@ -261,7 +265,7 @@ void CacheItem::Impl::imageConverted(bool success)
        lyxerr[Debug::GRAPHICS] << "Image conversion " << text << '.' << endl;
 
        file_to_load_ = converter_.get() ?
-               converter_->convertedFile() : string();
+               FileName(converter_->convertedFile()) : FileName();
        converter_.reset();
        cc_.disconnect();
 
@@ -278,6 +282,9 @@ void CacheItem::Impl::imageConverted(bool success)
                return;
        }
 
+       // Add the converted file to the file cache
+       ConverterCache::get().add(filename_, to_, file_to_load_);
+
        loadImage();
 }
 
@@ -375,21 +382,21 @@ void CacheItem::Impl::convertToDisplayFormat()
        }
 
        // Make a local copy in case we unzip it
-       string filename;
+       FileName filename;
        zipped_ = zippedFile(filename_);
        if (zipped_) {
-               unzipped_filename_ = tempName(string(), filename_);
+               unzipped_filename_ = tempName(FileName(), filename_.toFilesystemEncoding());
                if (unzipped_filename_.empty()) {
                        setStatus(ErrorConverting);
                        lyxerr[Debug::GRAPHICS]
                                << "\tCould not create temporary file." << endl;
                        return;
                }
-               filename = unzipFile(filename_, unzipped_filename_);
+               filename = unzipFile(filename_, unzipped_filename_.toFilesystemEncoding());
        } else
                filename = filename_;
 
-       docstring const displayed_filename = makeDisplayPath(filename_);
+       docstring const displayed_filename = makeDisplayPath(filename_.absFilename());
        lyxerr[Debug::GRAPHICS] << "[GrahicsCacheItem::convertToDisplayFormat]\n"
                << "\tAttempting to convert image file: " << filename
                << "\n\twith displayed filename: " << lyx::to_utf8(displayed_filename)
@@ -403,9 +410,9 @@ void CacheItem::Impl::convertToDisplayFormat()
        }
        lyxerr[Debug::GRAPHICS]
                << "\n\tThe file contains " << from << " format data." << endl;
-       string const to = findTargetFormat(from);
+       to_ = findTargetFormat(from);
 
-       if (from == to) {
+       if (from == to_) {
                // No conversion needed!
                lyxerr[Debug::GRAPHICS] << "\tNo conversion needed (from == to)!" << endl;
                file_to_load_ = filename;
@@ -413,11 +420,19 @@ void CacheItem::Impl::convertToDisplayFormat()
                return;
        }
 
-       lyxerr[Debug::GRAPHICS] << "\tConverting it to " << to << " format." << endl;
+       if (ConverterCache::get().inCache(filename, to_)) {
+               lyxerr[Debug::GRAPHICS] << "\tNo conversion needed (file in file cache)!"
+                                       << endl;
+               file_to_load_ = ConverterCache::get().cacheName(filename, to_);
+               loadImage();
+               return;
+       }
+
+       lyxerr[Debug::GRAPHICS] << "\tConverting it to " << to_ << " format." << endl;
 
        // Add some stuff to create a uniquely named temporary file.
        // This file is deleted in loadImage after it is loaded into memory.
-       string const to_file_base = tempName(string(), "CacheItem");
+       FileName const to_file_base(tempName(FileName(), "CacheItem"));
        remove_loaded_file_ = true;
 
        // Remove the temp file, we only want the name...
@@ -427,7 +442,7 @@ void CacheItem::Impl::convertToDisplayFormat()
        // Connect a signal to this->imageConverted and pass this signal to
        // the graphics converter so that we can load the modified file
        // on completion of the conversion process.
-       converter_.reset(new Converter(filename, to_file_base, from, to));
+       converter_.reset(new Converter(filename, to_file_base.absFilename(), from, to_));
        converter_->connect(boost::bind(&Impl::imageConverted, this, _1));
        converter_->startConversion();
 }