ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unified ImageFileCache implementations

Browse source
This commit is contained in:
Clemens 2021-06-30 12:18:21 +02:00
parent 903faa9fb8
commit 3dc3db1d79
2 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
MapControl/UWP/ImageFileCache.UWP.cs
View file

@ -17,44 +17,34 @@ namespace MapControl.Caching
{ {
private const string expiresTag = "EXPIRES:"; private const string expiresTag = "EXPIRES:";
private readonly string folderPath; private readonly string rootDirectory;
public ImageFileCache(StorageFolder folder) public ImageFileCache(StorageFolder folder)
: this(folder.Path) : this(folder.Path)
{ {
} }
public ImageFileCache(string path) public ImageFileCache(string directory)
{ {
folderPath = path; if (string.IsNullOrEmpty(directory))
Debug.WriteLine("Created ImageFileCache in " + folderPath); {
throw new ArgumentException("The directory argument must not be null or empty.", nameof(directory));
}
rootDirectory = directory;
Debug.WriteLine("Created ImageFileCache in " + rootDirectory);
} }
public async Task<ImageCacheItem> GetAsync(string key) public async Task<ImageCacheItem> GetAsync(string key)
{ {
ImageCacheItem imageCacheItem = null; ImageCacheItem imageCacheItem = null;
string path; var path = GetPath(key);
try try
{ {
path = Path.Combine(GetPathElements(key)); if (path != null && File.Exists(path))
}
catch (Exception ex)
{ {
Debug.WriteLine("ImageFileCache: Invalid key {0}: {1}", key, ex.Message); var buffer = await File.ReadAllBytesAsync(path);
return imageCacheItem;
}
var folder = await StorageFolder.GetFolderFromPathAsync(folderPath);
var item = await folder.TryGetItemAsync(path);
if (item != null && item.IsOfType(StorageItemTypes.File))
{
var file = (StorageFile)item;
try
{
var buffer = (await FileIO.ReadBufferAsync(file)).ToArray();
var expiration = GetExpiration(ref buffer); var expiration = GetExpiration(ref buffer);
imageCacheItem = new ImageCacheItem imageCacheItem = new ImageCacheItem
@ -63,12 +53,12 @@ namespace MapControl.Caching
Expiration = expiration Expiration = expiration
}; };
//Debug.WriteLine("ImageFileCache: Read {0}, Expires {1}", file.Path, expiration.ToLocalTime()); //Debug.WriteLine("ImageFileCache: Read {0}, Expires {1}", path, expiration.ToLocalTime());
}
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine("ImageFileCache: Failed reading {0}: {1}", file.Path, ex.Message); Debug.WriteLine("ImageFileCache: Failed reading {0}: {1}", path, ex.Message);
}
} }
return imageCacheItem; return imageCacheItem;
@ -76,40 +66,42 @@ namespace MapControl.Caching
public async Task SetAsync(string key, IBuffer buffer, DateTime expiration) public async Task SetAsync(string key, IBuffer buffer, DateTime expiration)
{ {
if (buffer != null && buffer.Length > 0) string path;
{
var folders = GetPathElements(key);
if (buffer != null && buffer.Length > 0 && (path = GetPath(key)) != null)
{
try try
{ {
var folder = await StorageFolder.GetFolderFromPathAsync(folderPath); Directory.CreateDirectory(Path.GetDirectoryName(path));
for (int i = 0; i < folders.Length - 1; i++) using (var stream = File.Create(path).AsOutputStream())
{
folder = await folder.CreateFolderAsync(folders[i], CreationCollisionOption.OpenIfExists);
}
var file = await folder.CreateFileAsync(folders[folders.Length - 1], CreationCollisionOption.ReplaceExisting);
//Debug.WriteLine("ImageFileCache: Write {0}, Expires {1}", file.Path, expiration.ToLocalTime());
using (var stream = await file.OpenAsync(FileAccessMode.ReadWrite))
{ {
await stream.WriteAsync(buffer); await stream.WriteAsync(buffer);
await stream.WriteAsync(Encoding.ASCII.GetBytes(expiresTag).AsBuffer()); await stream.WriteAsync(Encoding.ASCII.GetBytes(expiresTag).AsBuffer());
await stream.WriteAsync(BitConverter.GetBytes(expiration.Ticks).AsBuffer()); await stream.WriteAsync(BitConverter.GetBytes(expiration.Ticks).AsBuffer());
} }
//Debug.WriteLine("ImageFileCache: Wrote {0}, Expires {1}", path, expiration.ToLocalTime());
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine("ImageFileCache: Failed writing {0}: {1}", Path.Combine(folderPath, Path.Combine(folders)), ex.Message); Debug.WriteLine("ImageFileCache: Failed writing {0}: {1}", path, ex.Message);
} }
} }
} }
private static string[] GetPathElements(string key) private string GetPath(string key)
{ {
return key.Split('\\', '/', ',', ':', ';'); try
{
return Path.Combine(rootDirectory, Path.Combine(key.Split('/', ':', ';', ',')));
}
catch (Exception ex)
{
Debug.WriteLine("ImageFileCache: Invalid key {0}/{1}: {2}", rootDirectory, key, ex.Message);
}
return null;
} }
private static DateTime GetExpiration(ref byte[] buffer) private static DateTime GetExpiration(ref byte[] buffer)

4
MapControl/WPF/ImageFileCache.WPF.cs
View file

@ -176,8 +176,6 @@ namespace MapControl.Caching
{ {
try try
{ {
//Debug.WriteLine("ImageFileCache: Write {0}, Expires {1}", path, imageCacheItem.Expiration.ToLocalTime());
Directory.CreateDirectory(Path.GetDirectoryName(path)); Directory.CreateDirectory(Path.GetDirectoryName(path));
using (var stream = File.Create(path)) using (var stream = File.Create(path))
@ -191,6 +189,8 @@ namespace MapControl.Caching
var fileSecurity = fileInfo.GetAccessControl(); var fileSecurity = fileInfo.GetAccessControl();
fileSecurity.AddAccessRule(fullControlRule); fileSecurity.AddAccessRule(fullControlRule);
fileInfo.SetAccessControl(fileSecurity); fileInfo.SetAccessControl(fileSecurity);
//Debug.WriteLine("ImageFileCache: Wrote {0}, Expires {1}", path, imageCacheItem.Expiration.ToLocalTime());
} }
catch (Exception ex) catch (Exception ex)
{ {