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

Load public profiles from Static Data before launching request to web server in new task

Browse source 
This reduced loading time for public profiles from 5200-5300ms to 2ms
Loadcacheable can now fall back to Static data if passed a path for it
This commit is contained in:
Matt Moening 2016-07-21 14:23:22 -07:00
parent 6e0f9a0530
commit 97d3615755
3 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
SettingsManagement/OemSettings.cs
View file

@ -124,10 +124,19 @@ namespace MatterHackers.MatterControl.SettingsManagement
[OnDeserialized]
private void Deserialized(StreamingContext context)
{
var oemProfiles = MatterControlApplication.LoadCacheable<Dictionary<string, Dictionary<string, string>>>(
"oemprofiles.json",
//Load from Static Data to prepopulate oemProfiles for when user create a printer before load cacheable is done
var staticDataList = JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(StaticData.Instance.ReadAllText(Path.Combine("Profiles","allModels.json")));
var oemProfs = staticDataList.Select(x => new KeyValuePair<string,Dictionary<string,string>>(x.Key ,x.Value.ToDictionary(y=>y,y=>y))).ToDictionary(x=>x.Key,x=>x.Value);
OemProfiles = oemProfs;
var manufacturesList = staticDataList.Select(m => new KeyValuePair<string, string>(m.Key, m.Key)).ToList();
SetManufacturers(manufacturesList);
//Attempt to update from online
Task.Run(() =>
{
var oemProfiles = MatterControlApplication.LoadCacheable<Dictionary<string, Dictionary<string, string>>>(
"oemprofiles.json",
"profiles",
() =>
() =>
{
string responseText = null;
@ -143,19 +152,24 @@ namespace MatterHackers.MatterControl.SettingsManagement
return responseText;
});
OemProfiles = oemProfiles;
var manufactures = oemProfiles.Select(m => new KeyValuePair<string, string>(m.Key, m.Key)).ToList();
// sort by value (printer name)
manufactures.Sort(
delegate (KeyValuePair<string, string> pair1,
KeyValuePair<string, string> pair2)
//If we failed to get anything from load cacheable dont override potentally populated feilds
if(oemProfiles != default(Dictionary < string, Dictionary < string, string>>))
{
return pair1.Value.CompareTo(pair2.Value);
OemProfiles = oemProfiles;
var manufactures = oemProfiles.Select(m => new KeyValuePair<string, string>(m.Key, m.Key)).ToList();
// sort by value (printer name)
manufactures.Sort(
delegate (KeyValuePair<string, string> pair1,
KeyValuePair<string, string> pair2)
{
return pair1.Value.CompareTo(pair2.Value);
}
);
SetManufacturers(manufactures);
Task.Run((Action)downloadMissingProfiles);
}
);
SetManufacturers(manufactures);
Task.Run((Action)downloadMissingProfiles);
});
}
private void downloadMissingProfiles()