nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the file library provider search match the cloud search and work in subdirectories correctly.

Browse source
This commit is contained in:
Lars Brubaker 2016-01-11 17:28:59 -08:00
parent 5cf447bc3a
commit f61a459fa2
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Library/Provider/LibraryProviderFileSystem.cs
View file

@ -379,7 +379,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
if (ApplicationSettings.LibraryFilterFileExtensions.Contains(Path.GetExtension(filename).ToLower()))
{
if (upperFilter.Trim() == string.Empty
|| Path.GetFileNameWithoutExtension(filename.ToUpper()).Contains(upperFilter))
|| FileNameContainsFilter(filename, upperFilter))
{
newReadDirectoryFiles.Add(filename);
}
@ -390,13 +390,13 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
foreach (string directory in newReadDirectoryDirectories)
{
string subDirectory = Path.Combine(rootPath, directory);
string[] subDirectoryFiles = Directory.GetFiles(Path.Combine(rootPath, currentDirectory));
string[] subDirectoryFiles = Directory.GetFiles(subDirectory);
foreach (string filename in subDirectoryFiles)
{
if (ApplicationSettings.LibraryFilterFileExtensions.Contains(Path.GetExtension(filename).ToLower()))
{
if (keywordFilter.Trim() == string.Empty
|| Path.GetFileNameWithoutExtension(filename.ToUpper()).Contains(upperFilter))
|| FileNameContainsFilter(filename, upperFilter) )
{
newReadDirectoryFiles.Add(filename);
}
@ -424,6 +424,20 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
OnDataReloaded(null);
}
private bool FileNameContainsFilter(string filename, string upperFilter)
{
string[] mustContains = upperFilter.Split(' ');
foreach (string check in mustContains)
{
if(!Path.GetFileNameWithoutExtension(filename.ToUpper().Replace('_', ' ')).Contains(check))
{
return false;
}
}
return true;
}
private string GetPathFromLocator(List<ProviderLocatorNode> providerLocator)
{
string pathWithDot = Path.Combine(rootPath, providerLocator[providerLocator.Count - 1].Key);