Merge branch 'terminal' of https://github.com/gave92/files-uwp into terminal

Author: gave92

src/Files.App.Server/AppInstanceMonitor.cs

@@ -1,15 +1,13 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Collections.Concurrent;
 using System.Diagnostics;
 
 namespace Files.App.Server;
 
 public sealed class AppInstanceMonitor
 {
 	private static int processCount = 0;
-	internal static ConcurrentDictionary<int, ConcurrentBag<IDisposable>> AppInstanceResources = new();
 
 	public static void StartMonitor(int processId)
 	{
@@ -21,18 +19,10 @@ public static void StartMonitor(int processId)
 
 	private static void Process_Exited(object? sender, EventArgs e)
 	{
-		if (sender is Process { Id: var processId } process)
+		if (sender is Process process)
 		{
 			process.Dispose();
 
-			if (AppInstanceResources.TryRemove(processId, out var instances))
-			{
-				foreach (var instance in instances)
-				{
-					instance.Dispose();
-				}
-			}
-
 			if (Interlocked.Decrement(ref processCount) == 0)
 			{
 				Program.ExitSignalEvent.Set();

src/Files.App.Server/Database/FileTagsDatabase.cs

@@ -6,7 +6,6 @@
 using LiteDB;
 using Microsoft.Win32;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text;
 using Windows.ApplicationModel;
@@ -18,16 +17,13 @@
 
 namespace Files.App.Server.Database
 {
-	public sealed class FileTagsDatabase : IDisposable
+	public sealed class FileTagsDatabase
 	{
 		private readonly static string FileTagsKey = @$"Software\Files Community\{Package.Current.Id.FullName}\v1\FileTags";
 
 		private readonly static string FileTagsDbPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "filetags.db");
 		private const string FileTagsCollectionName = "taggedfiles";
 
-		private readonly GCHandle _handle;
-		private bool _disposed = false;
-
 		static FileTagsDatabase()
 		{
 			if (File.Exists(FileTagsDbPath))
@@ -48,25 +44,6 @@ static FileTagsDatabase()
 			}
 		}
 
-		public FileTagsDatabase()
-		{
-			throw new NotSupportedException($"Instantiating {nameof(FileTagsDatabase)} by non-parameterized constructor is not supported.");
-		}
-
-		public FileTagsDatabase(int processId)
-		{
-			_handle = GCHandle.Alloc(this, GCHandleType.Pinned);
-
-			if (AppInstanceMonitor.AppInstanceResources.TryGetValue(processId, out var instances))
-			{
-				instances.Add(this);
-			}
-			else
-			{
-				AppInstanceMonitor.AppInstanceResources[processId] = [this];
-			}
-		}
-
 		private static void UpdateDb(LiteDatabase database)
 		{
 			if (database.UserVersion == 0)
@@ -302,14 +279,5 @@ private void IterateKeys(List<TaggedFile> list, string path, int depth)
 				IterateKeys(list, CombineKeys(path, subKey), depth + 1);
 			}
 		}
-
-		public void Dispose()
-		{
-			if (!_disposed)
-			{
-				_disposed = true;
-				_handle.Free();
-			}
-		}
 	}
 }

src/Files.App.Server/Database/LayoutPreferencesDatabase.cs

@@ -5,7 +5,6 @@
 using LiteDB;
 using Microsoft.Win32;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using Windows.ApplicationModel;
 using Windows.Storage;
 using static Files.App.Server.Data.LayoutPreferencesRegistry;
@@ -14,16 +13,13 @@
 
 namespace Files.App.Server.Database
 {
-	public sealed class LayoutPreferencesDatabase : IDisposable
+	public sealed class LayoutPreferencesDatabase
 	{
 		private readonly static string LayoutSettingsKey = @$"Software\Files Community\{Package.Current.Id.FullName}\v1\LayoutPreferences";
 
 		private readonly static string LayoutSettingsDbPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "user_settings.db");
 		private const string LayoutSettingsCollectionName = "layoutprefs";
 
-		private readonly GCHandle _handle;
-		private bool _disposed = false;
-
 		static LayoutPreferencesDatabase()
 		{
 			if (File.Exists(LayoutSettingsDbPath))
@@ -41,25 +37,6 @@ static LayoutPreferencesDatabase()
 			}
 		}
 
-		public LayoutPreferencesDatabase()
-		{
-			throw new NotSupportedException($"Instantiating {nameof(LayoutPreferencesDatabase)} by non-parameterized constructor is not supported.");
-		}
-
-		public LayoutPreferencesDatabase(int processId)
-		{
-			_handle = GCHandle.Alloc(this, GCHandleType.Pinned);
-
-			if (AppInstanceMonitor.AppInstanceResources.TryGetValue(processId, out var instances))
-			{
-				instances.Add(this);
-			}
-			else
-			{
-				AppInstanceMonitor.AppInstanceResources[processId] = [this];
-			}
-		}
-
 		public LayoutPreferencesItem? GetPreferences(string filePath, ulong? frn)
 		{
 			return FindPreferences(filePath, frn)?.LayoutPreferencesManager;
@@ -220,14 +197,5 @@ private void IterateKeys(List<LayoutPreferences> list, string path, int depth)
 
 			return null;
 		}
-
-		public void Dispose()
-		{
-			if (!_disposed)
-			{
-				_disposed = true;
-				_handle.Free();
-			}
-		}
 	}
 }

