mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-13 11:09:28 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Refactoring image cache

Browse Source 
use parallel linq to preload images, should be faster
This commit is contained in:
bao-qian 2016-04-21 23:37:40 +01:00
parent 80f31f75ad
commit 03051a95cf
7 changed files with 48 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wox.Core/Wox.Core.csproj
View File

@ -84,7 +84,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resource\FontHelper.cs" />
<Compile Include="Resource\Theme.cs" />
<Compile Include="UserSettings\PluginConfig.cs" />
<Compile Include="UserSettings\PluginSettings.cs" />
<Compile Include="UserSettings\PluginHotkey.cs" />
<Compile Include="UserSettings\Settings.cs" />
<Compile Include="Updater\SemanticVersion.cs" />

6
Wox/App.xaml.cs
View File

@ -23,7 +23,7 @@ namespace Wox
{
private const string Unique = "Wox_Unique_Application_Mutex";
public static MainWindow Window { get; private set; }
public static ImageLoader.ImageLoader ImageLoader;
public static PublicAPIInstance API { get; private set; }
[STAThread]
@ -48,7 +48,9 @@ namespace Wox
ThreadPool.SetMaxThreads(30, 10);
ThreadPool.SetMinThreads(10, 5);
ThreadPool.QueueUserWorkItem(_ => { ImageLoader.ImageLoader.PreloadImages(); });
ImageLoader = new ImageLoader.ImageLoader();
ThreadPool.QueueUserWorkItem(_ => { ImageLoader.PreloadImages(); });
PluginManager.Initialize();

3
Wox/Converters/ImagePathConverter.cs
View File

@ -13,8 +13,7 @@ namespace Wox.Converters
{
return null;
}
return ImageLoader.ImageLoader.Load(value.ToString());
return App.ImageLoader.Load(value.ToString());
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

32
Wox/ImageLoader/ImageCache.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using Wox.Infrastructure.Storage;
@ -8,39 +9,26 @@ namespace Wox.ImageLoader
[Serializable]
public class ImageCache
{
private int counter;
private const int maxCached = 200;
public Dictionary<string, int> TopUsedImages = new Dictionary<string, int>();
private const int MaxCached = 200;
public ConcurrentDictionary<string, int> TopUsedImages = new ConcurrentDictionary<string, int>();
public void Add(string path)
{
if (TopUsedImages.ContainsKey(path))
{
TopUsedImages[path] = TopUsedImages[path] + 1 ;
TopUsedImages[path] = TopUsedImages[path] + 1;
}
else
{
TopUsedImages.Add(path, 1);
TopUsedImages[path] = 1;
}
if (TopUsedImages.Count > maxCached)
if (TopUsedImages.Count > MaxCached)
{
TopUsedImages = TopUsedImages.OrderByDescending(o => o.Value)
.Take(maxCached)
.ToDictionary(i => i.Key, i => i.Value);
}
if (++counter == 30)
{
counter = 0;
}
}
public void Remove(string path)
{
if (TopUsedImages.ContainsKey(path))
{
TopUsedImages.Remove(path);
var images = TopUsedImages.OrderByDescending(o => o.Value)
.Take(MaxCached)
.ToDictionary(i => i.Key, i => i.Value);
TopUsedImages = new ConcurrentDictionary<string, int>(images);
}
}
}

63
Wox/ImageLoader/ImageLoader.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
@ -7,6 +8,7 @@ using System.Windows;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Linq;
using Wox.Infrastructure;
using Wox.Infrastructure.Storage;
@ -14,9 +16,9 @@ namespace Wox.ImageLoader
{
public class ImageLoader
{
private static readonly Dictionary<string, ImageSource> ImageSources = new Dictionary<string, ImageSource>();
private readonly ConcurrentDictionary<string, ImageSource> ImageSources = new ConcurrentDictionary<string, ImageSource>();
private static readonly List<string> imageExts = new List<string>
private readonly List<string> ImageExts = new List<string>
{
".png",
".jpg",
@ -27,7 +29,7 @@ namespace Wox.ImageLoader
".ico"
};
private static readonly List<string> selfExts = new List<string>
private readonly List<string> SelfExts = new List<string>
{
".exe",
".lnk",
@ -37,10 +39,10 @@ namespace Wox.ImageLoader
".appref-ms"
};
private static readonly ImageCache _cache;
private static readonly BinaryStorage<ImageCache> _storage;
private readonly ImageCache _cache;
private readonly BinaryStorage<ImageCache> _storage;
static ImageLoader()
public ImageLoader()
{
_storage = new BinaryStorage<ImageCache>();
_cache = _storage.Load();
@ -51,7 +53,7 @@ namespace Wox.ImageLoader
_storage.Save();
}
private static ImageSource GetIcon(string fileName)
private ImageSource GetIcon(string fileName)
{
try
{
@ -68,32 +70,28 @@ namespace Wox.ImageLoader
return null;
}
public static void PreloadImages()
public void PreloadImages()
{
//ImageCacheStroage.Instance.TopUsedImages can be changed during foreach, so we need to make a copy
var imageList = new Dictionary<string, int>(_cache.TopUsedImages);
Stopwatch.Debug($"Preload {imageList.Count} images", () =>
Stopwatch.Debug($"Preload {_cache.TopUsedImages.Count} images", () =>
{
foreach (var image in imageList)
{
if (!ImageSources.ContainsKey(image.Key))
{
ImageSource img = Load(image.Key, false);
if (img != null)
{
img.Freeze(); //to make it copy to UI thread
if (!ImageSources.ContainsKey(image.Key))
{
KeyValuePair<string, int> copyedImg = image;
ImageSources.Add(copyedImg.Key, img);
}
}
}
}
_cache.TopUsedImages.AsParallel().Where(i => !ImageSources.ContainsKey(i.Key)).ForAll(i =>
{
var img = Load(i.Key, false);
if (img != null)
{
// todo happlebao magic
// the image created on other threads can be accessed from main ui thread,
// this line made it possible
// should be changed the Dispatcher.InvokeAsync in the future
img.Freeze();
ImageSources[i.Key] = img;
}
});
});
}
public static ImageSource Load(string path, bool addToCache = true)
public ImageSource Load(string path, bool addToCache = true)
{
if (string.IsNullOrEmpty(path)) return null;
ImageSource img = null;
@ -118,21 +116,20 @@ namespace Wox.ImageLoader
{
img = new BitmapImage(new Uri(path));
}
else if (selfExts.Contains(ext) && File.Exists(path))
else if (SelfExts.Contains(ext) && File.Exists(path))
{
img = GetIcon(path);
}
else if (!string.IsNullOrEmpty(path) && imageExts.Contains(ext) && File.Exists(path))
else if (!string.IsNullOrEmpty(path) && ImageExts.Contains(ext) && File.Exists(path))
{
img = new BitmapImage(new Uri(path));
}
if (img != null && addToCache)
{
if (!ImageSources.ContainsKey(path))
{
ImageSources.Add(path, img);
ImageSources[path] = img;
}
}
}
@ -141,7 +138,7 @@ namespace Wox.ImageLoader
}
// http://blogs.msdn.com/b/oldnewthing/archive/2011/01/27/10120844.aspx
private static Icon GetFileIcon(string name)
private Icon GetFileIcon(string name)
{
SHFILEINFO shfi = new SHFILEINFO();
uint flags = SHGFI_SYSICONINDEX;

2
Wox/SettingWindow.xaml.cs
View File

@ -550,7 +550,7 @@ namespace Wox
pluginAuthor.Text = InternationalizationManager.Instance.GetTranslation("author") + ": " + pair.Metadata.Author;
pluginSubTitle.Text = pair.Metadata.Description;
pluginId = pair.Metadata.ID;
pluginIcon.Source = ImageLoader.ImageLoader.Load(pair.Metadata.FullIcoPath);
pluginIcon.Source = App.ImageLoader.Load(pair.Metadata.FullIcoPath);
var customizedPluginConfig = _settings.PluginSettings[pluginId];
cbDisablePlugin.IsChecked = customizedPluginConfig != null && customizedPluginConfig.Disabled;

2
Wox/Wox.csproj
View File

@ -125,7 +125,7 @@
<Compile Include="Converters\StringNullOrEmptyToVisibilityConverter.cs" />
<Compile Include="Helper\VisibilityExtensions.cs" />
<Compile Include="Helper\SingletonWindowOpener.cs" />
<Compile Include="ImageLoader\ImageCacheStroage.cs" />
<Compile Include="ImageLoader\ImageCache.cs" />
<Compile Include="NotifyIconManager.cs" />
<Compile Include="PublicAPIInstance.cs" />
<Compile Include="ResultListBox.xaml.cs">