-/*
+/**
* \file FileMonitor.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * \author Angus Leeming <leeming@lyx.org>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "FileMonitor.h"
+#include "support/FileMonitor.h"
+#include "support/filename.h"
+#include "support/lyxlib.h"
+// FIXME Interface violation
#include "frontends/Timeout.h"
-#include "support/FileInfo.h"
-#include "support/lyxlib.h"
-
#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
#include <boost/signals/trackable.hpp>
-struct FileMonitor::Impl : public boost::signals::trackable {
+
+using std::string;
+
+namespace fs = boost::filesystem;
+
+namespace lyx {
+namespace support {
+
+class FileMonitor::Impl : public boost::signals::trackable {
+public:
///
- Impl(string const & file_with_path, int interval);
+ Impl(FileName const & file_with_path, int interval);
///
void monitorFile();
///
- string filename_;
+ FileName filename_;
///
Timeout timer_;
/// This signal is emitted if the file is modified (has a new checksum).
- boost::signal0<void> fileChanged_;
+ FileMonitor::FileChangedSig fileChanged_;
/** We use these to ascertain whether a file (once loaded successfully)
* has changed.
};
-FileMonitor::FileMonitor(string const & file_with_path, int interval)
+FileMonitor::FileMonitor(FileName const & file_with_path, int interval)
: pimpl_(new Impl(file_with_path, interval))
{}
{}
-void FileMonitor::reset(string const & file_with_path) const
+void FileMonitor::reset(FileName const & file_with_path) const
{
if (pimpl_->filename_ == file_with_path)
return;
bool const monitor = pimpl_->timer_.running();
if (monitor)
stop();
-
+
pimpl_->filename_ = file_with_path;
if (monitor)
}
-string const & FileMonitor::filename() const
+FileName const & FileMonitor::filename() const
{
return pimpl_->filename_;
}
if (monitoring())
return;
- FileInfo finfo(pimpl_->filename_);
- if (!finfo.isOK())
+ if (!fs::exists(pimpl_->filename_.toFilesystemEncoding()))
return;
- pimpl_->timestamp_ = finfo.getModificationTime();
- pimpl_->checksum_ = lyx::sum(pimpl_->filename_);
+ pimpl_->timestamp_ = fs::last_write_time(pimpl_->filename_.toFilesystemEncoding());
+ pimpl_->checksum_ = sum(pimpl_->filename_);
if (pimpl_->timestamp_ && pimpl_->checksum_) {
pimpl_->timer_.start();
// If we aren't actively monitoring the file, then recompute the
// checksum explicitly.
if (!pimpl_->timer_.running() && !pimpl_->filename_.empty())
- return lyx::sum(pimpl_->filename_);
+ return sum(pimpl_->filename_);
return pimpl_->checksum_;
}
//------------------------------
-FileMonitor::Impl::Impl(string const & file_with_path, int interval)
+FileMonitor::Impl::Impl(FileName const & file_with_path, int interval)
: filename_(file_with_path),
timer_(interval, Timeout::ONETIME),
timestamp_(0),
{
bool changed = false;
- FileInfo finfo(filename_);
- if (!finfo.isOK()) {
+ if (!fs::exists(filename_.toFilesystemEncoding())) {
changed = timestamp_ || checksum_;
timestamp_ = 0;
checksum_ = 0;
} else {
- time_t const new_timestamp = finfo.getModificationTime();
+ time_t const new_timestamp = fs::last_write_time(filename_.toFilesystemEncoding());
if (new_timestamp != timestamp_) {
timestamp_ = new_timestamp;
- unsigned long const new_checksum = lyx::sum(filename_);
+ unsigned long const new_checksum = sum(filename_);
if (new_checksum != checksum_) {
checksum_ = new_checksum;
changed = true;
if (changed)
fileChanged_();
}
+
+} // namespace support
+} // namespace lyx