Made it possible to get the item count and collection count on collection children.

This commit is contained in:
Lars Brubaker 2015-07-23 10:40:36 -07:00
parent dd626569f9
commit 0d5c8c4cc1
4 changed files with 61 additions and 30 deletions

View file

@ -283,30 +283,42 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
private void GetFilesAndCollectionsInCurrentDirectory()
{
currentDirectoryDirectories.Clear();
string[] directories = Directory.GetDirectories(Path.Combine(rootPath, currentDirectory));
foreach (string directoryName in directories)
try
{
if (keywordFilter.Trim() == string.Empty
|| Path.GetFileNameWithoutExtension(directoryName).Contains(keywordFilter))
string[] directories = Directory.GetDirectories(Path.Combine(rootPath, currentDirectory));
foreach (string directoryName in directories)
{
string subPath = directoryName.Substring(rootPath.Length + 1);
currentDirectoryDirectories.Add(subPath);
if (keywordFilter.Trim() == string.Empty
|| Path.GetFileNameWithoutExtension(directoryName).Contains(keywordFilter))
{
string subPath = directoryName.Substring(rootPath.Length + 1);
currentDirectoryDirectories.Add(subPath);
}
}
}
catch (Exception)
{
}
currentDirectoryFiles.Clear();
string[] files = Directory.GetFiles(Path.Combine(rootPath, currentDirectory));
foreach (string filename in files)
try
{
if (ApplicationSettings.LibraryFilterFileExtensions.Contains(Path.GetExtension(filename).ToLower()))
string[] files = Directory.GetFiles(Path.Combine(rootPath, currentDirectory));
foreach (string filename in files)
{
if (keywordFilter.Trim() == string.Empty
|| Path.GetFileNameWithoutExtension(filename).Contains(keywordFilter))
if (ApplicationSettings.LibraryFilterFileExtensions.Contains(Path.GetExtension(filename).ToLower()))
{
currentDirectoryFiles.Add(filename);
if (keywordFilter.Trim() == string.Empty
|| Path.GetFileNameWithoutExtension(filename).Contains(keywordFilter))
{
currentDirectoryFiles.Add(filename);
}
}
}
}
catch (Exception)
{
}
LibraryProvider.OnDataReloaded(null);
}