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

Add zip support to SqliteContainer

Browse source 
- Issue MatterHackers/MCCentral#2814
Investigate LocalLibraryAddButtonAddZipToLibrary failure
This commit is contained in:
John Lewin 2018-02-10 00:12:48 -08:00
parent bd8b9b4464
commit 3091128c1a
3 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Library/Providers/MatterControl/SqliteLibraryContainer.cs
View file

@ -58,8 +58,6 @@ namespace MatterHackers.MatterControl.Library
public class SqliteLibraryContainer : WritableContainer
{
protected List<PrintItemCollection> childCollections = new List<PrintItemCollection>();
// Use default rootCollectionID - normally this constructor isn't used but exists to validate behavior in tests
public SqliteLibraryContainer()
: this(Datastore.Instance.dbSQLite.Table<PrintItemCollection>().Where(v => v.Name == "_library").Take(1).FirstOrDefault()?.Id ?? 0)
@ -94,14 +92,25 @@ namespace MatterHackers.MatterControl.Library
public override void Load()
{
childCollections = GetChildCollections();
var childCollections = this.GetChildCollections();
this.ChildContainers = childCollections.Select(c => new SqliteLibraryContainerLink()
var allFiles = this.GetLibraryItems(KeywordFilter);
var zipFiles = allFiles.Where(f => string.Equals(Path.GetExtension(f.FileLocation), ".zip", StringComparison.OrdinalIgnoreCase));
var nonZipFiles = allFiles.Except(zipFiles);
IEnumerable<ILibraryContainerLink> childContainers = childCollections.Select(c => new SqliteLibraryContainerLink()
{
ContainerID = c.Id, Name = c.Name }).ToList<ILibraryContainerLink>(); //
ContainerID = c.Id,
Name = c.Name
});
this.ChildContainers = childContainers.Concat(
zipFiles.Select(f => new LocalZipContainerLink(f.FileLocation, f.Name))).OrderBy(d => d.Name).ToList();
// PrintItems projected onto FileSystemFileItem
Items = GetLibraryItems(KeywordFilter).Select<PrintItem, ILibraryItem>(printItem =>
this.Items = nonZipFiles.Select<PrintItem, ILibraryItem>(printItem =>
{
if (File.Exists(printItem.FileLocation))
{
@ -163,7 +172,7 @@ namespace MatterHackers.MatterControl.Library
public List<PrintItem> GetLibraryItems(string keyphrase = null)
{
// TODO: String concatenation to build sql statements is the root of all sql injection attacts. This needs to be changed to use parameter objects as would be expected
// TODO: String concatenation to build sql statements is the root of all sql injection attacks. This needs to be changed to use parameter objects as would be expected
string query;
if (string.IsNullOrEmpty(keyphrase))
{

7
Library/Providers/Zip/LocalZipContainerLink.cs
View file

@ -51,10 +51,15 @@ namespace MatterHackers.MatterControl.Library
public override bool IsProtected { get; } = true;
public LocalZipContainerLink(string filePath)
public LocalZipContainerLink(string filePath, string nameOverride = null)
: base(filePath)
{
this.ThumbnailKey = null;
if (nameOverride != null)
{
this.Name = nameOverride;
}
}
private string currentDirectory = "";

9
Tests/MatterControl.AutomationTests/LocalLibraryTests.cs
View file

@ -66,8 +66,13 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.Delay(1);
testRunner.Type("{Enter}");
Assert.IsTrue(testRunner.WaitForName("Row Item Batman"), "Batman part should exist after adding");
Assert.IsTrue(testRunner.WaitForName("Row Item 2013-01-25 Mouthpiece V2"), "Mouthpiece part should exist after adding");
testRunner.WaitForName("Batman Row Item Collection");
testRunner.DoubleClickByName("Batman Row Item Collection");
Assert.IsTrue(testRunner.WaitForName("Row Item Batman.stl"), "Batman part should exist after adding");
Assert.IsTrue(testRunner.WaitForName("Row Item 2013-01-25_Mouthpiece_v2.stl"), "Mouthpiece part should exist after adding");
return Task.CompletedTask;
});