src/Files.App/Dialogs/SettingsDialog.xaml

@@ -1,4 +1,4 @@
-<!--  Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE.  -->
+<!--  Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE.  -->
 <ContentDialog
 	x:Class="Files.App.Dialogs.SettingsDialog"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -119,7 +119,7 @@
 				</NavigationViewItem>
 				<NavigationViewItem
 					AutomationProperties.AutomationId="SettingsItemActions"
-					Content="Actions"
+					Content="{helpers:ResourceString Name=Actions}"
 					Tag="ActionsPage">
 					<NavigationViewItem.Icon>
 						<FontIcon Glyph="&#xF73D;" />

src/Files.App/Helpers/Layout/LayoutPreferencesDatabaseManager.cs

@@ -11,7 +11,7 @@ namespace Files.App.Helpers
 	public class LayoutPreferencesDatabaseManager
 	{
 		// Fields
-		private readonly Server.Database.LayoutPreferencesDatabase _database = new(Environment.ProcessId);
+		private static readonly Lazy<Server.Database.LayoutPreferencesDatabase> dbInstance = new(() => new());
 
 		private DetailsLayoutColumnItem FromDatabaseEntity(Server.Data.ColumnPreferencesItem entry)
 		{
@@ -116,27 +116,27 @@ private Server.Data.ColumnPreferencesItem ToDatabaseEntity(DetailsLayoutColumnIt
 		// Methods
 		public LayoutPreferencesItem? GetPreferences(string filePath, ulong? frn = null)
 		{
-			return FromDatabaseEntity(_database.GetPreferences(filePath, frn));
+			return FromDatabaseEntity(dbInstance.Value.GetPreferences(filePath, frn));
 		}
 
 		public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? preferencesItem)
 		{
-			_database.SetPreferences(filePath, frn, ToDatabaseEntity(preferencesItem));
+			dbInstance.Value.SetPreferences(filePath, frn, ToDatabaseEntity(preferencesItem));
 		}
 
 		public void ResetAll()
 		{
-			_database.ResetAll();
+			dbInstance.Value.ResetAll();
 		}
 
 		public void Import(string json)
 		{
-			_database.Import(json);
+			dbInstance.Value.Import(json);
 		}
 
 		public string Export()
 		{
-			return _database.Export();
+			return dbInstance.Value.Export();
 		}
 	}
 }

src/Files.App/Utils/FileTags/FileTagsHelper.cs

@@ -12,9 +12,9 @@ namespace Files.App.Utils.FileTags
 {
 	public static class FileTagsHelper
 	{
-		private static readonly Server.Database.FileTagsDatabase dbInstance = new(Environment.ProcessId);
+		private static readonly Lazy<Server.Database.FileTagsDatabase> dbInstance = new(() => new());
 
-		public static Server.Database.FileTagsDatabase GetDbInstance() => dbInstance;
+		public static Server.Database.FileTagsDatabase GetDbInstance() => dbInstance.Value;
 
 		public static string[] ReadFileTag(string filePath)
 		{

src/Files.App/ViewModels/Settings/AppearanceViewModel.cs

@@ -93,7 +93,7 @@ private async Task SelectBackgroundImage()
 			{
 				ViewMode = PickerViewMode.Thumbnail,
 				SuggestedStartLocation = PickerLocationId.PicturesLibrary,
-				FileTypeFilter = { ".jpg", ".jpeg", ".png", ".bmp", ".gif", ".webp" }
+				FileTypeFilter = { ".png", ".bmp", ".jpg", ".jpeg", ".jfif", ".gif", ".tiff", ".tif", ".webp" }
 			};
 
 			// WINUI3: Create and initialize new window