lesderid
/
dtagfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add negative tag matching with an exclusion prefix

This commit is contained in:
Les De Ridder 2016-11-29 19:00:57 +01:00
parent 0adc5ba0de
commit 7b102f7839
No known key found for this signature in database
GPG Key ID: 5EC132DFA85DB372
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/filesystem.d
View File

@ -8,6 +8,7 @@ import std.path;
import std.array; import std.array;
import std.string; import std.string;
import std.stdio; import std.stdio;
import std.typecons;
import core.sys.posix.unistd; import core.sys.posix.unistd;
import core.stdc.string; import core.stdc.string;
@ -32,6 +33,8 @@ class FileSystem : Operations
private bool _noCommon; private bool _noCommon;
enum exclusionChar = '!';
this(string source, TagProvider[] tagProviders, bool noCommon) this(string source, TagProvider[] tagProviders, bool noCommon)
{ {
_source = source; _source = source;
@ -76,7 +79,8 @@ class FileSystem : Operations
stat.st_uid = _sourceStat.st_uid; stat.st_uid = _sourceStat.st_uid;
stat.st_gid = _sourceStat.st_gid; stat.st_gid = _sourceStat.st_gid;
if(path == "/" || isTag(path.baseName)) //excluded tags are also valid directories
if(path == "/" || isTag(path.baseName.stripLeft(exclusionChar)))
{ {
stat.st_mode = _sourceStat.st_mode; stat.st_mode = _sourceStat.st_mode;
} }
@ -141,10 +145,14 @@ class FileSystem : Operations
} }
else else
{ {
auto tags = pathSplitter(path).array[1..$]; //map the path to a range of tuples with an exclude (bool) and a name (string) field for each tag in the path
auto tags = pathSplitter(path)
.array[1..$]
.map!(tag => tuple!("exclude", "name")(tag[0] == exclusionChar, tag.stripLeft(exclusionChar)));
//filter files with tags that (should not be excluded && can be found) || (should be excluded && can't be found)
return _tagCache.byKeyValue() return _tagCache.byKeyValue()
.filter!(a => tags.all!(b => a.value.canFind(b))) .filter!(a => tags.all!(b => !b.exclude == a.value.canFind(b.name)))
.map!(a => a.key.baseName) .map!(a => a.key.baseName)
.array; .array;
} }