#include "frontends/Dialogs.h"
#include "support/FileInfo.h"
-#include "support/lyxlib.h"
+#include "support/filefilterlist.h"
+#include "support/filetools.h"
+#include "support/globbing.h"
#include "support/lstrings.h"
+#include "support/lyxlib.h"
#include "support/tostr.h"
-#include "support/filetools.h"
#include "lyx_forms.h"
#include <boost/bind.hpp>
+#include <boost/regex.hpp>
+#include <boost/tokenizer.hpp>
#include <algorithm>
#include <map>
+#include <sstream>
+
#include <grp.h>
#include <pwd.h>
using lyx::support::AbsolutePath;
using lyx::support::AddName;
using lyx::support::ExpandPath;
+using lyx::support::FileFilterList;
using lyx::support::FileInfo;
using lyx::support::getcwd;
using lyx::support::GetEnvPath;
using lyx::support::LyXReadLink;
using lyx::support::MakeAbsPath;
using lyx::support::OnlyFilename;
-using lyx::support::regexMatch;
using lyx::support::split;
+using lyx::support::subst;
using lyx::support::suffixIs;
using lyx::support::trim;
using std::max;
using std::sort;
-
+using std::ostringstream;
+using std::string;
using std::map;
+using std::vector;
+using namespace lyx::frontend;
namespace {
+/** Given a string "<glob> <glob> <glob>", expand each glob in turn.
+ * Any glob that cannot be expanded is ignored silently.
+ * Invokes \c convert_brace_glob and \c glob internally, so use only
+ * on systems supporting the Posix function 'glob'.
+ * \param mask the string "<glob> <glob> <glob>".
+ * \param directory the current working directory from
+ * which \c glob is invoked.
+ * \returns a vector of all matching file names.
+ */
+vector<string> const expand_globs(string const & mask,
+ string const & directory)
+{
+ // Split into individual globs and then call 'glob' on each one.
+ typedef boost::tokenizer<boost::char_separator<char> > Tokenizer;
+ boost::char_separator<char> const separator(" ");
+
+ vector<string> matches;
+ Tokenizer const tokens(mask, separator);
+ Tokenizer::const_iterator it = tokens.begin();
+ Tokenizer::const_iterator const end = tokens.end();
+ for (; it != end; ++it)
+ lyx::support::glob(matches, *it, directory);
+
+ return matches;
+}
+
+
// six months, in seconds
long const SIX_MONTH_SEC = 6L * 30L * 24L * 60L * 60L;
//static
GroupCache lyxGroupCache;
// compares two LyXDirEntry objects content (used for sort)
-class comp_direntry {
+class comp_direntry : public std::binary_function<DirEntry, DirEntry, bool> {
public:
bool operator()(DirEntry const & r1, DirEntry const & r2) const
{
}
};
-
} // namespace anon
string line, Temp;
string mode;
string File = directory_;
- if (File != "/") {
+ if (File != "/")
File = split(File, Temp, '/');
- }
+
while (!File.empty() || !Temp.empty()) {
string dline = "@b" + line + Temp + '/';
fl_add_browser_line(file_dlg_form_->List, dline.c_str());
++depth_;
}
- // Parses all entries of the given subdirectory
+ vector<string> const glob_matches = expand_globs(mask_, directory_);
+
time_t curTime = time(0);
rewinddir(dir);
while (dirent * entry = readdir(dir)) {
buffer += Link;
// This gives the FileType of the file that
- // is really pointed too after resolving all
+ // is really pointed to after resolving all
// symlinks. This is not necessarily the same
// as the type of Link (which could again be a
// link). Is that intended?
|| fileInfo.isChar()
|| fileInfo.isBlock()
|| fileInfo.isFifo()) {
- if (!regexMatch(fname, mask_))
+ typedef vector<string>::const_iterator viterator;
+ viterator gbegin = glob_matches.begin();
+ viterator const gend = glob_matches.end();
+ if (std::find(gbegin, gend, fname) == gend)
continue;
} else if (!(isDir = fileInfo.isDir()))
continue;
}
-// SetMask: sets dialog file mask
-void FileDialog::Private::SetMask(string const & newmask)
+void FileDialog::Private::SetFilters(string const & mask)
+{
+ SetFilters(FileFilterList(mask));
+}
+
+
+void FileDialog::Private::SetFilters(FileFilterList const & filters)
{
- mask_ = newmask;
+ if (filters.empty())
+ return;
+
+ // Just take the first one for now.
+ typedef FileFilterList::Filter::glob_iterator glob_iterator;
+ glob_iterator const begin = filters[0].begin();
+ glob_iterator const end = filters[0].end();
+ if (begin == end)
+ return;
+
+ ostringstream ss;
+ for (glob_iterator it = begin; it != end; ++it) {
+ if (it != begin)
+ ss << ' ';
+ ss << *it;
+ }
+
+ mask_ = ss.str();
fl_set_input(file_dlg_form_->PatBox, mask_.c_str());
}
FileDialog::Private::Private()
{
directory_ = MakeAbsPath(string("."));
- mask_ = '*';
// Creates form if necessary.
if (!file_dlg_form_) {
break;
case 1: // get mask
- current_dlg_->SetMask(fl_get_input(file_dlg_form_->PatBox));
+ current_dlg_->SetFilters(fl_get_input(file_dlg_form_->PatBox));
current_dlg_->Reread();
break;
case 10: // rescan
current_dlg_->SetDirectory(fl_get_input(file_dlg_form_->DirBox));
- current_dlg_->SetMask(fl_get_input(file_dlg_form_->PatBox));
+ current_dlg_->SetFilters(fl_get_input(file_dlg_form_->PatBox));
current_dlg_->Reread();
break;
case 11: // home
current_dlg_->SetDirectory(GetEnvPath("HOME"));
- current_dlg_->SetMask(fl_get_input(file_dlg_form_->PatBox));
+ current_dlg_->SetFilters(fl_get_input(file_dlg_form_->PatBox));
current_dlg_->Reread();
break;
case 12: // user button 1
current_dlg_->SetDirectory(current_dlg_->user_path1_);
- current_dlg_->SetMask(fl_get_input(file_dlg_form_->PatBox));
+ current_dlg_->SetFilters(fl_get_input(file_dlg_form_->PatBox));
current_dlg_->Reread();
break;
case 13: // user button 2
current_dlg_->SetDirectory(current_dlg_->user_path2_);
- current_dlg_->SetMask(fl_get_input(file_dlg_form_->PatBox));
+ current_dlg_->SetFilters(fl_get_input(file_dlg_form_->PatBox));
current_dlg_->Reread();
break;
// mask was changed
string tmp = fl_get_input(file_dlg_form_->PatBox);
if (tmp != mask_) {
- SetMask(tmp);
+ SetFilters(tmp);
Reread();
return false;
}
// Select: launches dialog and returns selected file
string const FileDialog::Private::Select(string const & title,
string const & path,
- string const & mask,
+ FileFilterList const & filters,
string const & suggested)
{
// handles new mask and path
- bool isOk = true;
- if (!mask.empty()) {
- SetMask(mask);
- isOk = false;
- }
- if (!path.empty()) {
- SetDirectory(path);
- isOk = false;
- }
- if (!isOk)
- Reread();
+ SetFilters(filters);
+ SetDirectory(path);
+ Reread();
// highlight the suggested file in the browser, if it exists.
int sel = 0;
FL_PLACE_MOUSE | FL_FREE_SIZE, 0,
title.c_str());
- isOk = RunDialog();
+ bool const isOk = RunDialog();
fl_hide_form(file_dlg_form_->form);
fl_activate_all_forms();
string const & path,
string const & suggested)
{
- SetMask("*/");
+ SetFilters("*/");
// handles new path
bool isOk = true;
if (!path.empty()) {
projects / lyx.git / blobdiff