Merge branch 'master' of https://github.com/jamesmontemagno/monkey-cache

README.md

@@ -35,7 +35,7 @@ Monkey Cache is a .NET Standard 2.0 library, but has some platform specific twea
 |Windows 10 UWP|10.0.16299+|
 |.NET Core|2.0+|
 |ASP.NET Core|2.0+|
-|.NET|4.6.1+|
+|.NET Framework|4.6.1+|
 
 ## Setup
 
@@ -173,7 +173,7 @@ Cache will always be stored in the default platform specific location:
 |Windows 10 UWP|Windows.Storage.ApplicationData.Current.LocalFolder.Path|
 |.NET Core|Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)|
 |ASP.NET Core|Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)|
-|.NET|Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)|
+|.NET Framework|Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)|
 
 
 #### Persisting Data Longer

src/MonkeyCache.FileStore/Barrel.cs

@@ -14,8 +14,14 @@ public class Barrel : IBarrel
 		ReaderWriterLockSlim indexLocker;
 		readonly JsonSerializerSettings jsonSettings;
 		Lazy<string> baseDirectory;
+		HashAlgorithm hashAlgorithm;
 
-		Barrel(string cacheDirectory = null)
+		/// <summary>
+		/// FileStore Barrel constructor
+		/// </summary>
+		/// <param name="cacheDirectory">Optionally specify directory where cache will live</param>
+		/// <param name="hash">Optionally specify hash algorithm</param>
+		Barrel(string cacheDirectory = null, HashAlgorithm hash = null)
 		{
 			baseDirectory = new Lazy<string>(() =>
 			{
@@ -24,6 +30,10 @@ public class Barrel : IBarrel
 					: cacheDirectory;
 			});
 
+			hashAlgorithm = hash;
+			if (hashAlgorithm == null)
+				hashAlgorithm = MD5.Create();
+
 			indexLocker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
 			jsonSettings = new JsonSerializerSettings
@@ -50,8 +60,13 @@ public class Barrel : IBarrel
 		/// </summary>
 		public static IBarrel Current => (instance ?? (instance = new Barrel()));
 
-		public static IBarrel Create(string cacheDirectory) =>
-			new Barrel(cacheDirectory);
+		/// <summary>
+		/// FileStore Barrel
+		/// </summary>
+		/// <param name="cacheDirectory">Optionally specify directory where cache will live</param>
+		/// <param name="hash">Optionally specify hash algorithm</param>
+		public static IBarrel Create(string cacheDirectory, HashAlgorithm hash = null) =>
+			new Barrel(cacheDirectory, hash);
 
 		/// <summary>
 		/// Adds an entry to the barrel
@@ -456,10 +471,9 @@ void LoadIndex()
 			}
 		}
 
-		static string Hash(string input)
+		string Hash(string input)
 		{
-			var md5Hasher = MD5.Create();
-			var data = md5Hasher.ComputeHash(Encoding.Default.GetBytes(input));
+			var data = hashAlgorithm.ComputeHash(Encoding.Default.GetBytes(input));
 			return BitConverter.ToString(data);
 		}
 

src/MonkeyCache.LiteDB/Barrel.cs

@@ -15,6 +15,7 @@ public class Barrel : IBarrel
 	{
 		public static string ApplicationId { get; set; } = string.Empty;
 		public static string EncryptionKey { get; set; } = string.Empty;
+		public static bool Upgrade { get; set; } = false;
 
 		static readonly Lazy<string> baseCacheDir = new Lazy<string>(() =>
 		{
@@ -63,7 +64,11 @@ public static IBarrel Create(string cacheDirectory, bool cache = false)
 
 			if (!string.IsNullOrWhiteSpace(EncryptionKey))
 				path = $"Filename={path}; Password={EncryptionKey}";
+			else
+				path = $"Filename={path}";
 #endif
+			if(Upgrade)
+				path += "; Upgrade=true";
 
 			db = new LiteDatabase(path);
 			col = db.GetCollection<Banana>();
@@ -301,4 +306,4 @@ public void Empty(params string[] key)
 		}
 #endregion
 	}
-}
+}

src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj

@@ -62,6 +62,7 @@
 	</PropertyGroup>
 
 
+
 	<ItemGroup>
 		<PackageReference Include="LiteDB" Version="5.0.11" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

src/MonkeyCache.TestApp.Android/MonkeyCache.TestApp.Android.csproj

@@ -108,4 +108,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+</Project>

src/MonkeyCache.TestApp.UWP/MonkeyCache.TestApp.UWP.csproj

@@ -183,4 +183,4 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-</Project>
+</Project>

src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj

@@ -25,4 +25,4 @@
       <DependentUpon>*.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-</Project>
+</Project>