Unified ImageFileCache implementations

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

View file

@ -17,44 +17,34 @@ namespace MapControl.Caching
{
private const string expiresTag = "EXPIRES:";
private readonly string folderPath;
private readonly string rootDirectory;
public ImageFileCache(StorageFolder folder)
: this(folder.Path)
{
}
public ImageFileCache(string path)
public ImageFileCache(string directory)
{
folderPath = path;
Debug.WriteLine("Created ImageFileCache in " + folderPath);
if (string.IsNullOrEmpty(directory))
{
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)
{
ImageCacheItem imageCacheItem = null;
string path;
var path = GetPath(key);
try
{
path = Path.Combine(GetPathElements(key));
}
catch (Exception ex)
{
Debug.WriteLine("ImageFileCache: Invalid key {0}: {1}", key, ex.Message);
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
if (path != null && File.Exists(path))
{
var buffer = (await FileIO.ReadBufferAsync(file)).ToArray();
var buffer = await File.ReadAllBytesAsync(path);
var expiration = GetExpiration(ref buffer);
imageCacheItem = new ImageCacheItem
@ -63,53 +53,55 @@ namespace MapControl.Caching
Expiration = expiration
};
//Debug.WriteLine("ImageFileCache: Read {0}, Expires {1}", file.Path, expiration.ToLocalTime());
}
catch (Exception ex)
{
Debug.WriteLine("ImageFileCache: Failed reading {0}: {1}", file.Path, ex.Message);
//Debug.WriteLine("ImageFileCache: Read {0}, Expires {1}", path, expiration.ToLocalTime());
}
}
catch (Exception ex)
{
Debug.WriteLine("ImageFileCache: Failed reading {0}: {1}", path, ex.Message);
}
return imageCacheItem;
}
public async Task SetAsync(string key, IBuffer buffer, DateTime expiration)
{
if (buffer != null && buffer.Length > 0)
{
var folders = GetPathElements(key);
string path;
if (buffer != null && buffer.Length > 0 && (path = GetPath(key)) != null)
{
try
{
var folder = await StorageFolder.GetFolderFromPathAsync(folderPath);
Directory.CreateDirectory(Path.GetDirectoryName(path));
for (int i = 0; i < folders.Length - 1; i++)
{
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))
using (var stream = File.Create(path).AsOutputStream())
{
await stream.WriteAsync(buffer);
await stream.WriteAsync(Encoding.ASCII.GetBytes(expiresTag).AsBuffer());
await stream.WriteAsync(BitConverter.GetBytes(expiration.Ticks).AsBuffer());
}
//Debug.WriteLine("ImageFileCache: Wrote {0}, Expires {1}", path, expiration.ToLocalTime());
}
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)

View file

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