github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update file scanner API to use glob_list_t

Browse Source
This commit is contained in:
Allan Odgaard
2012-09-12 00:24:31 +02:00
parent 4f017345fc
commit 4fc00f55e7
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Frameworks/document/src/document.cc
View File

@@ -1231,9 +1231,9 @@ namespace document
return res;
}
scanner_t::scanner_t (std::string const& path, std::string const& glob, std::string const& excludeGlob, bool follow_links, bool follow_hidden_folders, bool depth_first) : path(path), glob(glob), exclude_glob(excludeGlob), follow_links(follow_links), follow_hidden_folders(follow_hidden_folders), depth_first(depth_first), is_running_flag(true), should_stop_flag(false)
scanner_t::scanner_t (std::string const& path, path::glob_list_t const& glob, bool follow_links, bool depth_first) : path(path), glob(glob), follow_links(follow_links), depth_first(depth_first), is_running_flag(true), should_stop_flag(false)
{
D(DBF_Document_Scanner, bug("%s / %s (excl. %s), links %s, include hidden %s\n", path.c_str(), glob.c_str(), excludeGlob.c_str(), BSTR(follow_links), BSTR(follow_hidden_folders)););
D(DBF_Document_Scanner, bug("%s, links %s\n", path.c_str(), BSTR(follow_links)););
document_tracker_t::lock_t lock(&document::documents);
iterate(pair, document::documents.documents)
@@ -1286,7 +1286,6 @@ namespace document
{
D(DBF_Document_Scanner, bug("%s, running %s\n", initialPath.c_str(), BSTR(is_running_flag)););
path::glob_t ptrn(glob), exclPtrn(exclude_glob);
std::deque<std::string> dirs(1, initialPath);
std::vector<std::string> links;
while(!dirs.empty())
@@ -1312,12 +1311,9 @@ namespace document
break;
std::string const& path = path::join(dir, (*it)->d_name);
if(exclPtrn.does_match(path))
continue;
if((*it)->d_type == DT_DIR)
{
if((*it)->d_name[0] == '.' && !follow_hidden_folders)
if(glob.exclude(path, path::kPathItemDirectory))
continue;
if(seen_paths.insert(std::make_pair(buf.st_dev, (*it)->d_ino)).second)
@@ -1326,7 +1322,7 @@ namespace document
}
else if((*it)->d_type == DT_REG)
{
if(!ptrn.does_match(path))
if(glob.exclude(path, path::kPathItemFile))
continue;
if(seen_paths.insert(std::make_pair(buf.st_dev, (*it)->d_ino)).second)
@@ -1351,12 +1347,15 @@ namespace document
{
if(S_ISDIR(buf.st_mode) && follow_links && seen_paths.insert(std::make_pair(buf.st_dev, buf.st_ino)).second)
{
if(glob.exclude(path, path::kPathItemDirectory))
continue;
D(DBF_Document_Scanner, bug("follow link: %s → %s\n", link->c_str(), path.c_str()););
dirs.push_back(path);
}
else if(S_ISREG(buf.st_mode))
{
if(!ptrn.does_match(path::name(*link)))
if(glob.exclude(path, path::kPathItemFile))
continue;
if(seen_paths.insert(std::make_pair(buf.st_dev, buf.st_ino)).second)

8
Frameworks/document/src/document.h
View File

@@ -14,6 +14,7 @@
#include <file/save.h>
#include <file/encoding.h>
#include <scope/scope.h>
#include <regexp/glob.h>
#include <oak/debug.h>
namespace document
@@ -350,7 +351,7 @@ namespace document
{
WATCH_LEAKS(scanner_t);
scanner_t (std::string const& path, std::string const& glob = "*", std::string const& excludeGlob = "", bool follow_links = false, bool follow_hidden_folders = false, bool depth_first = false);
scanner_t (std::string const& path, path::glob_list_t const& glob, bool follow_links = false, bool depth_first = false);
~scanner_t ();
bool is_running () const { return is_running_flag; }
@@ -363,8 +364,9 @@ namespace document
std::string get_current_path () const;
private:
std::string path, glob, exclude_glob;
bool follow_links, follow_hidden_folders, depth_first;
std::string path;
path::glob_list_t glob;
bool follow_links, depth_first;
pthread_t thread;
mutable pthread_mutex_t mutex;