#include "gettext.h"
#include "lyxsocket.h"
+#include "frontends/Application.h"
#include "frontends/Alert.h" //to be removed?
#include "support/filetools.h"
-#include "support/path.h"
+#include "support/lstrings.h"
+#include "support/os.h"
#include "support/systemcall.h"
-using lyx::support::bformat;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::LibScriptSearch;
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
-using lyx::support::OnlyPath;
-using lyx::support::Path;
-using lyx::support::QuoteName;
-using lyx::support::subst;
-using lyx::support::Systemcall;
+#include <boost/filesystem/operations.hpp>
+
+
+namespace lyx {
+
+using support::absolutePath;
+using support::bformat;
+using support::compare_ascii_no_case;
+using support::contains;
+using support::FileName;
+using support::libScriptSearch;
+using support::makeDisplayPath;
+using support::onlyPath;
+using support::quoteName;
+using support::subst;
+using support::Systemcall;
+using support::token;
using std::string;
using std::distance;
-extern LyXServerSocket * lyxsocket;
+namespace Alert = frontend::Alert;
+namespace fs = boost::filesystem;
+namespace os = support::os;
namespace {
return compare_ascii_no_case(a.prettyname(), b.prettyname()) < 0;
}
+
Format::Format(string const & n, string const & e, string const & p,
- string const & s, string const & v, string const & ed)
- : name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v), editor_(ed)
+ string const & s, string const & v, string const & ed,
+ int flags)
+ : name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v),
+ editor_(ed), flags_(flags)
{}
}
-string Formats::getFormatFromFile(string const & filename) const
+string Formats::getFormatFromFile(FileName const & filename) const
{
if (filename.empty())
return string();
- string const format = lyx::support::getFormatFromContents(filename);
+ string const format = support::getFormatFromContents(filename);
if (!format.empty())
return format;
// try to find a format from the file extension.
- string const ext(lyx::support::GetExtension(filename));
- if (!ext.empty()) {
+ string const ext(support::getExtension(filename.absFilename()));
+ if (!ext.empty()) {
// this is ambigous if two formats have the same extension,
// but better than nothing
Formats::const_iterator cit =
find_if(formatlist.begin(), formatlist.end(),
- FormatExtensionsEqual(ext));
+ FormatExtensionsEqual(ext));
if (cit != formats.end()) {
lyxerr[Debug::GRAPHICS]
<< "\twill guess format from file extension: "
return string();
}
+namespace {
+
+string fixCommand(string const & cmd, string const & ext,
+ os::auto_open_mode mode)
+{
+ // configure.py says we do not want a viewer/editor
+ if (cmd.empty())
+ return cmd;
+
+ // Does the OS manage this format?
+ if (os::canAutoOpenFile(ext, mode))
+ return "auto";
+
+ // if configure.py found nothing, clear the command
+ if (token(cmd, ' ', 0) == "auto")
+ return string();
+
+ // use the command found by configure.py
+ return cmd;
+}
+
+}
+
+void Formats::setAutoOpen()
+{
+ FormatList::iterator fit = formatlist.begin();
+ FormatList::iterator const fend = formatlist.end();
+ for ( ; fit != fend ; ++fit) {
+ fit->setViewer(fixCommand(fit->viewer(), fit->extension(), os::VIEW));
+ fit->setEditor(fixCommand(fit->editor(), fit->extension(), os::EDIT));
+ }
+}
+
int Formats::getNumber(string const & name) const
{
void Formats::add(string const & name)
{
if (!getFormat(name))
- add(name, name, name, string(), string(), string());
+ add(name, name, name, string(), string(), string(),
+ Format::document);
}
void Formats::add(string const & name, string const & extension,
string const & prettyname, string const & shortcut,
- string const & viewer, string const & editor)
+ string const & viewer, string const & editor,
+ int flags)
{
FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
FormatNamesEqual(name));
if (it == formatlist.end())
formatlist.push_back(Format(name, extension, prettyname,
- shortcut, viewer, editor));
+ shortcut, viewer, editor, flags));
else
- *it = Format(name, extension, prettyname, shortcut, viewer, editor);
+ *it = Format(name, extension, prettyname, shortcut, viewer,
+ editor, flags);
}
}
-bool Formats::view(Buffer const & buffer, string const & filename,
+bool Formats::view(Buffer const & buffer, FileName const & filename,
string const & format_name) const
{
- if (filename.empty())
+ if (filename.empty() || !fs::exists(filename.toFilesystemEncoding())) {
+ Alert::error(_("Cannot view file"),
+ bformat(_("File does not exist: %1$s"),
+ from_utf8(filename.absFilename())));
return false;
+ }
Format const * format = getFormat(format_name);
if (format && format->viewer().empty() &&
format->isChildFormat())
format = getFormat(format->parentFormat());
if (!format || format->viewer().empty()) {
-// I believe this is the wrong place to show alerts, it should be done by
-// the caller (this should be "utility" code)
+// FIXME: I believe this is the wrong place to show alerts, it should be done
+// by the caller (this should be "utility" code)
Alert::error(_("Cannot view file"),
bformat(_("No information for viewing %1$s"),
prettyName(format_name)));
return false;
}
+ // viewer is 'auto'
+ if (format->viewer() == "auto") {
+ if (os::autoOpenFile(filename.absFilename(), os::VIEW))
+ return true;
+ else {
+ Alert::error(_("Cannot view file"),
+ bformat(_("Auto-view file %1$s failed"),
+ from_utf8(filename.absFilename())));
+ return false;
+ }
+ }
- string command = LibScriptSearch(format->viewer());
+ string command = libScriptSearch(format->viewer());
if (format_name == "dvi" &&
!lyxrc.view_dvi_paper_option.empty()) {
if (!contains(command, token_from))
command += ' ' + token_from;
- command = subst(command, token_from,
- QuoteName(OnlyFilename(filename)));
- command = subst(command, token_path, QuoteName(OnlyPath(filename)));
- command = subst(command, token_socket, QuoteName(lyxsocket->address()));
+ command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
+ command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
+ command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
- buffer.message(_("Executing command: ") + command);
+ // FIXME UNICODE utf8 can be wrong for files
+ buffer.message(_("Executing command: ") + from_utf8(command));
- Path p(OnlyPath(filename));
Systemcall one;
int const res = one.startscript(Systemcall::DontWait, command);
if (res) {
Alert::error(_("Cannot view file"),
bformat(_("An error occurred whilst running %1$s"),
- MakeDisplayPath(command, 50)));
+ makeDisplayPath(command, 50)));
return false;
}
return true;
}
-bool Formats::edit(Buffer const & buffer, string const & filename,
- string const & format_name) const
+bool Formats::edit(Buffer const & buffer, FileName const & filename,
+ string const & format_name) const
{
- if (filename.empty())
+ if (filename.empty() || !fs::exists(filename.toFilesystemEncoding())) {
+ Alert::error(_("Cannot edit file"),
+ bformat(_("File does not exist: %1$s"),
+ from_utf8(filename.absFilename())));
return false;
+ }
Format const * format = getFormat(format_name);
if (format && format->editor().empty() &&
format->isChildFormat())
format = getFormat(format->parentFormat());
if (!format || format->editor().empty()) {
-// I believe this is the wrong place to show alerts, it should be done by
-// the caller (this should be "utility" code)
+// FIXME: I believe this is the wrong place to show alerts, it should
+// be done by the caller (this should be "utility" code)
Alert::error(_("Cannot edit file"),
bformat(_("No information for editing %1$s"),
prettyName(format_name)));
return false;
}
+ // editor is 'auto'
+ if (format->editor() == "auto") {
+ if (os::autoOpenFile(filename.absFilename(), os::EDIT))
+ return true;
+ else {
+ Alert::error(_("Cannot edit file"),
+ bformat(_("Auto-edit file %1$s failed"),
+ from_utf8(filename.absFilename())));
+ return false;
+ }
+ }
string command = format->editor();
if (!contains(command, token_from))
command += ' ' + token_from;
- command = subst(command, token_from,
- QuoteName(OnlyFilename(filename)));
- command = subst(command, token_path, QuoteName(OnlyPath(filename)));
- command = subst(command, token_socket, QuoteName(lyxsocket->address()));
+ command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
+ command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
+ command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
- buffer.message(_("Executing command: ") + command);
+ // FIXME UNICODE utf8 can be wrong for files
+ buffer.message(_("Executing command: ") + from_utf8(command));
- Path p(OnlyPath(filename));
Systemcall one;
int const res = one.startscript(Systemcall::DontWait, command);
if (res) {
Alert::error(_("Cannot edit file"),
bformat(_("An error occurred whilst running %1$s"),
- MakeDisplayPath(command, 50)));
+ makeDisplayPath(command, 50)));
return false;
}
return true;
}
-string const Formats::prettyName(string const & name) const
+docstring const Formats::prettyName(string const & name) const
{
Format const * format = getFormat(name);
if (format)
- return format->prettyname();
+ return from_utf8(format->prettyname());
else
- return name;
+ return from_utf8(name);
}
Formats formats;
Formats system_formats;
+
+
+} // namespace lyx
projects / lyx.git / blobdiff