8 files changed, 163 insertions, 5 deletions
diff --git a/core/file_io.lua b/core/file_io.lua
index fd45ac4c..878188ed 100644
--- a/core/file_io.lua
+++ b/core/file_io.lua
@@ -54,6 +54,9 @@
 --   * _`filename`_: The UTF-8-encoded filename.
 --
 -- [`buffer:save_as()`]: buffer.html#save_as
+-- @field SNAPOPEN_MAX (number)
+--   The maximum number of files to list in the snapopen dialog.
+--   The default value is `1000`.
 module('io')]]
 
 -- Events.
@@ -63,6 +66,8 @@ events.FILE_BEFORE_SAVE = 'file_before_save'
 events.FILE_AFTER_SAVE = 'file_after_save'
 events.FILE_SAVED_AS = 'file_saved_as'
 
+io.SNAPOPEN_MAX = 1000
+
 ---
 -- List of recently opened files, the most recent being towards the top.
 -- @class table
@@ -141,8 +146,8 @@ io.try_encodings = {'UTF-8', 'ASCII', 'ISO-8859-1', 'MacRoman'}
 -- Opens *utf8_filenames*, a "\n" delimited string of UTF-8-encoded filenames,
 -- or user-selected files.
 -- Emits a `FILE_OPENED` event.
--- @param utf8_filenames Optional list of UTF-8-encoded filenames to open. If
---   `nil`, the user is prompted with a fileselect dialog.
+-- @param utf8_filenames Optional string list of UTF-8-encoded filenames to
+--   open. If `nil`, the user is prompted with a fileselect dialog.
 -- @see _G.events
 -- @name open_file
 function io.open_file(utf8_filenames)
@@ -394,3 +399,53 @@ function io.open_recent_file()
                              NCURSES and {'--width', gui.size[1] - 2} or '')
   if i then io.open_file(io.recent_files[i + 1]) end
 end
