Add terminal model

Author: gave92

src/Files.App/Data/Models/TerminalModel.cs

@@ -0,0 +1,21 @@
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Files.App.Data.Models
+{
+	public class TerminalModel : IDisposable
+	{
+		public string Id { get; init; }
+		public string Name { get; init; }
+		public Control Control { get; init; }
+
+		public void Dispose()
+		{
+			(Control as IDisposable)?.Dispose();
+		}
+	}
+}

src/Files.App/UserControls/StatusBar.xaml

@@ -6,6 +6,7 @@
 	xmlns:converters="using:Files.App.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:data="using:Files.App.Data.Items"
+	xmlns:datamodels="using:Files.App.Data.Models"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:usercontrols="using:Files.App.UserControls"
@@ -490,27 +491,27 @@
 								Padding="4"
 								Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
 								IsItemClickEnabled="True"
-								ItemsSource="{x:Bind MainPageViewModel.TerminalNames, Mode=OneWay}"
+								ItemsSource="{x:Bind MainPageViewModel.Terminals, Mode=OneWay}"
 								SelectedIndex="{x:Bind MainPageViewModel.SelectedTerminal, Mode=TwoWay}"
 								SelectionMode="Single">
 								<ListView.ItemTemplate>
-									<DataTemplate x:DataType="x:String">
+									<DataTemplate x:DataType="datamodels:TerminalModel">
 										<Grid>
 											<Grid.ColumnDefinitions>
 												<ColumnDefinition Width="*" />
 												<ColumnDefinition Width="Auto" />
 											</Grid.ColumnDefinitions>
 											<TextBlock
 												VerticalAlignment="Center"
-												Text="{x:Bind}"
+												Text="{x:Bind Name, Mode=OneWay}"
 												TextTrimming="CharacterEllipsis" />
 											<Button
 												Grid.Column="1"
 												AutomationProperties.Name="{helpers:ResourceString Name=Close}"
 												Background="Transparent"
 												BorderBrush="Transparent"
-												Click="Button_Click"
-												Tag="{x:Bind}"
+												Click="TerminalCloseButton_Click"
+												Tag="{x:Bind Id}"
 												ToolTipService.ToolTip="{helpers:ResourceString Name=Close}">
 												<FontIcon FontSize="12" Glyph="&#xE74D;" />
 											</Button>

src/Files.App/UserControls/StatusBar.xaml.cs

@@ -81,7 +81,7 @@ private async void DeleteBranch_Click(object sender, RoutedEventArgs e)
 			await DirectoryPropertiesViewModel.ExecuteDeleteBranch(((BranchItem)((Button)sender).DataContext).Name);
 		}
 
-		private void Button_Click(object sender, RoutedEventArgs e)
+		private void TerminalCloseButton_Click(object sender, RoutedEventArgs e)
 		{
 			MainPageViewModel.TerminalCloseCommand.Execute(((Button)sender).Tag.ToString());
 		}

src/Files.App/UserControls/TerminalView.xaml.cs

@@ -114,9 +114,10 @@ private async Task ResizeTask()
 		private Terminal _terminal;
 		private BufferedReader _reader;
 		private ShellProfile _profile;
+		private string _id;
 
-		public TerminalView(ShellProfile profile) : this()
-			=> _profile = profile;
+		public TerminalView(ShellProfile profile, string id) : this()
+			=> (_profile, _id) = (profile, id);
 
 		public TerminalView()
 		{
@@ -389,7 +390,7 @@ private void StartShellProcess(TerminalSize size, ShellProfile profile)
 			{
 				DispatcherQueue.EnqueueAsync(() =>
 				{
-					_mainPageModel.TerminalCloseCommand.Execute(Tag);
+					_mainPageModel.TerminalCloseCommand.Execute(_id);
 				});
 			};
 

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -94,13 +94,15 @@ public MainPageViewModel()
 			{
 				if (Terminals.IsEmpty())
 					IsTerminalViewOpen = true;
-				Terminals.Add(new TerminalView(e ?? TerminalSelectedProfile)
+				var termId = Guid.NewGuid().ToString();
+				Terminals.Add(new TerminalModel()
 				{
-					Tag = $"Terminal {Terminals.Count}"
+					Name = (e ?? TerminalSelectedProfile).Name,
+					Id = termId,
+					Control = new TerminalView(e ?? TerminalSelectedProfile, termId)
 				});
 				OnPropertyChanged(nameof(SelectedTerminal));
 				OnPropertyChanged(nameof(ActiveTerminal));
-				OnPropertyChanged(nameof(TerminalNames));
 			});
 			TerminalToggleCommand = new RelayCommand(() =>
 			{
@@ -122,14 +124,13 @@ public MainPageViewModel()
 			});
 			TerminalCloseCommand = new RelayCommand<string>((name) =>
 			{
-				var terminal = Terminals.First(x => x.Tag.ToString() == name);
-				(terminal as IDisposable)?.Dispose();
+				var terminal = Terminals.First(x => x.Id == name);
+				terminal.Dispose();
 				Terminals.Remove(terminal);
 				SelectedTerminal = int.Min(SelectedTerminal, Terminals.Count - 1);
 				if (Terminals.IsEmpty())
 					IsTerminalViewOpen = false;
 				OnPropertyChanged(nameof(ActiveTerminal));
-				OnPropertyChanged(nameof(TerminalNames));
 			});
 			TerminalSelectedProfile = TerminalProfiles[0];
 			GeneralSettingsService.PropertyChanged += GeneralSettingsService_PropertyChanged;
@@ -345,10 +346,9 @@ public bool IsTerminalViewOpen
 			set => SetProperty(ref _isTerminalViewOpen, value);
 		}
 
-		public Control? ActiveTerminal => SelectedTerminal >= 0 && SelectedTerminal < Terminals.Count ? Terminals[SelectedTerminal] : null;
+		public Control? ActiveTerminal => SelectedTerminal >= 0 && SelectedTerminal < Terminals.Count ? Terminals[SelectedTerminal].Control : null;
 
-		public List<Control> Terminals { get; } = new();
-		public List<string> TerminalNames => Terminals.Select(x => x.Tag.ToString()!).ToList();
+		public ObservableCollection<TerminalModel> Terminals { get; } = new();
 
 		private int _selectedTerminal;
 		public int SelectedTerminal