#include "GraphicsCacheItem.h"
+#include "Buffer.h"
#include "GraphicsCache.h"
#include "GraphicsConverter.h"
#include "GraphicsImage.h"
#include "support/filetools.h"
#include "support/FileMonitor.h"
#include "support/lassert.h"
+#include "support/unique_ptr.h"
-#include "support/bind.h"
+#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.
+ * \return true if a conversion is necessary and no error occurred.
*/
bool tryDisplayFormat(FileName & filename, string & from);
/// 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.
- 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 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))
{}
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(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(); });
}
status_ = WaitingToLoad;
- 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();
}
-static string const findTargetFormat(string const & from)
-{
- typedef vector<string> FormatList;
- FormatList const & formats = Cache::get().loadableFormats();
+typedef vector<string> FormatList;
+static string const findTargetFormat(FormatList const & format_list, string const & from)
+{
// There must be a format to load from.
- LASSERT(!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;
return false;
}
- zipped_ = formats.isZippedFile(filename_);
+ zipped_ = theFormats().isZippedFile(filename_);
if (zipped_) {
- unzipped_filename_ = FileName::tempName(
- 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()) {
status_ = ErrorConverting;
LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
<< "\tAttempting to convert image file: " << filename
<< "\n\twith displayed filename: " << to_utf8(displayed_filename));
- from = formats.getFormatFromFile(filename);
+ from = theFormats().getFormatFromFile(filename);
if (from.empty()) {
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!
// 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 = FileName::tempName("CacheItem");
+ TempFile tempfile("CacheItem");
+ tempfile.setAutoRemove(false);
+ FileName const to_file_base = tempfile.name();
remove_loaded_file_ = true;
// 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(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