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

Restore CloudLibrary save functionality, revise convert to AMF behavior

Browse source 
- Fixes #111237022 - Unable to save any changes to CloudLibrary items
 - Add useIncrementedNameDuringTypeChange to PrintItemWrapper to control naming behavior
 - Pass useIncrementedName value though from provider factory all the way to PrintItemWrapper
 - Prevent duplicate calls to GetPrintItemWrapperAsync within the same callstack i.e. pass instance through
 - Only rename files when switching to AMF and use different logic for different provider types
 - Add path helper methods to PrintItemWrapper for clarity and conciseness in callers
This commit is contained in:
John Lewin 2016-01-11 14:06:47 -08:00
parent 7b94b2ede8
commit 40939b906d
5 changed files with 87 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Library/Provider/LibraryProviderFileSystem.cs
View file

@ -42,26 +42,29 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
public class LibraryProviderFileSystemCreator : ILibraryCreator
{
string rootPath;
public string Description { get; set; }
private string rootPath;
public LibraryProviderFileSystemCreator(string rootPath, string description)
private bool useIncrementedNameDuringTypeChange;
public LibraryProviderFileSystemCreator(string rootPath, string description, bool useIncrementedNameDuringTypeChange = false)
{
this.rootPath = rootPath;
this.Description = description;
this.useIncrementedNameDuringTypeChange = useIncrementedNameDuringTypeChange;
}
public string ProviderKey
{
get
{
return "FileSystem_" + rootPath + "_Key";
}
}
public string Description { get; set; }
public string ProviderKey => "FileSystem_" + rootPath + "_Key";
public virtual LibraryProvider CreateLibraryProvider(LibraryProvider parentLibraryProvider, Action<LibraryProvider> setCurrentLibraryProvider)
{
return new LibraryProviderFileSystem(rootPath, Description, parentLibraryProvider, setCurrentLibraryProvider);
return new LibraryProviderFileSystem(
rootPath,
Description,
parentLibraryProvider,
setCurrentLibraryProvider,
this.useIncrementedNameDuringTypeChange);
}
}
@ -73,8 +76,13 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
private FileSystemWatcher directoryWatcher = new FileSystemWatcher();
private string keywordFilter = string.Empty;
private string rootPath;
private bool useIncrementedNameDuringTypeChange;
public LibraryProviderFileSystem(string rootPath, string name, LibraryProvider parentLibraryProvider, Action<LibraryProvider> setCurrentLibraryProvider)
public LibraryProviderFileSystem(
string rootPath, string name,
LibraryProvider parentLibraryProvider,
Action<LibraryProvider> setCurrentLibraryProvider,
bool useIncrementedNameDuringTypeChange = false)
: base(parentLibraryProvider, setCurrentLibraryProvider)
{
this.Name = name;
@ -82,6 +90,9 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
directoryWatcher.Path = rootPath;
// Indicates if the new AMF file should use the original file name incremented until no name collision occurs
this.useIncrementedNameDuringTypeChange = useIncrementedNameDuringTypeChange;
directoryWatcher.NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite
| NotifyFilters.FileName | NotifyFilters.DirectoryName;
directoryWatcher.Changed += DiretoryContentsChanged;
@ -123,12 +134,11 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
}
}
public override void ShareItem(int itemIndexToShare)
{
public override void ShareItem(int itemIndexToShare)
{
}
}
public override bool CanShare { get { return false; } }
public override bool CanShare { get { return false; } }
public override int ItemCount
{
@ -212,7 +222,12 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
string fileName = currentDirectoryFiles[itemIndex];
return Task.FromResult(new PrintItemWrapper(new DataStorage.PrintItem(GetPrintItemName(itemIndex), fileName), this.GetProviderLocator()));
var printItemWrapper = new PrintItemWrapper(new DataStorage.PrintItem(GetPrintItemName(itemIndex), fileName), this.GetProviderLocator())
{
UseIncrementedNameDuringTypeChange = true
};
return Task.FromResult(printItemWrapper);
}
public override LibraryProvider GetProviderForCollection(PrintItemCollection collection)