+
+---
+-- Quickly open files from *utf8_paths*, a "\n" delimited string of
+-- UTF-8-encoded directory paths, using a filtered list dialog.
+-- Files shown in the dialog do not match any pattern in string or table
+-- *filter*, and, unless *exclude_FILTER* is `true`, `lfs.FILTER` as well. A
+-- filter table contains Lua patterns that match filenames to exclude, with
+-- patterns matching folders to exclude listed in a `folders` sub-table.
+-- Patterns starting with '!' exclude files and folders that do not match the
+-- pattern that follows. Use a table of raw file extensions assigned to an
+-- `extensions` key for fast filtering by extension. All strings must be encoded
+-- in `_G._CHARSET`, not UTF-8. The number of files in the list is capped at
+-- `SNAPOPEN_MAX`.
+-- @param utf8_paths String list of UTF-8-encoded directory paths to search.
+-- @param filter Optional filter for files and folders to exclude.
+-- @param exclude_FILTER Optional flag indicating whether or not to exclude the
+--   default filter `lfs.FILTER` in the search. If `false`, adds `lfs.FILTER` to
+--   *filter*.
+--   The default value is `false` to include the default filter.
+-- @param ... Optional additional parameters to pass to `gui.dialog()`.
+-- @usage io.snapopen(buffer.filename:match('^.+/')) -- list all files in the
+--   current file's directory, subject to the default filter
+-- @usage io.snapopen('/project', '!%.lua$') -- list all Lua files in a project
+--    directory
+-- @usage io.snapopen('/project', {folders = {'build'}}) -- list all source
+--   files in a project directory
+-- @see lfs.FILTER
+-- @see SNAPOPEN_MAX
+-- @name snapopen
+function io.snapopen(utf8_paths, filter, exclude_FILTER, ...)
+  local list = {}
+  for utf8_path in utf8_paths:gmatch('[^\n]+') do
+    lfs.dir_foreach(utf8_path, function(file)
+      if #list >= io.SNAPOPEN_MAX then return false end
+      list[#list + 1] = file:gsub('^%.[/\\]', '')
+    end, filter, exclude_FILTER)
+  end
+  if #list >= io.SNAPOPEN_MAX then
+    gui.dialog('ok-msgbox',
+               '--title', _L['File Limit Exceeded'],
+               '--text',
+               string.format('%d %s %d', io.SNAPOPEN_MAX,
+                             _L['files or more were found. Showing the first'],
+                             io.SNAPOPEN_MAX),
+               '--button1', _L['_OK'])
+  end
+  local width = NCURSES and {'--width', gui.size[1] - 2} or ''
+  io.open_file(gui.filteredlist(_L['Open'], _L['File'], list, false,
+                                '--select-multiple', width, ...) or '')
+end
diff --git a/core/init.lua b/core/init.lua
index 5aa38d28..9a61379b 100644
--- a/core/init.lua
+++ b/core/init.lua
@@ -10,6 +10,7 @@ args = require 'args'
 _L = require 'locale'
 events = require 'events'
 require 'file_io'
+require 'lfs_ext'
 require 'gui'
 keys = require 'keys'
 
diff --git a/core/lfs_ext.lua b/core/lfs_ext.lua
new file mode 100644
index 00000000..d79800a4
--- /dev/null
+++ b/core/lfs_ext.lua
@@ -0,0 +1,97 @@
+-- Copyright 2007-2013 Mitchell mitchell.att.foicica.com. See LICENSE.
+
+--[[ This comment is for LuaDoc.
+---
+-- Extends the `lfs` library to find files in directories.
+module('lfs')]]
+
+---
+-- Filter table containing common binary file extensions and version control
+-- folders to exclude when iterating over files and directories using
+-- `dir_foreach` when its `exclude_FILTER` argument is `false`.
+-- @see dir_foreach
+-- @class table
+-- @name FILTER
+lfs.FILTER = {
+  extensions = {
+    'a', 'bmp', 'bz2', 'class', 'dll', 'exe', 'gif', 'gz', 'jar', 'jpeg', 'jpg',
+    'o', 'png', 'so', 'tar', 'tgz', 'tif', 'tiff', 'zip'
+  },
+  folders = {'%.bzr$', '%.git$', '%.hg$', '%.svn$', 'CVS$'}
+}
+
+-- Determines whether or not the given file matches the given filter.
+-- @param file The filename.
+-- @param filter The filter table.
+-- @return boolean `true` or `false`.
+local function exclude(file, filter)
+  if not filter then return false end
+  local ext = filter.extensions
+  if ext and ext[file:match('[^%.]+$')] then return true end
+  for i = 1, #filter do
+    local patt = filter[i]
+    if patt:sub(1, 1) ~= '!' then
+      if file:find(patt) then return true end
+    else
+      if not file:find(patt:sub(2)) then return true end
+    end
+  end
+  return false
+end
+
+---
+-- Iterates over all files and sub-directories in the UTF-8-encoded directory
+-- *utf8_dir*, calling function *f* on each file found.
+-- Files *f* is called on do not match any pattern in string or table *filter*,
+-- and, unless *exclude_FILTER* is `true`, `FILTER` as well. A filter table
+-- contains Lua patterns that match filenames to exclude, with patterns matching
+-- folders to exclude listed in a `folders` sub-table. Patterns starting with
+-- '!' exclude files and folders that do not match the pattern that follows. Use
+-- a table of raw file extensions assigned to an `extensions` key for fast
+-- filtering by extension. All strings must be encoded in `_G._CHARSET`, not
+-- UTF-8.
+-- @param utf8_dir A UTF-8-encoded directory path to iterate over.
+-- @param f Function to call with each full file path found. File paths are
+--   **not** encoded in UTF-8, but in `_G._CHARSET`. If *f* returns `false`
+--   explicitly, iteration ceases.
+-- @param filter Optional filter for files and folders to exclude.
+-- @param exclude_FILTER Optional flag indicating whether or not to exclude the
+--   default filter `FILTER` in the search. If `false`, adds `FILTER` to
+--   *filter*.
+--   The default value is `false` to include the default filter.
+-- @param recursing Utility flag indicating whether or not this function has
+--   been recursively called. This flag is used and set internally, and should
+--   not be set otherwise.
+-- @see FILTER
+-- @name dir_foreach
+function lfs.dir_foreach(utf8_dir, f, filter, exclude_FILTER, recursing)
+  if not recursing then
+    -- Convert filter to a table from nil or string arguments.
+    if not filter then filter = {} end
+    if type(filter) == 'string' then filter = {filter} end
+    -- Add FILTER to filter unless specified otherwise.
+    if not exclude_FILTER then
+      for k, v in pairs(lfs.FILTER) do
+        if not filter[k] then filter[k] = {} end
+        local filter_k = filter[k]
+        for i = 1, #v do filter_k[#filter_k + 1] = v[i] end
+      end
+    end
+    -- Create file extension filter hash table for quick lookups.
+    local ext = filter.extensions
+    if ext then for i = 1, #ext do ext[ext[i]] = true end end
+  end
+  local dir = utf8_dir:iconv(_CHARSET, 'UTF-8')
+  local lfs_attributes = lfs.attributes
+  for file in lfs.dir(dir) do
+    if not file:find('^%.%.?$') then -- ignore . and ..
+      file = dir..(not WIN32 and '/' or '\\')..file
+      local type = lfs_attributes(file, 'mode')
+      if type == 'directory' and not exclude(file, filter.folders) then
+        lfs.dir_foreach(file, f, filter, nil, true)
+      elseif type == 'file' and not exclude(file, filter) then
+        if f(file) == false then return end
+      end
+    end
+  end
+end
diff --git a/core/locale.conf b/core/locale.conf
index 297d7bfc..f694e806 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -81,6 +81,7 @@ _Whole word = _Whole word
 _Lua pattern = _Lua pattern
 _In files = _In files
 Find in Files = Find in Files
+Find: = Find:
 No results found = No results found
 [Files Found Buffer] = [Files Found Buffer]
 Search wrapped = Search wrapped
@@ -90,7 +91,7 @@ An error occured: = An error occured:
 %_Cancel = _Cancel
 replacement(s) made = replacement(s) made
 % For ncurses:
-Find: = Find:
+%Find: = Find:
 Replace: = Replace:
 [Next] = [Next]
 [Prev] = [Prev]
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index fcbc4ac3..071c16d2 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -82,6 +82,7 @@ _Whole word = Vollständiges Wort
 _Lua pattern = _Lua-Pattern
 _In files = _In Dateien
 Find in Files = In Dateien suchen
+Find: = Suchen:
 No results found = Keine Treffer gefunden
 [Files Found Buffer] = [Gefundene Dateien-Buffer]
 Search wrapped = Suche beginnt von oben
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index eb7bb7ea..4ebf1152 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -82,6 +82,7 @@ _Whole word = Palabra _completa
 _Lua pattern = Patrón de _Lua
 _In files = En ficher_os
 Find in Files = Buscar en ficheros
+Find: = Buscar:
 No results found = No se han encontrado coincidencias
 [Files Found Buffer] = [Buffer de búsqueda en ficheros]
 Search wrapped = La búsqueda ha sobrepasado el final/inicio del documento
@@ -91,7 +92,7 @@ An error occured: = Ha ocurrido un error:
 %_Cancel = _Cancelar
 replacement(s) made = cambios(s) hecho(s)
 % For ncurses:
-Find: = Buscar:
+%Find: = Buscar:
 Replace: = Reemplazar:
 [Next] = [Siguiente]
 [Prev] = [Anterior]
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index 8ee12f62..907cf735 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -82,6 +82,7 @@ _Whole word = _Mot entier
 _Lua pattern = Pattern _Lua
 _In files = _Dans les fichiers
 Find in Files = Rechercher dans les fichiers
+Find: = Rechercher:
 No results found = Aucun résultat trouvé
 [Files Found Buffer] = [Buffer des fichiers trouvés]
 Search wrapped = La recherche à bouclée
@@ -91,7 +92,7 @@ An error occured: = Une erreur est survenue:
 %_Cancel = _Annuler
 replacement(s) made = remplacement(s) effectués
 % For ncurses:
-Find: = Rechercher:
+%Find: = Rechercher:
 Replace: = Remplacer:
 [Next] = [Suivant]
 [Prev] = [Précédent]
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index d0609613..c8ff6228 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -82,6 +82,7 @@ _Whole word = _Слово целиком
 _Lua pattern = _Шаблон lua
 _In files = _В файлах
 Find in Files = Найти в файлах
+Find: = Найти:
 No results found = Ничего не найдено
 [Files Found Buffer] = [Буфер поиска в файлах]
 Search wrapped = Искать по кругу