Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring Refactoring icon, part 2

Browse Source 
1. Add baidu, fix #576, #582
2. Refactoring
This commit is contained in:
bao-qian
2016-05-03 21:18:26 +01:00
parent 730864609f
commit 174c7a776e
21 changed files with 216 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
Wox.Infrastructure/Image/ImageLoader.cs
View File

@@ -5,6 +5,7 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Interop;
using System.Windows.Media;
@@ -57,7 +58,6 @@ namespace Wox.Infrastructure.Image
{
try
{
if (File.Exists(fileName) == false) return null;
Icon icon = GetFileIcon(fileName) ?? Icon.ExtractAssociatedIcon(fileName);
if (icon != null)
{
@@ -65,96 +65,93 @@ namespace Wox.Infrastructure.Image
new Int32Rect(0, 0, icon.Width, icon.Height), BitmapSizeOptions.FromEmptyOptions());
}
}
catch { }
catch (System.Exception e)
{
Log.Error(e);
}
return null;
}
public static void PreloadImages()
{
Stopwatch.Debug("Preload images from cache", () =>
var path = Path.Combine(Wox.ProgramPath, "Images", "app.png");
_imageSources[path] = new BitmapImage(new Uri(path));
Task.Factory.StartNew(() =>
{
_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;
}
});
Stopwatch.Debug("Preload images from cache", () =>
{
_cache.TopUsedImages.AsParallel().Where(i => !_imageSources.ContainsKey(i.Key)).ForAll(i =>
{
var img = Load(i.Key);
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;
}
});
});
});
Log.Info($"Preload {_cache.TopUsedImages.Count} images from cache");
}
public static ImageSource Load(string path, bool addToCache = true)
{
ImageSource image = null;
public static ImageSource Load(string path)
{
ImageSource image;
if (string.IsNullOrEmpty(path))
{
path = Path.Combine(Wox.ProgramPath, "Images", "app.png");
image = new BitmapImage(new Uri(path));
return image;
image = _imageSources[path];
}
Stopwatch.Debug($"Loading image path: {path}", () =>
else if (_imageSources.ContainsKey(path))
{
image = _imageSources[path];
}
else
{
string ext = Path.GetExtension(path).ToLower();
if (addToCache)
if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
{
_cache.Add(path);
image = new BitmapImage(new Uri(path));
_imageSources[path] = image;
}
if (_imageSources.ContainsKey(path))
else if (File.Exists(path) && Path.IsPathRooted(path))
{
image = _imageSources[path];
if (SelfExts.Contains(ext))
{
image = GetIcon(path);
_imageSources[path] = image;
}
else if (ImageExts.Contains(ext))
{
image = new BitmapImage(new Uri(path));
_imageSources[path] = image;
}
else
{
path = Path.Combine(Wox.ProgramPath, "Images", "app.png");
image = _imageSources[path];
}
}
else
{
string ext = Path.GetExtension(path).ToLower();
if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
path = Path.Combine(Wox.ProgramPath, "Images", Path.GetFileName(path));
if (File.Exists(path))
{
image = new BitmapImage(new Uri(path));
}
else if (SelfExts.Contains(ext) && File.Exists(path))
else
{
image = GetIcon(path);
}
else if (!string.IsNullOrEmpty(path) && ImageExts.Contains(ext))
{
if (File.Exists(path))
{
image = new BitmapImage(new Uri(path));
}
else
{
path = Path.Combine(Wox.ProgramPath, "Images", Path.GetFileName(path));
if (File.Exists(path))
{
image = new BitmapImage(new Uri(path));
}
else
{
path = Path.Combine(Wox.ProgramPath, "Images", "app.png");
image = new BitmapImage(new Uri(path));
}
}
}
if (image != null && addToCache)
{
if (!_imageSources.ContainsKey(path))
{
_imageSources[path] = image;
}
path = Path.Combine(Wox.ProgramPath, "Images", "app.png");
image = _imageSources[path];
}
}
});
}
return image;
}

3
Wox.Infrastructure/Image/ImagePathConverter.cs
View File

@@ -2,9 +2,8 @@ using System;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
using Wox.Infrastructure.Image;
namespace Wox.Converters
namespace Wox.Infrastructure.Image
{
public class ImagePathConverter : IValueConverter
{

1
Wox.Infrastructure/Wox.Infrastructure.csproj
View File

@@ -77,6 +77,7 @@
<Compile Include="Hotkey\KeyEvent.cs" />
<Compile Include="Image\ImageCache.cs" />
<Compile Include="Image\ImageLoader.cs" />
<Compile Include="Image\ImagePathConverter.cs" />
<Compile Include="Logger\Log.cs" />
<Compile Include="Storage\ISavable.cs" />
<Compile Include="Storage\PluginSettingsStorage.cs" />