From 6f0b443bb38fc15beee47fa815e1719c31256d85 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 17 Jul 2015 16:45:24 -0700 Subject: [PATCH] Took out the provider locator code as it is not needed. --- DataStorage/Models.cs | 15 +-------- Library/Provider/LibraryProviderFileSystem.cs | 5 +-- Library/Provider/LibraryProviderSelector.cs | 33 +------------------ Library/Provider/LibraryProviderSqlite.cs | 9 ----- Queue/QueueDataWidget.cs | 1 - .../MatterControl/LibraryProviderTests.cs | 4 --- 6 files changed, 3 insertions(+), 64 deletions(-) diff --git a/DataStorage/Models.cs b/DataStorage/Models.cs index 407accafc..9502952e9 100644 --- a/DataStorage/Models.cs +++ b/DataStorage/Models.cs @@ -274,11 +274,10 @@ namespace MatterHackers.MatterControl.DataStorage { } - public PrintItem(string name, string fileLocation, string libraryProviderLocatorJson = "") + public PrintItem(string name, string fileLocation) { this.Name = name; this.FileLocation = fileLocation; - this.LibraryProviderLocatorJson = libraryProviderLocatorJson; DateAdded = DateTime.Now; PrintCount = 0; @@ -288,8 +287,6 @@ namespace MatterHackers.MatterControl.DataStorage public string FileLocation { get; set; } - public string LibraryProviderLocatorJson { get; set; } - public string Name { get; set; } public int PrintCount { get; set; } @@ -297,16 +294,6 @@ namespace MatterHackers.MatterControl.DataStorage [Indexed] public int PrintItemCollectionID { get; set; } - public List GetLibraryProviderLocator() - { - List providerPath = null; - if (LibraryProviderLocatorJson != null) - { - providerPath = JsonConvert.DeserializeObject>(LibraryProviderLocatorJson); - } - return providerPath; - } - public bool ReadOnly { get; set; } public bool Protected { get; set; } diff --git a/Library/Provider/LibraryProviderFileSystem.cs b/Library/Provider/LibraryProviderFileSystem.cs index 3b498dd1e..4db007247 100644 --- a/Library/Provider/LibraryProviderFileSystem.cs +++ b/Library/Provider/LibraryProviderFileSystem.cs @@ -181,10 +181,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider { string fileName = currentDirectoryFiles[itemIndex]; - List providerLocator = GetProviderLocator(); - string providerLocatorJson = JsonConvert.SerializeObject(providerLocator); - - return new PrintItemWrapper(new DataStorage.PrintItem(Path.GetFileNameWithoutExtension(fileName), fileName, providerLocatorJson)); + return new PrintItemWrapper(new DataStorage.PrintItem(Path.GetFileNameWithoutExtension(fileName), fileName)); } public override LibraryProvider GetProviderForItem(PrintItemCollection collection) diff --git a/Library/Provider/LibraryProviderSelector.cs b/Library/Provider/LibraryProviderSelector.cs index cd23705d5..9423f108b 100644 --- a/Library/Provider/LibraryProviderSelector.cs +++ b/Library/Provider/LibraryProviderSelector.cs @@ -239,10 +239,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider public override void RemoveItem(PrintItemWrapper printItemWrapper) { - List subProviderSavePath; - int libraryProviderToUseIndex = GetProviderIndex(printItemWrapper, out subProviderSavePath); - - visibleProviders[libraryProviderToUseIndex].RemoveItem(printItemWrapper); + throw new NotImplementedException(); } public override void SaveToLibrary(PrintItemWrapper printItemWrapper, List meshGroupsToSave, List providerSavePath = null) @@ -250,34 +247,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider throw new NotImplementedException(); } - private int GetProviderIndex(PrintItemWrapper printItemWrapper, out List subProviderSavePath) - { - List providerPath = printItemWrapper.PrintItem.GetLibraryProviderLocator(); - - return GetProviderIndex(providerPath, out subProviderSavePath); - } - - private int GetProviderIndex(List providerSavePath, out List subProviderSavePath) - { - subProviderSavePath = null; - - if (providerSavePath != null - && providerSavePath.Count > 1) // key 0 is this provider so we want to look at the next provider - { - for (int i = 0; i < visibleProviders.Count; i++) - { - if (visibleProviders[i].ProviderKey == providerSavePath[1].Key) - { - subProviderSavePath = new List(providerSavePath); - subProviderSavePath.RemoveAt(0); - return i; - } - } - } - - return 0; - } - #endregion Overriden Abstract Methods public static LibraryProvider GetProviderForItem(PrintItemWrapper printItemWrapper) diff --git a/Library/Provider/LibraryProviderSqlite.cs b/Library/Provider/LibraryProviderSqlite.cs index a61460e7a..1de1c038b 100644 --- a/Library/Provider/LibraryProviderSqlite.cs +++ b/Library/Provider/LibraryProviderSqlite.cs @@ -276,20 +276,12 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider LibraryProvider.OnDataReloaded(null); } - void SetProviderLocator(PrintItemWrapper itemToSetProviderLocatorOn) - { - List providerLocator = GetProviderLocator(); - string providerLocatorJson = JsonConvert.SerializeObject(providerLocator); - itemToSetProviderLocatorOn.PrintItem.LibraryProviderLocatorJson = providerLocatorJson; - } - public void AddItem(PrintItemWrapper item, int indexToInsert = -1) { if (indexToInsert == -1) { indexToInsert = printItems.Count; } - SetProviderLocator(item); printItems.Insert(indexToInsert, item); // Check if the collection we are adding to is the the currently visible collection. List currentDisplayedCollection = GetProviderLocator(); @@ -330,7 +322,6 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider foreach (PrintItem part in partFiles) { PrintItemWrapper item = new PrintItemWrapper(part); - SetProviderLocator(item); printItems.Add(item); } } diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs index 2b3e9a60e..54a46c64d 100644 --- a/Queue/QueueDataWidget.cs +++ b/Queue/QueueDataWidget.cs @@ -318,7 +318,6 @@ namespace MatterHackers.MatterControl.PrintQueue PrintItem newPrintItem = new PrintItem(); newPrintItem.Name = newName; newPrintItem.FileLocation = newCopyFilename; - newPrintItem.LibraryProviderLocatorJson = printItemWrapper.PrintItem.LibraryProviderLocatorJson; newPrintItem.ReadOnly = printItemWrapper.PrintItem.ReadOnly; newPrintItem.Protected = printItemWrapper.PrintItem.Protected; UiThread.RunOnIdle(AddPartCopyToQueue, new PartToAddToQueue() diff --git a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs index 1484147c7..2bb9ec9ef 100644 --- a/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/LibraryProviderTests.cs @@ -79,8 +79,6 @@ namespace MatterControl.Tests Assert.IsTrue(Directory.Exists(createdDirectory)); PrintItemWrapper itemAtRoot = testProvider.GetPrintItemWrapperAsync(0).Result; - List providerLocator = itemAtRoot.PrintItem.GetLibraryProviderLocator(); - Assert.IsTrue(providerLocator.Count == 1); // add an item works correctly LibraryProvider subProvider = testProvider.GetProviderForItem(testProvider.GetCollectionItem(0)); @@ -138,8 +136,6 @@ namespace MatterControl.Tests Assert.IsTrue(NamedCollectionExists(collectionName)); // assert that the record does exist in the DB PrintItemWrapper itemAtRoot = testProvider.GetPrintItemWrapperAsync(0).Result; - List providerLocator = itemAtRoot.PrintItem.GetLibraryProviderLocator(); - Assert.IsTrue(providerLocator.Count == 1); // add an item works correctly dataReloaded = false;