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

Made the bread crumbs for sqlite provider work

Browse source
This commit is contained in:
Lars Brubaker 2015-08-04 16:17:51 -07:00
parent 8572c9d562
commit 1753447e89
3 changed files with 17 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Library/Provider/LibraryProviderSelector.cs
View file

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
}
// put in the sqlite provider
libraryProviders.Add(new LibraryProviderSQLite(null, this));
libraryProviders.Add(new LibraryProviderSQLite(null, this, "Local Library"));
AddFolderImage("library_folder.png");
// Check for LibraryProvider factories and put them in the list too.

53
Library/Provider/LibraryProviderSqlite.cs
View file

@ -56,9 +56,13 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
private List<PrintItemWrapper> printItems = new List<PrintItemWrapper>();
public LibraryProviderSQLite(PrintItemCollection baseLibraryCollection, LibraryProvider parentLibraryProvider)
string visibleName;
public LibraryProviderSQLite(PrintItemCollection baseLibraryCollection, LibraryProvider parentLibraryProvider, string visibleName)
: base(parentLibraryProvider)
{
this.visibleName = visibleName;
if (baseLibraryCollection == null)
{
baseLibraryCollection = GetRootLibraryCollection2(this);
@ -74,7 +78,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
if (instance == null)
{
instance = new LibraryProviderSQLite(null, null);
instance = new LibraryProviderSQLite(null, null, "Local Library");
}
return instance;
@ -150,7 +154,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
get
{
return "Local Library";
return visibleName;
}
}
@ -241,7 +245,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
return calibrationPrintFileNames.Where(fileName =>
{
// Filter out items that already exist in the library
LibraryProviderSQLite rootLibrary = new LibraryProviderSQLite(null, null);
LibraryProviderSQLite rootLibrary = new LibraryProviderSQLite(null, null, "Local Library");
return rootLibrary.GetLibraryItems(Path.GetFileNameWithoutExtension(fileName)).Count() <= 0;
}).Select(fileName =>
{
@ -266,7 +270,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
LoadLibraryItems();
}
public override void AddItem(PrintItemWrapper itemToAdd)
public async override void AddItem(PrintItemWrapper itemToAdd)
{
if (itemToAdd != null && itemToAdd.FileLocation != null)
{
@ -274,7 +278,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
// refresh the display to show the pending items
//LibraryProvider.OnDataReloaded(null);
Task.Run(() => loadFilesIntoLibraryBackgoundWorker_DoWork(new string[] { itemToAdd.FileLocation }));
await Task.Run(() => AddStlOrGcode(this, itemToAdd.FileLocation, itemToAdd.Name));
if (baseLibraryCollection != null)
{
@ -318,7 +322,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
public override LibraryProvider GetProviderForCollection(PrintItemCollection collection)
{
return new LibraryProviderSQLite(collection, this);
return new LibraryProviderSQLite(collection, this, collection.Name);
}
void LoadLibraryItems()
@ -369,10 +373,12 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
OnDataReloaded(null);
}
private static void AddStlOrGcode(LibraryProviderSQLite libraryToAddTo, string loadedFileName, string extension)
private static void AddStlOrGcode(LibraryProviderSQLite libraryToAddTo, string loadedFileName, string displayName)
{
string extension = Path.GetExtension(loadedFileName).ToUpper();
PrintItem printItem = new PrintItem();
printItem.Name = Path.GetFileNameWithoutExtension(loadedFileName);
printItem.Name = displayName;
printItem.FileLocation = Path.GetFullPath(loadedFileName);
printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id;
printItem.Commit();
@ -448,34 +454,5 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
IEnumerable<PrintItem> result = (IEnumerable<PrintItem>)Datastore.Instance.dbSQLite.Query<PrintItem>(query);
return result;
}
private void loadFilesIntoLibraryBackgoundWorker_DoWork(IList<string> fileList)
{
foreach (string loadedFileName in fileList)
{
string extension = Path.GetExtension(loadedFileName).ToUpper();
if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE"
|| extension == ".ZIP")
{
if (extension == ".ZIP")
{
ProjectFileHandler project = new ProjectFileHandler(null);
List<PrintItem> partFiles = project.ImportFromProjectArchive(loadedFileName);
if (partFiles != null)
{
foreach (PrintItem part in partFiles)
{
AddStlOrGcode(this, part.FileLocation, Path.GetExtension(part.FileLocation).ToUpper());
}
}
}
else
{
AddStlOrGcode(this, loadedFileName, extension);
}
}
}
}
}
}