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

Make LoadCacheable async

Browse source 
- Collector func<string> becomes async
 - Propagate async to LoadCacheable callers
This commit is contained in:
John Lewin 2016-07-22 13:57:55 -07:00
parent fb23f3cca9
commit 6f394c7c1f
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ApplicationView/MainApplicationWidget.cs
View file

@ -174,6 +174,7 @@ namespace MatterHackers.MatterControl
public static Func<string, Task<Dictionary<string, string>>> GetProfileHistory;
public static Func<PrinterInfo,string, Task> GetPrinterProfile;
public static Func<Task> SyncPrinterProfiles;
public static Func<Task<string>> GetPublicProfileList;
public SlicePresetsWindow EditMaterialPresetsWindow { get; set; }
@ -214,7 +215,7 @@ namespace MatterHackers.MatterControl
/// </summary>
/// <param name="collector">The custom collector function to load the content</param>
/// <returns></returns>
public static T LoadCacheable<T>(string cacheKey, string cacheScope, Func<string> collector, string staticDataFallbackPath = null) where T : class
public async static Task<T> LoadCacheableAsync<T>(string cacheKey, string cacheScope, Func<Task<string>> collector, string staticDataFallbackPath = null) where T : class
{
string cacheDirectory = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", cacheScope);
string cachePath = Path.Combine(cacheDirectory, cacheKey);
@ -225,7 +226,7 @@ namespace MatterHackers.MatterControl
try
{
// Try to update the document
string documentText = collector();
string documentText = await collector();
if (!string.IsNullOrEmpty(documentText))
{