// -*- C++ -*-
/**
- * \file EmbeddedFiles.cpp
+ * \file EmbeddedFileList.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
#include <config.h>
#include "EmbeddedFiles.h"
+
#include "Buffer.h"
#include "BufferParams.h"
-#include "Paragraph.h"
-#include "InsetIterator.h"
-#include "debug.h"
-#include "gettext.h"
+#include "ErrorList.h"
#include "Format.h"
+#include "InsetIterator.h"
+#include "Lexer.h"
+#include "LyX.h"
+#include "Paragraph.h"
+#include "Session.h"
#include "frontends/alert.h"
-#include <boost/filesystem/operations.hpp>
-
+#include "support/debug.h"
#include "support/filetools.h"
-#include "support/fs_extras.h"
+#include "support/gettext.h"
#include "support/convert.h"
-#include "support/lyxlib.h"
#include "support/lstrings.h"
-
-#include "LyX.h"
-#include "Session.h"
+#include "support/ExceptionMessage.h"
+#include "support/FileZipListDir.h"
#include <sstream>
#include <fstream>
#include <utility>
-using std::ofstream;
-using std::endl;
-using std::vector;
-using std::string;
-using std::pair;
-using std::make_pair;
-using std::istream;
-using std::ostream;
-using std::getline;
-using std::istringstream;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-namespace fs = boost::filesystem;
namespace Alert = frontend::Alert;
-using support::FileName;
-using support::DocFileName;
-using support::makeAbsPath;
-using support::addName;
-using support::onlyPath;
-using support::absolutePath;
-using support::onlyFilename;
-using support::makeRelPath;
-using support::changeExtension;
-using support::bformat;
-using support::prefixIs;
-using support::sum;
-using support::makedir;
-
-
-EmbeddedFile::EmbeddedFile(string const & file, string const & inzip_name,
- bool embed, Inset const * inset)
- : DocFileName(file, true), inzip_name_(inzip_name), embedded_(embed),
- valid_(true), inset_list_()
+EmbeddedFile::EmbeddedFile(string const & file, std::string const & buffer_path)
+ : DocFileName("", false), inzip_name_(""), embedded_(false), inset_list_(),
+ temp_path_("")
{
- if (inset != NULL)
- inset_list_.push_back(inset);
+ set(file, buffer_path);
}
-string EmbeddedFile::embeddedFile(Buffer const * buf) const
+void EmbeddedFile::set(std::string const & filename, std::string const & buffer_path)
{
- return addName(buf->temppath(), inzip_name_);
+ DocFileName::set(filename, buffer_path);
+ if (filename.empty())
+ return;
+
+ inzip_name_ = calcInzipName(buffer_path);
}
-void EmbeddedFile::addInset(Inset const * inset)
+void EmbeddedFile::setInzipName(std::string const & name)
{
- inset_list_.push_back(inset);
+ if (name.empty() || name == inzip_name_)
+ return;
+
+ // an enabled EmbeededFile should have this problem handled
+ BOOST_ASSERT(!enabled());
+ // file will be synced when it is enabled
+ inzip_name_ = name;
}
-Inset const * EmbeddedFile::inset(int idx) const
+string EmbeddedFile::embeddedFile() const
{
- BOOST_ASSERT(idx < refCount());
- // some embedded file do not have a valid par iterator
- return inset_list_[idx];
+ BOOST_ASSERT(enabled());
+ return temp_path_ + inzip_name_;
}
-void EmbeddedFile::saveBookmark(Buffer const * buf, int idx) const
+FileName EmbeddedFile::availableFile() const
{
- Inset const * ptr = inset(idx);
- // This might not be the most efficient method ...
- for (InsetIterator it = inset_iterator_begin(buf->inset()); it; ++it)
- if (&(*it) == ptr) {
- // this is basically BufferView::saveBookmark(0)
- LyX::ref().session().bookmarks().save(
- FileName(buf->fileName()),
- it.bottom().pit(),
- it.bottom().pos(),
- it.paragraph().id(),
- it.pos(),
- 0
- );
- }
- // this inset can not be located. There is something wrong that needs
- // to be fixed.
- BOOST_ASSERT(true);
+ if (enabled() && embedded())
+ return FileName(embeddedFile());
+ else
+ return *this;
}
-string EmbeddedFile::availableFile(Buffer const * buf) const
+string EmbeddedFile::latexFilename(std::string const & buffer_path) const
{
- if (embedded())
- return embeddedFile(buf);
- else
- return absFilename();
+ return (enabled() && embedded()) ? inzip_name_ : relFilename(buffer_path);
+}
+
+
+void EmbeddedFile::addInset(Inset const * inset)
+{
+ if (inset != NULL)
+ inset_list_.push_back(inset);
+}
+
+
+void EmbeddedFile::setEmbed(bool embed)
+{
+ embedded_ = embed;
}
-void EmbeddedFile::invalidate()
+void EmbeddedFile::enable(bool flag, Buffer const * buf)
{
- // Clear inset_list_ because they will be registered again.
- inset_list_.clear();
- valid_ = false;
+ if (enabled() == flag)
+ return;
+
+ if (flag) {
+ temp_path_ = buf->temppath();
+ if (!suffixIs(temp_path_, '/'))
+ temp_path_ += '/';
+ if (embedded()) {
+ if (inzip_name_ != calcInzipName(buf->filePath()))
+ syncInzipFile(buf->filePath());
+ updateFromExternalFile();
+ } else
+ extract();
+ } else {
+ extract();
+ temp_path_ = "";
+ }
}
-bool EmbeddedFile::extract(Buffer const * buf) const
+bool EmbeddedFile::extract() const
{
+ BOOST_ASSERT(enabled());
string ext_file = absFilename();
- string emb_file = embeddedFile(buf);
+ string emb_file = embeddedFile();
- if (!fs::exists(emb_file))
- return false;
+ FileName emb(emb_file);
+ FileName ext(ext_file);
+
+ if (!emb.exists()) {
+ if (ext.exists())
+ return true;
+ else
+ throw ExceptionMessage(ErrorException, _("Failed to extract file"),
+ bformat(_("Cannot extract file '%1$s'.\n"
+ "Source file %2$s does not exist"),
+ from_utf8(outputFilename()), from_utf8(emb_file)));
+ }
// if external file already exists ...
- if (fs::exists(ext_file)) {
+ if (ext.exists()) {
// no need to copy if the files are the same
- if (sum(*this) == sum(FileName(emb_file)))
+ if (checksum() == FileName(emb_file).checksum())
return true;
// otherwise, ask if overwrite
int ret = Alert::prompt(
return true;
}
// copy file
- try {
- // need to make directory?
- string path = onlyPath(ext_file);
- if (!fs::is_directory(path))
- makedir(const_cast<char*>(path.c_str()), 0755);
- fs::copy_file(emb_file, ext_file, false);
+
+ // need to make directory?
+ FileName path = ext.onlyPath();
+ if (!path.createPath()) {
+ throw ExceptionMessage(ErrorException, _("Copy file failure"),
+ bformat(_("Cannot create file path '%1$s'.\n"
+ "Please check whether the path is writeable."),
+ from_utf8(path.absFilename())));
+ return false;
+ }
+
+ if (emb.copyTo(ext)) {
+ LYXERR(Debug::FILES, "Extract file " << emb_file << " to " << ext_file << endl);
return true;
- } catch (fs::filesystem_error const & fe) {
- Alert::error(_("Copy file failure"),
- bformat(_("Cannot copy file %1$s to %2$s.\n"
- "Please check whether the directory exists and is writeable."),
- from_utf8(emb_file), from_utf8(ext_file)));
- LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
}
+
+ throw ExceptionMessage(ErrorException, _("Copy file failure"),
+ bformat(_("Cannot copy file %1$s to %2$s.\n"
+ "Please check whether the directory exists and is writeable."),
+ from_utf8(emb_file), from_utf8(ext_file)));
return false;
}
-bool EmbeddedFile::updateFromExternalFile(Buffer const * buf) const
+bool EmbeddedFile::updateFromExternalFile() const
{
+ BOOST_ASSERT(enabled());
+
string ext_file = absFilename();
- string emb_file = embeddedFile(buf);
+ string emb_file = embeddedFile();
+
+ FileName emb(emb_file);
+ FileName ext(ext_file);
+
+ if (!ext.exists()) {
+ // no need to update
+ if (emb.exists())
+ return true;
+ // no external and internal file
+ throw ExceptionMessage(ErrorException,
+ _("Failed to embed file"),
+ bformat(_("Failed to embed file %1$s.\n"
+ "Please check whether this file exists and is readable."),
+ from_utf8(ext_file)));
+ }
- if (!fs::exists(ext_file))
- return false;
-
// if embedded file already exists ...
- if (fs::exists(emb_file)) {
+ if (emb.exists()) {
// no need to copy if the files are the same
- if (sum(*this) == sum(FileName(emb_file)))
+ if (checksum() == FileName(emb_file).checksum())
return true;
// other wise, ask if overwrite
int const ret = Alert::prompt(
_("Update embedded file?"),
- bformat(_("Embeddedl file %1$s already exists, do you want to overwrite it"),
+ bformat(_("Embedded file %1$s already exists, do you want to overwrite it"),
from_utf8(ext_file)), 1, 1, _("&Overwrite"), _("&Cancel"));
if (ret != 0)
// if the user does not want to overwrite, we still consider it
return true;
}
// copy file
- try {
- // need to make directory?
- string path = onlyPath(emb_file);
- if (!fs::is_directory(path))
- makedir(const_cast<char*>(path.c_str()), 0755);
- fs::copy_file(ext_file, emb_file, false);
+ // need to make directory?
+ FileName path = emb.onlyPath();
+ if (!path.isDirectory())
+ path.createPath();
+ if (ext.copyTo(emb))
return true;
- } catch (fs::filesystem_error const & fe) {
- Alert::error(_("Copy file failure"),
- bformat(_("Cannot copy file %1$s to %2$s.\n"
- "Please check whether the directory exists and is writeable."),
- from_utf8(ext_file), from_utf8(emb_file)));
- LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
- }
+ throw ExceptionMessage(ErrorException,
+ _("Copy file failure"),
+ bformat(_("Cannot copy file %1$s to %2$s.\n"
+ "Please check whether the directory exists and is writeable."),
+ from_utf8(ext_file), from_utf8(emb_file)));
+ //LYXERR(Debug::DEBUG, "Fs error: " << fe.what());
return false;
}
-bool EmbeddedFiles::enabled() const
+void EmbeddedFile::updateInsets(Buffer const * buf) const
{
- return buffer_->params().embedded;
+ vector<Inset const *>::const_iterator it = inset_list_.begin();
+ vector<Inset const *>::const_iterator it_end = inset_list_.end();
+ for (; it != it_end; ++it)
+ const_cast<Inset *>(*it)->updateEmbeddedFile(*buf, *this);
}
-bool EmbeddedFiles::enable(bool flag)
+bool EmbeddedFile::isReadableFile() const
{
- if (enabled() != flag) {
- // if enable, copy all files to temppath()
- // if disable, extract all files
- if ((flag && !updateFromExternalFile()) || (!flag && !extract()))
- return false;
- // if operation is successful
- buffer_->markDirty();
- buffer_->params().embedded = flag;
- }
+ return availableFile().isReadableFile();
}
-void EmbeddedFiles::registerFile(string const & filename,
- bool embed, Inset const * inset)
+unsigned long EmbeddedFile::checksum() const
{
- // filename can be relative or absolute, translate to absolute filename
- string abs_filename = makeAbsPath(filename, buffer_->filePath()).absFilename();
- // try to find this file from the list
- EmbeddedFileList::iterator it = file_list_.begin();
- EmbeddedFileList::iterator it_end = file_list_.end();
- for (; it != it_end; ++it)
- if (it->absFilename() == abs_filename || it->embeddedFile(buffer_) == abs_filename)
- break;
- // find this filename, keep the original embedding status
- if (it != file_list_.end()) {
- it->addInset(inset);
- // if the file is embedded, the embedded file should have exist
- // check for this to ensure that our logic is correct
- if (it->embedded())
- BOOST_ASSERT(fs::exists(it->embeddedFile(buffer_)));
- it->validate();
- return;
- }
- // try to be more careful
- file_list_.push_back(EmbeddedFile(abs_filename,
- getInzipName(abs_filename), embed, inset));
- // validate if things are OK
- BOOST_ASSERT(fs::exists(file_list_.back().availableFile(buffer_)));
+ return availableFile().checksum();
}
+/**
+Under the lyx temp directory, content.lyx and its embedded files are usually
+saved as
-void EmbeddedFiles::update()
-{
- // invalidate all files, obsolete files will then not be validated by the
- // following document scan. These files will still be kept though, because
- // they may be added later and their embedding status will be meaningful
- // again (thinking of cut/paste of an InsetInclude).
- EmbeddedFileList::iterator it = file_list_.begin();
- EmbeddedFileList::iterator it_end = file_list_.end();
- for (; it != it_end; ++it)
- // we do not update items that are manually inserted
- if (it->refCount() > 0)
- it->invalidate();
+$temp/$embDirName/file.lyx
+$temp/$embDirName/figure1.png for ./figure1.png)
+$temp/$embDirName/sub/figure2.png for ./sub/figure2.png)
+
+This works fine for embedded files that are in the current or deeper directory
+of the document directory, but not for files such as ../figures/figure.png.
+A unique name $upDirName is chosen to represent .. in such filenames so that
+'up' directories can be stored 'down' the directory tree:
+
+$temp/$embDirName/$upDirName/figures/figure.png for ../figures/figure.png
+$temp/$embDirName/$upDirName/$upDirName/figure.png for ../../figure.png
+
+This name has to be fixed because it is used in lyx bundled .zip file.
+
+Using a similar trick, we use $absDirName for absolute path so that
+an absolute filename can be saved as
- for (InsetIterator it = inset_iterator_begin(buffer_->inset()); it; ++it)
- it->registerEmbeddedFiles(*buffer_, *this);
+$temp/$embDirName/$absDirName/a/absolute/path for /a/absolute/path
- LYXERR(Debug::FILES) << "Manifest updated: " << endl
- << *this
- << "End Manifest" << endl;
+*/
+const std::string embDirName = "LyX.Embedded.Files";
+const std::string upDirName = "LyX.Embed.Dir.Up";
+const std::string absDirName = "LyX.Embed.Dir.Abs";
+const std::string driveName = "LyX.Embed.Drive";
+const std::string spaceName = "LyX.Embed.Space";
+
+std::string EmbeddedFile::calcInzipName(std::string const & buffer_path)
+{
+ string inzipName = to_utf8(makeRelPath(from_utf8(absFilename()),
+ from_utf8(buffer_path)));
+
+ if (FileName(inzipName).isAbsolute())
+ inzipName = absDirName + '/' + inzipName;
+
+ // replace .. by upDirName
+ if (prefixIs(inzipName, "."))
+ inzipName = subst(inzipName, "..", upDirName);
+ // replace special characters by their value
+ inzipName = subst(inzipName, ":", driveName);
+ inzipName = subst(inzipName, " ", spaceName);
+
+ // to avoid name conflict between $docu_path/file and $temp_path/file
+ // embedded files are in a subdirectory of $temp_path.
+ inzipName = embDirName + '/' + inzipName;
+ return inzipName;
}
-bool EmbeddedFiles::write(DocFileName const & filename)
+void EmbeddedFile::syncInzipFile(std::string const & buffer_path)
{
- // file in the temporary path has the content
- string const content = FileName(addName(buffer_->temppath(),
- onlyFilename(filename.toFilesystemEncoding()))).toFilesystemEncoding();
+ BOOST_ASSERT(enabled());
+ string old_emb_file = temp_path_ + '/' + inzip_name_;
+ FileName old_emb(old_emb_file);
- // get a file list and write a manifest file
- vector<pair<string, string> > filenames;
- string const manifest = FileName(
- addName(buffer_->temppath(), "manifest.txt")).toFilesystemEncoding();
+ LYXERR(Debug::FILES, " OLD ZIP " << old_emb_file <<
+ " NEW ZIP " << calcInzipName(buffer_path));
- // write a manifest file
- ofstream os(manifest.c_str());
- os << *this;
- os.close();
- // prepare list of embedded file
- EmbeddedFileList::iterator it = file_list_.begin();
- EmbeddedFileList::iterator it_end = file_list_.end();
- for (; it != it_end; ++it) {
- if (it->valid() && it->embedded()) {
- string file = it->availableFile(buffer_);
- if (file.empty())
- lyxerr << "File " << it->absFilename() << " does not exist. Skip embedding it. " << endl;
- else
- filenames.push_back(make_pair(file, it->inzipName()));
- }
+ //BOOST_ASSERT(old_emb.exists());
+
+ string new_inzip_name = calcInzipName(buffer_path);
+ string new_emb_file = temp_path_ + '/' + new_inzip_name;
+ FileName new_emb(new_emb_file);
+
+ // need to make directory?
+ FileName path = new_emb.onlyPath();
+ if (!path.createPath()) {
+ throw ExceptionMessage(ErrorException, _("Sync file failure"),
+ bformat(_("Cannot create file path '%1$s'.\n"
+ "Please check whether the path is writeable."),
+ from_utf8(path.absFilename())));
+ return;
}
- // add filename (.lyx) and manifest to filenames
- filenames.push_back(make_pair(content, onlyFilename(filename.toFilesystemEncoding())));
- filenames.push_back(make_pair(manifest, "manifest.txt"));
- // write a zip file with all these files. Write to a temp file first, to
- // avoid messing up the original file in case something goes terribly wrong.
- DocFileName zipfile(addName(buffer_->temppath(),
- onlyFilename(changeExtension(
- filename.toFilesystemEncoding(), ".zip"))));
- ::zipFiles(zipfile.toFilesystemEncoding(), filenames);
- // copy file back
- try {
- fs::copy_file(zipfile.toFilesystemEncoding(), filename.toFilesystemEncoding(), false);
- } catch (fs::filesystem_error const & fe) {
- Alert::error(_("Save failure"),
- bformat(_("Cannot create file %1$s.\n"
- "Please check whether the directory exists and is writeable."),
- from_utf8(filename.absFilename())));
- LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
+ if (old_emb.copyTo(new_emb)) {
+ LYXERR(Debug::FILES, "Sync inzip file from " << inzip_name_
+ << " to " << new_inzip_name);
+ inzip_name_ = new_inzip_name;
+ return;
}
- return true;
+ throw ExceptionMessage(ErrorException, _("Sync file failure"),
+ bformat(_("Cannot copy file %1$s to %2$s.\n"
+ "Please check whether the directory exists and is writeable."),
+ from_utf8(old_emb_file), from_utf8(new_emb_file)));
}
-EmbeddedFiles::EmbeddedFileList::const_iterator EmbeddedFiles::find(std::string filename) const
+bool operator==(EmbeddedFile const & lhs, EmbeddedFile const & rhs)
{
- EmbeddedFileList::const_iterator it = file_list_.begin();
- EmbeddedFileList::const_iterator it_end = file_list_.end();
- for (; it != it_end; ++it)
- if (it->absFilename() == filename || it->embeddedFile(buffer_) == filename)
- return it;
- return file_list_.end();
+ return lhs.absFilename() == rhs.absFilename()
+ && lhs.saveAbsPath() == rhs.saveAbsPath()
+ && lhs.embedded() == rhs.embedded();
}
-bool EmbeddedFiles::extract() const
+bool operator!=(EmbeddedFile const & lhs, EmbeddedFile const & rhs)
{
- EmbeddedFileList::const_iterator it = file_list_.begin();
- EmbeddedFileList::const_iterator it_end = file_list_.end();
- for (; it != it_end; ++it)
- if (it->valid() && it->embedded())
- if(!it->extract(buffer_))
- return false;
- return true;
+ return !(lhs == rhs);
}
-bool EmbeddedFiles::updateFromExternalFile() const
+void EmbeddedFileList::enable(bool flag, Buffer & buffer)
{
- EmbeddedFileList::const_iterator it = file_list_.begin();
- EmbeddedFileList::const_iterator it_end = file_list_.end();
- for (; it != it_end; ++it)
- if (it->valid() && it->embedded())
- if (!it->updateFromExternalFile(buffer_))
- return false;
- return true;
+ if (buffer.embedded() == flag)
+ return;
+
+ // update embedded file list
+ update(buffer);
+
+ int count_embedded = 0;
+ int count_external = 0;
+ std::vector<EmbeddedFile>::iterator it = begin();
+ std::vector<EmbeddedFile>::iterator it_end = end();
+ // an exception may be thrown
+ for (; it != it_end; ++it) {
+ it->enable(flag, &buffer);
+ if (it->embedded())
+ count_embedded ++;
+ else
+ count_external ++;
+ }
+ // if operation is successful (no exception is thrown)
+ buffer.markDirty();
+ buffer.params().embedded = flag;
+
+ // if the operation is successful, update insets
+ for (it = begin(); it != it_end; ++it)
+ it->updateInsets(&buffer);
+
+ // show result
+ if (flag) {
+ docstring const msg = bformat(_("%1$d external files are ignored.\n"
+ "%2$d embeddable files are embedded.\n"), count_external, count_embedded);
+ Alert::information(_("Packing all files"), msg);
+ } else {
+ docstring const msg = bformat(_("%1$d external files are ignored.\n"
+ "%2$d embedded files are extracted.\n"), count_external, count_embedded);
+ Alert::information(_("Unpacking all files"), msg);
+ }
}
-string const EmbeddedFiles::getInzipName(string const & abs_filename)
+void EmbeddedFileList::registerFile(EmbeddedFile const & file,
+ Inset const * inset, Buffer const & buffer)
{
- // register a new one, using relative file path as inzip_name
- string inzip_name = to_utf8(makeRelPath(from_utf8(abs_filename),
- from_utf8(buffer_->fileName())));
- // if inzip_name is an absolute path, use filename only to avoid
- // leaking of filesystem information in inzip_name
- // The second case covers cases '../path/file' and '.'
- if (absolutePath(inzip_name) || prefixIs(inzip_name, "."))
- inzip_name = onlyFilename(abs_filename);
- // if this name has been used...
- // use _1_name, _2_name etc
- string tmp = inzip_name;
- EmbeddedFileList::iterator it;
- EmbeddedFileList::iterator it_end = file_list_.end();
- bool unique_name = false;
- size_t i = 0;
- while (!unique_name) {
- unique_name = true;
- if (i > 0)
- inzip_name = convert<string>(i) + "_" + tmp;
- it = file_list_.begin();
- for (; it != it_end; ++it)
- if (it->inzipName() == inzip_name) {
- unique_name = false;
- ++i;
- break;
+ BOOST_ASSERT(!buffer.embedded() || file.availableFile().exists());
+ BOOST_ASSERT(!buffer.embedded() || file.enabled());
+
+ // try to find this file from the list
+ std::vector<EmbeddedFile>::iterator it = begin();
+ std::vector<EmbeddedFile>::iterator it_end = end();
+ for (; it != it_end; ++it)
+ if (it->absFilename() == file.absFilename()) {
+ if (it->embedded() != file.embedded()) {
+ Alert::error(_("Wrong embedding status."),
+ bformat(_("File %1$s is included in more than one insets, "
+ "but with different embedding status. Assuming embedding status."),
+ from_utf8(it->outputFilename())));
+ it->setEmbed(true);
+ // update the inset with this embedding status.
+ const_cast<Inset*>(inset)->updateEmbeddedFile(buffer, *it);
}
- }
- return inzip_name;
+ it->addInset(inset);
+ return;
+ }
+ //
+ push_back(file);
+ back().addInset(inset);
}
-istream & operator>> (istream & is, EmbeddedFiles & files)
+void EmbeddedFileList::update(Buffer const & buffer)
{
- files.clear();
- string tmp;
- getline(is, tmp);
- // get version
- istringstream itmp(tmp);
- int version;
- itmp.ignore(string("# LyX manifest version ").size());
- itmp >> version;
-
- if (version != 1) {
- lyxerr << "This version of LyX can only read LyX manifest version 1" << endl;
- return is;
- }
-
- getline(is, tmp);
- if (tmp != "<manifest>") {
- lyxerr << "Invalid manifest file, lacking <manifest>" << endl;
- return is;
- }
- // manifest file may be messed up, be carefully
- while (is.good()) {
- getline(is, tmp);
- if (tmp != "<file>")
- break;
-
- string fname;
- getline(is, fname);
- string inzip_name;
- getline(is, inzip_name);
- getline(is, tmp);
- istringstream itmp(tmp);
- int embed;
- itmp >> embed;
-
- getline(is, tmp);
- if (tmp != "</file>") {
- lyxerr << "Invalid manifest file, lacking </file>" << endl;
- break;
- }
+ clear();
- files.registerFile(fname, embed);
- };
- // the last line must be </manifest>
- if (tmp != "</manifest>") {
- lyxerr << "Invalid manifest file, lacking </manifest>" << endl;
- return is;
- }
- return is;
+ for (InsetIterator it = inset_iterator_begin(buffer.inset()); it; ++it)
+ it->registerEmbeddedFiles(buffer, *this);
}
-ostream & operator<< (ostream & os, EmbeddedFiles const & files)
+bool EmbeddedFileList::writeFile(DocFileName const & filename, Buffer const & buffer)
{
- // store a version so that operator >> can read later versions
- // using version information.
- os << "# lyx manifest version 1\n";
- os << "<manifest>\n";
- EmbeddedFiles::EmbeddedFileList::const_iterator it = files.begin();
- EmbeddedFiles::EmbeddedFileList::const_iterator it_end = files.end();
+ // file in the temporary path has the content
+ string const content = FileName(addName(buffer.temppath(),
+ "content.lyx")).toFilesystemEncoding();
+
+ vector<pair<string, string> > filenames;
+ // add content.lyx to filenames
+ filenames.push_back(make_pair(content, "content.lyx"));
+ // prepare list of embedded file
+ update(buffer);
+ std::vector<EmbeddedFile>::iterator it = begin();
+ std::vector<EmbeddedFile>::iterator it_end = end();
for (; it != it_end; ++it) {
- if (!it->valid())
- continue;
- // use differnt lines to make reading easier.
- os << "<file>\n"
- // save the relative path
- << to_utf8(makeRelPath(from_utf8(it->absFilename()),
- from_utf8(files.buffer_->filePath()))) << '\n'
- << it->inzipName() << '\n'
- << it->embedded() << '\n'
- << "</file>\n";
+ if (it->embedded()) {
+ string file = it->embeddedFile();
+ if (!FileName(file).exists())
+ throw ExceptionMessage(ErrorException, _("Failed to write file"),
+ bformat(_("Embedded file %1$s does not exist. Did you tamper lyx temporary directory?"),
+ it->displayName()));
+ filenames.push_back(make_pair(file, it->inzipName()));
+ LYXERR(Debug::FILES, "Writing file " << it->outputFilename()
+ << " as " << it->inzipName() << endl);
+ }
+ }
+ // write a zip file with all these files. Write to a temp file first, to
+ // avoid messing up the original file in case something goes terribly wrong.
+ DocFileName zipfile(addName(buffer.temppath(),
+ onlyFilename(changeExtension(
+ filename.toFilesystemEncoding(), ".zip"))));
+
+ ::zipFiles(zipfile.toFilesystemEncoding(), filenames);
+ // copy file back
+ if (!zipfile.copyTo(filename)) {
+ Alert::error(_("Save failure"),
+ bformat(_("Cannot create file %1$s.\n"
+ "Please check whether the directory exists and is writeable."),
+ from_utf8(filename.absFilename())));
+ //LYXERR(Debug::DEBUG, "Fs error: " << fe.what());
}
- os << "</manifest>\n";
- return os;
+ return true;
}
}
projects / lyx.git / blobdiff