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

Refactor for clarity, conciseness

Browse source
This commit is contained in:
John Lewin 2016-07-24 08:21:59 -07:00
parent 30ca54f800
commit 135b4df7ad
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -374,19 +374,24 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private async static Task<PrinterSettings> LoadHttpOemProfile(string make, string model) private async static Task<PrinterSettings> LoadHttpOemProfile(string make, string model)
{ {
string deviceToken = OemSettings.Instance.OemProfiles[make][model]; string deviceToken = OemSettings.Instance.OemProfiles[make][model];
string cacheKey = deviceToken + ProfileManager.ProfileExtension;
string cachePath = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles", cacheKey);
return await ApplicationController.LoadCacheableAsync<PrinterSettings>( return await ApplicationController.LoadCacheableAsync<PrinterSettings>(
String.Format("{0}{1}", deviceToken, ProfileManager.ProfileExtension), cacheKey,
"profiles", "profiles",
() => () =>
{ {
string responseText = null; string responseText = null;
if(!File.Exists(Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles",String.Format("{0}{1}",deviceToken, ProfileManager.ProfileExtension)))) if(!File.Exists(cachePath))
{ {
// If the cache file for the current deviceToken does not exist, attempt to download it
responseText = RetrievePublicProfileRequest.DownloadPrinterProfile(deviceToken); responseText = RetrievePublicProfileRequest.DownloadPrinterProfile(deviceToken);
} }
return Task.FromResult(responseText); return Task.FromResult(responseText);
}, },
Path.Combine("Profiles",make,String.Format("{0}{1}",model,ProfileManager.ProfileExtension))); Path.Combine("Profiles",make, model + ProfileManager.ProfileExtension));
} }
public void EnsurePrintersImported() public void EnsurePrintersImported()