CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-06-01 18:20:12 +12:00
Code Issues Projects Releases Wiki Activity

minor loop optimisations

Browse source
This commit is contained in:
Jack Baron 2020-02-23 15:22:29 +00:00
parent c317b65f30
commit f46fd8c92a
No known key found for this signature in database
GPG key ID: CD10BCEEC646C064
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ModAssistant/Classes/Themes.cs
View file

@ -232,16 +232,21 @@ namespace ModAssistant
foreach (string file in Directory.EnumerateFiles(directory).OrderBy(x => x))
{
FileInfo info = new FileInfo(file);
if (info.Name.EndsWith(".png", StringComparison.OrdinalIgnoreCase) &&
!info.Name.EndsWith(".side.png", StringComparison.OrdinalIgnoreCase))
bool isPng = info.Name.EndsWith(".png", StringComparison.OrdinalIgnoreCase);
bool isSidePng = info.Name.EndsWith(".side.png", StringComparison.OrdinalIgnoreCase);
bool isXaml = info.Name.EndsWith(".xaml", StringComparison.OrdinalIgnoreCase);
if (isPng && !isSidePng)
{
theme.Waifus.Background = new BitmapImage(new Uri(info.FullName));
}
if (info.Name.EndsWith(".side.png", StringComparison.OrdinalIgnoreCase))
if (isSidePng)
{
theme.Waifus.Sidebar = new BitmapImage(new Uri(info.FullName));
}
if (info.Name.EndsWith(".xaml", StringComparison.OrdinalIgnoreCase))
if (isXaml)
{
Uri resourceSource = new Uri(info.FullName);
ResourceDictionary dictionary = new ResourceDictionary();
@ -303,12 +308,16 @@ namespace ModAssistant
{
foreach (ZipArchiveEntry file in archive.Entries)
{
if (file.Name.EndsWith(".png", StringComparison.OrdinalIgnoreCase) &&
!file.Name.EndsWith(".side.png", StringComparison.OrdinalIgnoreCase))
bool isPng = file.Name.EndsWith(".png", StringComparison.OrdinalIgnoreCase);
bool isSidePng = file.Name.EndsWith(".side.png", StringComparison.OrdinalIgnoreCase);
bool isXaml = file.Name.EndsWith(".xaml", StringComparison.OrdinalIgnoreCase);
if (isPng && !isSidePng)
{
waifus.Background = GetImageFromStream(Utils.StreamToArray(file.Open()));
}
if (file.Name.EndsWith(".side.png", StringComparison.OrdinalIgnoreCase))
if (isSidePng)
{
waifus.Sidebar = GetImageFromStream(Utils.StreamToArray(file.Open()));
}
@ -338,22 +347,21 @@ namespace ModAssistant
}
}
}
if (file.Name.EndsWith(".xaml", StringComparison.OrdinalIgnoreCase))
if (isXaml && loadedThemes.ContainsKey(name) == false)
{
if (!loadedThemes.ContainsKey(name))
try
{
try
{
dictionary = (ResourceDictionary)XamlReader.Load(file.Open());
}
catch (Exception ex)
{
MessageBox.Show($"Could not load {name}.\n\n{ex.Message}\n\nIgnoring...");
}
dictionary = (ResourceDictionary)XamlReader.Load(file.Open());
}
catch (Exception ex)
{
MessageBox.Show($"Could not load {name}.\n\n{ex.Message}\n\nIgnoring...");
}
}
}
}
Theme theme = new Theme(name, dictionary);
theme.Waifus = waifus;
return theme;