Add exclusive mode to macos. Fixes #63

jamesmontemagno · Jul 26, 2019 · 9e53326 · 9e53326
1 parent 0a97103
commit 9e53326
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj b/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/1.6.61">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.31">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299</TargetFrameworks>

diff --git a/src/MonkeyCache.LiteDB/Barrel.cs b/src/MonkeyCache.LiteDB/Barrel.cs
@@ -45,8 +45,17 @@ public static IBarrel Create(string cacheDirectory)
 				Directory.CreateDirectory(directory);
 			}
 
+#if __MACOS__
+
+			if (!string.IsNullOrWhiteSpace(EncryptionKey))
+				path = $"Filename={path}; Password={EncryptionKey}; Mode=Exclusive";
+			else
+				path = $"Filename={path}; Mode=Exclusive";
+#else
+
 			if (!string.IsNullOrWhiteSpace(EncryptionKey))
 				path = $"Filename={path}; Password={EncryptionKey}";
+#endif
 
 			db = new LiteDatabase(path);
 			col = db.GetCollection<Banana>();
@@ -59,7 +68,7 @@ public static IBarrel Create(string cacheDirectory)
 			};
 		}
 
-		#region Exist and Expiration Methods
+#region Exist and Expiration Methods
 		/// <summary>
 		/// Checks to see if the key exists in the Barrel.
 		/// </summary>
@@ -93,9 +102,9 @@ public bool IsExpired(string key)
 			return DateTime.UtcNow > ent.ExpirationDate.ToUniversalTime();
 		}
 
-		#endregion
+#endregion
 
-		#region Get Methods
+#region Get Methods
 		/// <summary>
 		/// Gets all the keys that are saved in the cache
 		/// </summary>
@@ -190,9 +199,9 @@ public string GetETag(string key)
 			return ent.ExpirationDate;
 		}
 
-		#endregion
+#endregion
 
-		#region Add Methods
+#region Add Methods
 
 		/// <summary>
 		/// Adds a string netry to the barrel
@@ -249,9 +258,9 @@ public void Add<T>(string key, T data, TimeSpan expireIn, string eTag = null, Js
 			Add(key, dataJson, expireIn, eTag);
 		}
 
-		#endregion
+#endregion
 
-		#region Empty Methods
+#region Empty Methods
 		/// <summary>
 		/// Empties all expired entries that are in the Barrel.
 		/// Throws an exception if any deletions fail and rolls back changes.
@@ -279,6 +288,6 @@ public void Empty(params string[] key)
 				col.Delete(k);
 			}
 		}
-		#endregion
+#endregion
 	}
 }
diff --git a/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj b/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/1.6.61">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.31">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299</TargetFrameworks>

diff --git a/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj b/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/1.6.61">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.31">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299</TargetFrameworks>

diff --git a/src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj b/src/MonkeyCache.TestApp/MonkeyCache.TestApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/MonkeyCache/MonkeyCache.csproj b/src/MonkeyCache/MonkeyCache.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/1.6.61">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.31">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;Xamarin.WatchOS10;Xamarin.TVOS10;Xamarin.iOS10;MonoAndroid71;MonoAndroid80;MonoAndroid81;MonoAndroid90;Xamarin.Mac20;uap10.0.16299</TargetFrameworks>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>