converted oemprofiles to be .printer files and to be retrieved as such from various locations.

Updated to test to reflect the actions actually done by the request (not sure why they were not failing before)
This commit is contained in:
Matt Moening 2016-07-20 17:39:08 -07:00
parent ecbb567c17
commit d96531152b
5 changed files with 14 additions and 14 deletions

View file

@ -371,12 +371,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
string deviceToken = OemSettings.Instance.OemProfiles[make][model];
return MatterControlApplication.LoadCacheable<PrinterSettings>(
String.Format("{0}.json", deviceToken),
String.Format("{0}{1}", deviceToken, ProfileManager.ProfileExtension),
"profiles",
() =>
{
string responseText = null;
if(!File.Exists(Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles",String.Format("{0}.json",deviceToken))))
if(!File.Exists(Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "data", "temp", "cache", "profiles",String.Format("{0}{1}",deviceToken, ProfileManager.ProfileExtension))))
{
responseText = RetrievePublicProfileRequest.DownloadPrinterProfile(deviceToken);
}