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

Fix tag list when using excluded tags

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

21
source/filesystem.d
View File

@ -115,6 +115,15 @@ class FileSystem : Operations
return _fileLinkCache[name]; return _fileLinkCache[name];
} }
Tuple!(bool, "exclude", string, "name")[] pathToTagTuples(const(char)[] path)
{
//map the path to a range of tuples with an exclude (bool) and a name (string) field for each tag in the path
return pathSplitter(path)
.array[1..$]
.map!(tag => tuple!("exclude", "name")(tag[0] == exclusionChar, cast(immutable)tag.stripLeft(exclusionChar)))
.array;
}
string[] getTags(const(char)[] path) string[] getTags(const(char)[] path)
{ {
if(path == "/") if(path == "/")
@ -123,12 +132,13 @@ class FileSystem : Operations
} }
else else
{ {
auto tags = pathSplitter(path).array[1..$]; auto tags = pathToTagTuples(path);
auto filePairs = _tagCache.byKeyValue().filter!(a => tags.all!(b => a.value.canFind(b))); //filter pairs with tags that (should not be excluded && can be found) || (should be excluded && can't be found)
auto filePairs = _tagCache.byKeyValue().filter!(a => tags.all!(b => !b.exclude == a.value.canFind(b.name)));
return filePairs.map!(a => a.value) return filePairs.map!(a => a.value)
.joiner .joiner
.filter!(a => !tags.canFind(a)) .filter!(a => !tags.map!(tag => tag.name).canFind(a)) //don't match tags that are already in the path
.filter!(a => !_noCommon || !filePairs.all!(f => f.value.canFind(a))) .filter!(a => !_noCommon || !filePairs.all!(f => f.value.canFind(a)))
.array .array
.sort() .sort()
@ -145,10 +155,7 @@ class FileSystem : Operations
} }
else else
{ {
//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 = pathToTagTuples(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) //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()