Code Quality: Downgrade LiteDB to fix transaction issue (#15217)

hez2010 · web-flow · commit 094723752bac · 2024-04-17T09:00:13.000-07:00
diff --git a/src/Files.App.Server/Database/FileTagsDatabase.cs b/src/Files.App.Server/Database/FileTagsDatabase.cs
@@ -13,37 +13,29 @@ namespace Files.App.Server.Database
 {
 	public sealed class FileTagsDatabase
 	{
-		private static LiteDatabase _database = default!;
-		private static readonly object _lockObject = new();
-
 		private const string TaggedFiles = "taggedfiles";
+		private readonly static LiteDatabase Database;
+		private readonly static string FileTagsDbPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "filetags.db");
 
-		public static string FileTagsDbPath 
-			=> Path.Combine(ApplicationData.Current.LocalFolder.Path, "filetags.db");
-
-		public FileTagsDatabase()
+		static FileTagsDatabase()
 		{
-			lock (_lockObject)
-			{
-				if (_database is null)
-				{
-					SafetyExtensions.IgnoreExceptions(() => CheckDbVersion(FileTagsDbPath));
+			SafetyExtensions.IgnoreExceptions(() => CheckDbVersion(FileTagsDbPath));
 
-					_database = new LiteDatabase(new ConnectionString(FileTagsDbPath)
-					{
-						Connection = ConnectionType.Direct,
-						Upgrade = true
-					});
+			Database = new LiteDatabase(new ConnectionString(FileTagsDbPath)
+			{
+				Connection = ConnectionType.Direct,
+				Upgrade = true
+			});
 
-					UpdateDb();
-				}
-			}
+			UpdateDb();
 		}
 
+		public static string GetFileTagsDbPath() => FileTagsDbPath;
+
 		public void SetTags(string filePath, ulong? frn, [ReadOnlyArray] string[] tags)
 		{
 			// Get a collection (or create, if doesn't exist)
-			var col = _database.GetCollection<TaggedFile>(TaggedFiles);
+			var col = Database.GetCollection<TaggedFile>(TaggedFiles);
 
 			var tmp = FindTag(filePath, frn);
 			if (tmp is null)
@@ -81,7 +73,7 @@ public void SetTags(string filePath, ulong? frn, [ReadOnlyArray] string[] tags)
 		private TaggedFile? FindTag(string? filePath, ulong? frn)
 		{
 			// Get a collection (or create, if doesn't exist)
-			var col = _database.GetCollection<TaggedFile>(TaggedFiles);
+			var col = Database.GetCollection<TaggedFile>(TaggedFiles);
 
 			if (filePath is not null)
 			{
@@ -122,7 +114,7 @@ public void SetTags(string filePath, ulong? frn, [ReadOnlyArray] string[] tags)
 		public void UpdateTag(string oldFilePath, ulong? frn, string? newFilePath)
 		{
 			// Get a collection (or create, if doesn't exist)
-			var col = _database.GetCollection<TaggedFile>(TaggedFiles);
+			var col = Database.GetCollection<TaggedFile>(TaggedFiles);
 			var tmp = col.FindOne(x => x.FilePath == oldFilePath);
 			if (tmp is not null)
 			{
@@ -144,7 +136,7 @@ public void UpdateTag(string oldFilePath, ulong? frn, string? newFilePath)
 		public void UpdateTag(ulong oldFrn, ulong? frn, string? newFilePath)
 		{
 			// Get a collection (or create, if doesn't exist)
-			var col = _database.GetCollection<TaggedFile>(TaggedFiles);
+			var col = Database.GetCollection<TaggedFile>(TaggedFiles);
 			var tmp = col.FindOne(x => x.Frn == oldFrn);
 			if (tmp is not null)
 			{
@@ -169,13 +161,13 @@ public string[] GetTags(string? filePath, ulong? frn)
 
 		public IEnumerable<TaggedFile> GetAll()
 		{
-			var col = _database.GetCollection<TaggedFile>(TaggedFiles);
+			var col = Database.GetCollection<TaggedFile>(TaggedFiles);
 			return col.FindAll();
 		}
 
 		public IEnumerable<TaggedFile> GetAllUnderPath(string folderPath)
 		{
-			var col = _database.GetCollection<TaggedFile>(TaggedFiles);
+			var col = Database.GetCollection<TaggedFile>(TaggedFiles);
 			if (string.IsNullOrEmpty(folderPath))
 				return col.FindAll();
 			return col.Find(x => x.FilePath.StartsWith(folderPath, StringComparison.OrdinalIgnoreCase));
@@ -184,33 +176,33 @@ public IEnumerable<TaggedFile> GetAllUnderPath(string folderPath)
 		public void Import(string json)
 		{
 			var dataValues = JsonSerializer.DeserializeArray(json);
-			var col = _database.GetCollection(TaggedFiles);
+			var col = Database.GetCollection(TaggedFiles);
 			col.DeleteAll();
 			col.InsertBulk(dataValues.Select(x => x.AsDocument));
 		}
 
 		public string Export()
 		{
-			return JsonSerializer.Serialize(new BsonArray(_database.GetCollection(TaggedFiles).FindAll()));
+			return JsonSerializer.Serialize(new BsonArray(Database.GetCollection(TaggedFiles).FindAll()));
 		}
 
-		private void UpdateDb()
+		private static void UpdateDb()
 		{
-			if (_database.UserVersion == 0)
+			if (Database.UserVersion == 0)
 			{
-				var col = _database.GetCollection(TaggedFiles);
+				var col = Database.GetCollection(TaggedFiles);
 				foreach (var doc in col.FindAll())
 				{
 					doc["Tags"] = new BsonValue(new[] { doc["Tag"].AsString });
 					doc.Remove("Tags");
 					col.Update(doc);
 				}
-				_database.UserVersion = 1;
+				Database.UserVersion = 1;
 			}
 		}
 
 		// https://github.com/mbdavid/LiteDB/blob/master/LiteDB/Engine/Engine/Upgrade.cs
-		private void CheckDbVersion(string filename)
+		private static void CheckDbVersion(string filename)
 		{
 			var buffer = new byte[8192 * 2];
 			using (var stream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
diff --git a/src/Files.App.Server/Database/LayoutPreferencesDatabase.cs b/src/Files.App.Server/Database/LayoutPreferencesDatabase.cs
@@ -9,25 +9,18 @@ namespace Files.App.Server.Database
 {
 	public sealed class LayoutPreferencesDatabase
 	{
-		private static LiteDatabase _database = default!;
-		private static readonly object _lockObject = new();
-
 		private const string LayoutPreferences = "layoutprefs";
+		private readonly static LiteDatabase Database;
+		private readonly static string LayoutSettingsDbPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "user_settings.db");
 
-		public static string LayoutSettingsDbPath
-			=> Path.Combine(ApplicationData.Current.LocalFolder.Path, "user_settings.db");
-
-		public LayoutPreferencesDatabase()
+		static LayoutPreferencesDatabase()
 		{
-			lock (_lockObject)
-			{
-				_database ??= new(
-					new ConnectionString(LayoutSettingsDbPath)
-					{
-						Connection = ConnectionType.Direct,
-						Upgrade = true,
-					});
-			}
+			Database = new(
+				new ConnectionString(LayoutSettingsDbPath)
+				{
+					Connection = ConnectionType.Direct,
+					Upgrade = true,
+				});
 		}
 
 		public LayoutPreferencesItem? GetPreferences(string? filePath, ulong? frn)
@@ -38,7 +31,7 @@ public LayoutPreferencesDatabase()
 		public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? preferencesItem)
 		{
 			// Get a collection (or create, if doesn't exist)
-			var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);
+			var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);
 
 			var tmp = FindPreferences(filePath, frn);
 
@@ -77,14 +70,14 @@ public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? p
 
 		public void ResetAll()
 		{
-			var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);
+			var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);
 
 			col.DeleteAll();
 		}
 
 		public void ApplyToAll(LayoutPreferencesUpdateAction updateAction)
 		{
-			var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);
+			var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);
 
 			var allDocs = col.FindAll();
 
@@ -100,21 +93,21 @@ public void Import(string json)
 		{
 			var dataValues = JsonSerializer.DeserializeArray(json);
 
-			var col = _database.GetCollection(LayoutPreferences);
+			var col = Database.GetCollection(LayoutPreferences);
 
 			col.DeleteAll();
 			col.InsertBulk(dataValues.Select(x => x.AsDocument));
 		}
 
 		public string Export()
 		{
-			return JsonSerializer.Serialize(new BsonArray(_database.GetCollection(LayoutPreferences).FindAll()));
+			return JsonSerializer.Serialize(new BsonArray(Database.GetCollection(LayoutPreferences).FindAll()));
 		}
 
 		private LayoutPreferences? FindPreferences(string? filePath, ulong? frn)
 		{
 			// Get a collection (or create, if doesn't exist)
-			var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);
+			var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);
 
 			if (filePath is not null)
 			{
diff --git a/src/Files.App.Server/Files.App.Server.csproj b/src/Files.App.Server/Files.App.Server.csproj
@@ -39,7 +39,8 @@
     <ItemGroup>
         <Manifest Include="app.manifest" />
         <TrimmerRootAssembly Include="Files.App.Server" />
-        <PackageReference Include="LiteDB" Version="5.0.19" />
+        <!-- Don't upgrade LiteDB until https://github.com/mbdavid/LiteDB/issues/2435 gets fixed -->
+        <PackageReference Include="LiteDB" Version="5.0.17" />
         <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.647-beta" PrivateAssets="all" />
     </ItemGroup>
diff --git a/src/Files.App/ViewModels/Settings/AdvancedViewModel.cs b/src/Files.App/ViewModels/Settings/AdvancedViewModel.cs
@@ -176,7 +176,7 @@ private async Task ImportSettingsAsync()
 					var fileTagsList = await zipFolder.GetFileAsync(Constants.LocalSettings.FileTagSettingsFileName);
 					string importTags = await fileTagsList.ReadTextAsync();
 					fileTagsSettingsService.ImportSettings(importTags);
-					var fileTagsDB = await zipFolder.GetFileAsync(Path.GetFileName(Server.Database.FileTagsDatabase.FileTagsDbPath));
+					var fileTagsDB = await zipFolder.GetFileAsync(Path.GetFileName(Server.Database.FileTagsDatabase.GetFileTagsDbPath()));
 					string importTagsDB = await fileTagsDB.ReadTextAsync();
 					var tagDbInstance = FileTagsHelper.GetDbInstance();
 					tagDbInstance.Import(importTagsDB);
@@ -224,7 +224,7 @@ private async Task ExportSettingsAsync()
 					await zipFolder.CreateFileAsync(new MemoryStream(exportTags), Constants.LocalSettings.FileTagSettingsFileName, CreationCollisionOption.ReplaceExisting);
 					var tagDbInstance = FileTagsHelper.GetDbInstance();
 					byte[] exportTagsDB = UTF8Encoding.UTF8.GetBytes(tagDbInstance.Export());
-					await zipFolder.CreateFileAsync(new MemoryStream(exportTagsDB), Path.GetFileName(Server.Database.FileTagsDatabase.FileTagsDbPath), CreationCollisionOption.ReplaceExisting);
+					await zipFolder.CreateFileAsync(new MemoryStream(exportTagsDB), Path.GetFileName(Server.Database.FileTagsDatabase.GetFileTagsDbPath()), CreationCollisionOption.ReplaceExisting);
 
 					// Export layout preferences DB
 					var layoutDbInstance = LayoutPreferencesManager.GetDatabaseManagerInstance();

Original file line number	Diff line number	Diff line change
`@@ -13,37 +13,29 @@ namespace Files.App.Server.Database`
`13`	`13`	`{`
`14`	`14`	`public sealed class FileTagsDatabase`
`15`	`15`	`{`
`16`		`- private static LiteDatabase _database = default!;`
`17`		`- private static readonly object _lockObject = new();`
`18`		`-`
`19`	`16`	`private const string TaggedFiles = "taggedfiles";`
	`17`	`+ private readonly static LiteDatabase Database;`
	`18`	`+ private readonly static string FileTagsDbPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "filetags.db");`
`20`	`19`
`21`		`- public static string FileTagsDbPath`
`22`		`- => Path.Combine(ApplicationData.Current.LocalFolder.Path, "filetags.db");`
`23`		`-`
`24`		`- public FileTagsDatabase()`
	`20`	`+ static FileTagsDatabase()`
`25`	`21`	`{`
`26`		`- lock (_lockObject)`
`27`		`- {`
`28`		`- if (_database is null)`
`29`		`- {`
`30`		`- SafetyExtensions.IgnoreExceptions(() => CheckDbVersion(FileTagsDbPath));`
	`22`	`+ SafetyExtensions.IgnoreExceptions(() => CheckDbVersion(FileTagsDbPath));`
`31`	`23`
`32`		`- _database = new LiteDatabase(new ConnectionString(FileTagsDbPath)`
`33`		`- {`
`34`		`- Connection = ConnectionType.Direct,`
`35`		`- Upgrade = true`
`36`		`- });`
	`24`	`+ Database = new LiteDatabase(new ConnectionString(FileTagsDbPath)`
	`25`	`+ {`
	`26`	`+ Connection = ConnectionType.Direct,`
	`27`	`+ Upgrade = true`
	`28`	`+ });`
`37`	`29`
`38`		`- UpdateDb();`
`39`		`- }`
`40`		`- }`
	`30`	`+ UpdateDb();`
`41`	`31`	`}`
`42`	`32`
	`33`	`+ public static string GetFileTagsDbPath() => FileTagsDbPath;`
	`34`	`+`
`43`	`35`	`public void SetTags(string filePath, ulong? frn, [ReadOnlyArray] string[] tags)`
`44`	`36`	`{`
`45`	`37`	`// Get a collection (or create, if doesn't exist)`
`46`		`- var col = _database.GetCollection<TaggedFile>(TaggedFiles);`
	`38`	`+ var col = Database.GetCollection<TaggedFile>(TaggedFiles);`
`47`	`39`
`48`	`40`	`var tmp = FindTag(filePath, frn);`
`49`	`41`	`if (tmp is null)`
`@@ -81,7 +73,7 @@ public void SetTags(string filePath, ulong? frn, [ReadOnlyArray] string[] tags)`
`81`	`73`	`private TaggedFile? FindTag(string? filePath, ulong? frn)`
`82`	`74`	`{`
`83`	`75`	`// Get a collection (or create, if doesn't exist)`
`84`		`- var col = _database.GetCollection<TaggedFile>(TaggedFiles);`
	`76`	`+ var col = Database.GetCollection<TaggedFile>(TaggedFiles);`
`85`	`77`
`86`	`78`	`if (filePath is not null)`
`87`	`79`	`{`
`@@ -122,7 +114,7 @@ public void SetTags(string filePath, ulong? frn, [ReadOnlyArray] string[] tags)`
`122`	`114`	`public void UpdateTag(string oldFilePath, ulong? frn, string? newFilePath)`
`123`	`115`	`{`
`124`	`116`	`// Get a collection (or create, if doesn't exist)`
`125`		`- var col = _database.GetCollection<TaggedFile>(TaggedFiles);`
	`117`	`+ var col = Database.GetCollection<TaggedFile>(TaggedFiles);`
`126`	`118`	`var tmp = col.FindOne(x => x.FilePath == oldFilePath);`
`127`	`119`	`if (tmp is not null)`
`128`	`120`	`{`
`@@ -144,7 +136,7 @@ public void UpdateTag(string oldFilePath, ulong? frn, string? newFilePath)`
`144`	`136`	`public void UpdateTag(ulong oldFrn, ulong? frn, string? newFilePath)`
`145`	`137`	`{`
`146`	`138`	`// Get a collection (or create, if doesn't exist)`
`147`		`- var col = _database.GetCollection<TaggedFile>(TaggedFiles);`
	`139`	`+ var col = Database.GetCollection<TaggedFile>(TaggedFiles);`
`148`	`140`	`var tmp = col.FindOne(x => x.Frn == oldFrn);`
`149`	`141`	`if (tmp is not null)`
`150`	`142`	`{`
`@@ -169,13 +161,13 @@ public string[] GetTags(string? filePath, ulong? frn)`
`169`	`161`
`170`	`162`	`public IEnumerable<TaggedFile> GetAll()`
`171`	`163`	`{`
`172`		`- var col = _database.GetCollection<TaggedFile>(TaggedFiles);`
	`164`	`+ var col = Database.GetCollection<TaggedFile>(TaggedFiles);`
`173`	`165`	`return col.FindAll();`
`174`	`166`	`}`
`175`	`167`
`176`	`168`	`public IEnumerable<TaggedFile> GetAllUnderPath(string folderPath)`
`177`	`169`	`{`
`178`		`- var col = _database.GetCollection<TaggedFile>(TaggedFiles);`
	`170`	`+ var col = Database.GetCollection<TaggedFile>(TaggedFiles);`
`179`	`171`	`if (string.IsNullOrEmpty(folderPath))`
`180`	`172`	`return col.FindAll();`
`181`	`173`	`return col.Find(x => x.FilePath.StartsWith(folderPath, StringComparison.OrdinalIgnoreCase));`
`@@ -184,33 +176,33 @@ public IEnumerable<TaggedFile> GetAllUnderPath(string folderPath)`
`184`	`176`	`public void Import(string json)`
`185`	`177`	`{`
`186`	`178`	`var dataValues = JsonSerializer.DeserializeArray(json);`
`187`		`- var col = _database.GetCollection(TaggedFiles);`
	`179`	`+ var col = Database.GetCollection(TaggedFiles);`
`188`	`180`	`col.DeleteAll();`
`189`	`181`	`col.InsertBulk(dataValues.Select(x => x.AsDocument));`
`190`	`182`	`}`
`191`	`183`
`192`	`184`	`public string Export()`
`193`	`185`	`{`
`194`		`- return JsonSerializer.Serialize(new BsonArray(_database.GetCollection(TaggedFiles).FindAll()));`
	`186`	`+ return JsonSerializer.Serialize(new BsonArray(Database.GetCollection(TaggedFiles).FindAll()));`
`195`	`187`	`}`
`196`	`188`
`197`		`- private void UpdateDb()`
	`189`	`+ private static void UpdateDb()`
`198`	`190`	`{`
`199`		`- if (_database.UserVersion == 0)`
	`191`	`+ if (Database.UserVersion == 0)`
`200`	`192`	`{`
`201`		`- var col = _database.GetCollection(TaggedFiles);`
	`193`	`+ var col = Database.GetCollection(TaggedFiles);`
`202`	`194`	`foreach (var doc in col.FindAll())`
`203`	`195`	`{`
`204`	`196`	`doc["Tags"] = new BsonValue(new[] { doc["Tag"].AsString });`
`205`	`197`	`doc.Remove("Tags");`
`206`	`198`	`col.Update(doc);`
`207`	`199`	`}`
`208`		`- _database.UserVersion = 1;`
	`200`	`+ Database.UserVersion = 1;`
`209`	`201`	`}`
`210`	`202`	`}`
`211`	`203`
`212`	`204`	`// https://github.com/mbdavid/LiteDB/blob/master/LiteDB/Engine/Engine/Upgrade.cs`
`213`		`- private void CheckDbVersion(string filename)`
	`205`	`+ private static void CheckDbVersion(string filename)`
`214`	`206`	`{`
`215`	`207`	`var buffer = new byte[8192 * 2];`
`216`	`208`	`using (var stream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))`
Original file line number	Diff line number	Diff line change
`@@ -9,25 +9,18 @@ namespace Files.App.Server.Database`
`9`	`9`	`{`
`10`	`10`	`public sealed class LayoutPreferencesDatabase`
`11`	`11`	`{`
`12`		`- private static LiteDatabase _database = default!;`
`13`		`- private static readonly object _lockObject = new();`
`14`		`-`
`15`	`12`	`private const string LayoutPreferences = "layoutprefs";`
	`13`	`+ private readonly static LiteDatabase Database;`
	`14`	`+ private readonly static string LayoutSettingsDbPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "user_settings.db");`
`16`	`15`
`17`		`- public static string LayoutSettingsDbPath`
`18`		`- => Path.Combine(ApplicationData.Current.LocalFolder.Path, "user_settings.db");`
`19`		`-`
`20`		`- public LayoutPreferencesDatabase()`
	`16`	`+ static LayoutPreferencesDatabase()`
`21`	`17`	`{`
`22`		`- lock (_lockObject)`
`23`		`- {`
`24`		`- _database ??= new(`
`25`		`- new ConnectionString(LayoutSettingsDbPath)`
`26`		`- {`
`27`		`- Connection = ConnectionType.Direct,`
`28`		`- Upgrade = true,`
`29`		`- });`
`30`		`- }`
	`18`	`+ Database = new(`
	`19`	`+ new ConnectionString(LayoutSettingsDbPath)`
	`20`	`+ {`
	`21`	`+ Connection = ConnectionType.Direct,`
	`22`	`+ Upgrade = true,`
	`23`	`+ });`
`31`	`24`	`}`
`32`	`25`
`33`	`26`	`public LayoutPreferencesItem? GetPreferences(string? filePath, ulong? frn)`
`@@ -38,7 +31,7 @@ public LayoutPreferencesDatabase()`
`38`	`31`	`public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? preferencesItem)`
`39`	`32`	`{`
`40`	`33`	`// Get a collection (or create, if doesn't exist)`
`41`		`- var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);`
	`34`	`+ var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);`
`42`	`35`
`43`	`36`	`var tmp = FindPreferences(filePath, frn);`
`44`	`37`
`@@ -77,14 +70,14 @@ public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? p`
`77`	`70`
`78`	`71`	`public void ResetAll()`
`79`	`72`	`{`
`80`		`- var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);`
	`73`	`+ var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);`
`81`	`74`
`82`	`75`	`col.DeleteAll();`
`83`	`76`	`}`
`84`	`77`
`85`	`78`	`public void ApplyToAll(LayoutPreferencesUpdateAction updateAction)`
`86`	`79`	`{`
`87`		`- var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);`
	`80`	`+ var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);`
`88`	`81`
`89`	`82`	`var allDocs = col.FindAll();`
`90`	`83`
`@@ -100,21 +93,21 @@ public void Import(string json)`
`100`	`93`	`{`
`101`	`94`	`var dataValues = JsonSerializer.DeserializeArray(json);`
`102`	`95`
`103`		`- var col = _database.GetCollection(LayoutPreferences);`
	`96`	`+ var col = Database.GetCollection(LayoutPreferences);`
`104`	`97`
`105`	`98`	`col.DeleteAll();`
`106`	`99`	`col.InsertBulk(dataValues.Select(x => x.AsDocument));`
`107`	`100`	`}`
`108`	`101`
`109`	`102`	`public string Export()`
`110`	`103`	`{`
`111`		`- return JsonSerializer.Serialize(new BsonArray(_database.GetCollection(LayoutPreferences).FindAll()));`
	`104`	`+ return JsonSerializer.Serialize(new BsonArray(Database.GetCollection(LayoutPreferences).FindAll()));`
`112`	`105`	`}`
`113`	`106`
`114`	`107`	`private LayoutPreferences? FindPreferences(string? filePath, ulong? frn)`
`115`	`108`	`{`
`116`	`109`	`// Get a collection (or create, if doesn't exist)`
`117`		`- var col = _database.GetCollection<LayoutPreferences>(LayoutPreferences);`
	`110`	`+ var col = Database.GetCollection<LayoutPreferences>(LayoutPreferences);`
`118`	`111`
`119`	`112`	`if (filePath is not null)`
`120`	`113`	`{`