* Licence details can be found in the file COPYING.
*
* \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
* \author Angus Leeming
*
* Full author contact details are available in file CREDITS.
#include <config.h>
#include "GraphicsCacheItem.h"
+
+#include "Buffer.h"
+#include "GraphicsCache.h"
#include "GraphicsConverter.h"
#include "GraphicsImage.h"
#include "ConverterCache.h"
-#include "support/debug.h"
#include "Format.h"
+#include "support/debug.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/FileMonitor.h"
-#include "support/lyxlib.h"
+#include "support/lassert.h"
+#include "support/unique_ptr.h"
-#include <boost/bind.hpp>
+#include "support/TempFile.h"
using namespace std;
using namespace lyx::support;
namespace graphics {
-class CacheItem::Impl : public boost::signals::trackable {
+class CacheItem::Impl {
public:
///
- Impl(FileName const & file);
+ Impl(FileName const & file, FileName const & doc_file);
+
+ void startMonitor();
+
+ /**
+ * If no file conversion is needed, then tryDisplayFormat() calls
+ * loadImage() directly.
+ * \return true if a conversion is necessary and no error occurred.
+ */
+ bool tryDisplayFormat(FileName & filename, string & from);
/** Start the image conversion process, checking first that it is
* necessary. If it is necessary, then a conversion task is started.
* is finished, this Signal is emitted, returning the converted
* file to this->imageConverted.
*
- * If no file conversion is needed, then convertToDisplayFormat() calls
- * loadImage() directly.
- *
* convertToDisplayFormat() will set the loading status flag as
* approriate through calls to setStatus().
*/
/** Load the image into memory. This is called either from
* convertToDisplayFormat() direct or from imageConverted().
*/
- void loadImage();
+ bool loadImage();
/** Get a notification when the image conversion is done.
* Connected to a signal on_finish_ which is passed to
*/
void imageConverted(bool);
- /** Get a notification when the image loading is done.
- * Connected to a signal on_finish_ which is passed to
- * lyx::graphics::Image::loadImage.
- */
- void imageLoaded(bool);
-
/** Sets the status of the loading process. Also notifies
* listeners that the status has changed.
*/
/// The filename we refer too.
FileName const filename_;
+ /// The document filename this graphic item belongs to
+ FileName const doc_file_;
///
- FileMonitor const monitor_;
+ ActiveFileMonitorPtr monitor_;
/// Is the file compressed?
bool zipped_;
bool remove_loaded_file_;
/// The image and its loading status.
- boost::shared_ptr<Image> image_;
+ std::shared_ptr<Image> image_;
///
ImageStatus status_;
/// This signal is emitted when the image loading status changes.
- boost::signal<void()> statusChanged;
-
- /// The connection to the signal Image::finishedLoading
- boost::signals::connection cl_;
-
- /// The connection of the signal ConvProcess::finishedConversion,
- boost::signals::connection cc_;
+ signals2::signal<void()> statusChanged;
///
- boost::scoped_ptr<Converter> converter_;
+ unique_ptr<Converter> converter_;
};
-CacheItem::CacheItem(FileName const & file)
- : pimpl_(new Impl(file))
+CacheItem::CacheItem(FileName const & file, FileName const & doc_file)
+ : pimpl_(new Impl(file,doc_file))
{}
}
+bool CacheItem::tryDisplayFormat() const
+{
+ if (pimpl_->status_ != WaitingToLoad)
+ pimpl_->reset();
+ FileName filename;
+ string from;
+ bool const conversion_needed = pimpl_->tryDisplayFormat(filename, from);
+ bool const success = status() == Loaded && !conversion_needed;
+ if (!success)
+ pimpl_->reset();
+ return success;
+}
+
+
void CacheItem::startLoading() const
{
pimpl_->startLoading();
void CacheItem::startMonitoring() const
{
- if (!pimpl_->monitor_.monitoring())
- pimpl_->monitor_.start();
+ pimpl_->startMonitor();
}
bool CacheItem::monitoring() const
{
- return pimpl_->monitor_.monitoring();
+ return (bool)pimpl_->monitor_;
}
-unsigned long CacheItem::checksum() const
+void CacheItem::checkModifiedAsync() const
{
- return pimpl_->monitor_.checksum();
+ if (!pimpl_->monitor_)
+ return;
+ pimpl_->monitor_->checkModifiedAsync();
}
}
-boost::signals::connection CacheItem::connect(slot_type const & slot) const
+signals2::connection CacheItem::connect(slot_type const & slot) const
{
return pimpl_->statusChanged.connect(slot);
}
//------------------------------
-CacheItem::Impl::Impl(FileName const & file)
- : filename_(file),
- monitor_(file, 2000),
+CacheItem::Impl::Impl(FileName const & file, FileName const & doc_file)
+ : filename_(file), doc_file_(doc_file),
zipped_(false),
remove_loaded_file_(false),
status_(WaitingToLoad)
+{}
+
+
+void CacheItem::Impl::startMonitor()
{
- monitor_.connect(boost::bind(&Impl::startLoading, this));
+ if (monitor_)
+ return;
+ monitor_ = FileSystemWatcher::activeMonitor(filename_);
+ // Disconnected at the same time as this is destroyed.
+ monitor_->connect([=](bool /* exists */){ startLoading(); });
}
file_to_load_.erase();
to_.erase();
- if (image_.get())
+ if (image_)
image_.reset();
status_ = WaitingToLoad;
- if (cl_.connected())
- cl_.disconnect();
-
- if (cc_.connected())
- cc_.disconnect();
-
- if (converter_.get())
+ if (converter_)
converter_.reset();
}
string const text = success ? "succeeded" : "failed";
LYXERR(Debug::GRAPHICS, "Image conversion " << text << '.');
- file_to_load_ = converter_.get() ?
- FileName(converter_->convertedFile()) : FileName();
+ file_to_load_ = converter_ ? FileName(converter_->convertedFile())
+ : FileName();
converter_.reset();
- cc_.disconnect();
success = !file_to_load_.empty() && file_to_load_.isReadableFile();
// Add the converted file to the file cache
ConverterCache::get().add(filename_, to_, file_to_load_);
- loadImage();
+ setStatus(loadImage() ? Loaded : ErrorLoading);
}
// This function gets called from the callback after the image has been
// converted successfully.
-void CacheItem::Impl::loadImage()
+bool CacheItem::Impl::loadImage()
{
- setStatus(Loading);
LYXERR(Debug::GRAPHICS, "Loading image.");
- image_.reset(Image::newImage());
-
- cl_.disconnect();
- cl_ = image_->finishedLoading.connect(
- boost::bind(&Impl::imageLoaded, this, _1));
- image_->load(file_to_load_);
-}
-
+ image_.reset(newImage());
-void CacheItem::Impl::imageLoaded(bool success)
-{
+ bool success = image_->load(file_to_load_);
string const text = success ? "succeeded" : "failed";
LYXERR(Debug::GRAPHICS, "Image loading " << text << '.');
if (remove_loaded_file_ && unzipped_filename_ != file_to_load_)
file_to_load_.removeFile();
- cl_.disconnect();
-
- if (!success) {
- setStatus(ErrorLoading);
- return;
- }
-
- // Inform the outside world.
- setStatus(Loaded);
+ return success;
}
-static string const findTargetFormat(string const & from)
-{
- typedef lyx::graphics::Image::FormatList FormatList;
- FormatList const formats = lyx::graphics::Image::loadableFormats();
+typedef vector<string> FormatList;
+static string const findTargetFormat(FormatList const & format_list, string const & from)
+{
// There must be a format to load from.
- BOOST_ASSERT(!formats.empty());
+ LASSERT(!theFormats().empty(), return string());
// Use the standard converter if we don't know the format to load
// from.
return string("ppm");
// First ascertain if we can load directly with no conversion
- FormatList::const_iterator it = formats.begin();
- FormatList::const_iterator end = formats.end();
+ FormatList::const_iterator it = format_list.begin();
+ FormatList::const_iterator end = format_list.end();
for (; it != end; ++it) {
if (from == *it)
return *it;
}
// So, we have to convert to a loadable format. Can we?
- it = formats.begin();
+ it = format_list.begin();
for (; it != end; ++it) {
if (lyx::graphics::Converter::isReachable(from, *it))
return *it;
}
-void CacheItem::Impl::convertToDisplayFormat()
+bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
{
- setStatus(Converting);
-
// First, check that the file exists!
+ filename_.refresh();
if (!filename_.isReadableFile()) {
if (status_ != ErrorNoFile) {
- setStatus(ErrorNoFile);
+ status_ = ErrorNoFile;
LYXERR(Debug::GRAPHICS, "\tThe file is not readable");
}
- return;
+ return false;
}
- // Make a local copy in case we unzip it
- FileName filename;
- zipped_ = filename_.isZippedFile();
+ zipped_ = theFormats().isZippedFile(filename_);
if (zipped_) {
- unzipped_filename_ = tempName(FileName(), filename_.toFilesystemEncoding());
+ string tempname = unzippedFileName(filename_.toFilesystemEncoding());
+ string const ext = getExtension(tempname);
+ tempname = changeExtension(tempname, "") + "-XXXXXX";
+ if (!ext.empty())
+ tempname = addExtension(tempname, ext);
+ TempFile tempfile(tempname);
+ tempfile.setAutoRemove(false);
+ unzipped_filename_ = tempfile.name();
if (unzipped_filename_.empty()) {
- setStatus(ErrorConverting);
+ status_ = ErrorConverting;
LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
- return;
+ return false;
}
filename = unzipFile(filename_, unzipped_filename_.toFilesystemEncoding());
} else {
filename = filename_;
}
- docstring const displayed_filename = makeDisplayPath(filename_.absFilename());
+ docstring const displayed_filename = makeDisplayPath(filename_.absFileName());
LYXERR(Debug::GRAPHICS, "[CacheItem::Impl::convertToDisplayFormat]\n"
<< "\tAttempting to convert image file: " << filename
<< "\n\twith displayed filename: " << to_utf8(displayed_filename));
- string const from = formats.getFormatFromFile(filename);
+ from = theFormats().getFormatFromFile(filename);
if (from.empty()) {
- setStatus(ErrorConverting);
+ status_ = ErrorConverting;
LYXERR(Debug::GRAPHICS, "\tCould not determine file format.");
}
LYXERR(Debug::GRAPHICS, "\n\tThe file contains " << from << " format data.");
- to_ = findTargetFormat(from);
+ to_ = findTargetFormat(Cache::get().loadableFormats(), from);
if (from == to_) {
// No conversion needed!
LYXERR(Debug::GRAPHICS, "\tNo conversion needed (from == to)!");
file_to_load_ = filename;
- loadImage();
- return;
+ status_ = loadImage() ? Loaded : ErrorLoading;
+ return false;
}
if (ConverterCache::get().inCache(filename, to_)) {
LYXERR(Debug::GRAPHICS, "\tNo conversion needed (file in file cache)!");
file_to_load_ = ConverterCache::get().cacheName(filename, to_);
- loadImage();
- return;
+ status_ = loadImage() ? Loaded : ErrorLoading;
+ return false;
}
+ return true;
+}
+
+void CacheItem::Impl::convertToDisplayFormat()
+{
LYXERR(Debug::GRAPHICS, "\tConverting it to " << to_ << " format.");
+ // Make a local copy in case we unzip it
+ FileName filename;
+ string from;
+ if (!tryDisplayFormat(filename, from)) {
+ // The image status has changed, tell it to the outside world.
+ statusChanged();
+ return;
+ }
+
+ // We will need a conversion, tell it to the outside world.
+ setStatus(Converting);
+
// Add some stuff to create a uniquely named temporary file.
// This file is deleted in loadImage after it is loaded into memory.
- FileName const to_file_base(tempName(FileName(), "CacheItem"));
+ TempFile tempfile("CacheItem");
+ tempfile.setAutoRemove(false);
+ FileName const to_file_base = tempfile.name();
remove_loaded_file_ = true;
- // Remove the temp file, we only want the name...
- // FIXME: This is unsafe!
- to_file_base.removeFile();
-
// 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.absFilename(), from, to_));
- converter_->connect(boost::bind(&Impl::imageConverted, this, _1));
+ converter_ = make_unique<Converter>(doc_file_, filename,
+ to_file_base.absFileName(),
+ from, to_);
+ // Connection is closed at the same time as *this is destroyed.
+ converter_->connect([this](bool success){
+ imageConverted(success);
+ });
converter_->startConversion();
}
projects / lyx.git / blobdiff