KenSchae
/
StabilityMatrix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rename `InstalledPackage.Name` to `DisplayName`

pull/5/head
Ionite 1 year ago
parent
851acc480e
commit
185863121d
No known key found for this signature in database
9 changed files with 92 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      StabilityMatrix/Helper/SettingsManager.cs
  2. 2
      StabilityMatrix/LaunchPage.xaml
  3. 2
      StabilityMatrix/Models/InstalledPackage.cs
  4. 2
      StabilityMatrix/Models/Packages/BaseGitPackage.cs
  5. 113
      StabilityMatrix/PackageManagerPage.xaml
  6. 2
      StabilityMatrix/ViewModels/InstallerViewModel.cs
  7. 2
      StabilityMatrix/ViewModels/LaunchViewModel.cs
  8. 10
      StabilityMatrix/ViewModels/PackageManagerViewModel.cs
  9. 2
      StabilityMatrix/ViewModels/SettingsViewModel.cs

4
StabilityMatrix/Helper/SettingsManager.cs
Unescape View File

@ -65,7 +65,7 @@ public class SettingsManager : ISettingsManager
public void UpdatePackageVersionNumber(string name, string? newVersion) public void UpdatePackageVersionNumber(string name, string? newVersion)
{ {
var package = Settings.InstalledPackages.FirstOrDefault(x => x.Name == name); var package = Settings.InstalledPackages.FirstOrDefault(x => x.DisplayName == name);
if (package == null || newVersion == null) if (package == null || newVersion == null)
{ {
return; return;
@ -77,7 +77,7 @@ public class SettingsManager : ISettingsManager
public void SetLastUpdateCheck(InstalledPackage package) public void SetLastUpdateCheck(InstalledPackage package)
{ {
Settings.InstalledPackages.First(p => p.Name == package.Name).LastUpdateCheck = package.LastUpdateCheck; Settings.InstalledPackages.First(p => p.DisplayName == package.DisplayName).LastUpdateCheck = package.LastUpdateCheck;
SaveSettings(); SaveSettings();
} }

2
StabilityMatrix/LaunchPage.xaml
Unescape View File

@ -181,7 +181,7 @@
<TextBlock <TextBlock
Margin="0,5,0,5" Margin="0,5,0,5"
Name="NameTextBlock" Name="NameTextBlock"
Text="{Binding Name}" /> Text="{Binding DisplayName}" />
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>

2
StabilityMatrix/Models/InstalledPackage.cs
Unescape View File

@ -12,7 +12,7 @@ public class InstalledPackage
// Unique ID for the installation // Unique ID for the installation
public Guid Id { get; set; } public Guid Id { get; set; }
// User defined name // User defined name
public string? Name { get; set; } public string? DisplayName { get; set; }
// Package name // Package name
public string? PackageName { get; set; } public string? PackageName { get; set; }
// Package version // Package version

2
StabilityMatrix/Models/Packages/BaseGitPackage.cs
Unescape View File

@ -237,7 +237,7 @@ public abstract class BaseGitPackage : BasePackage
public override async Task<bool> CheckForUpdates(string installedPackageName) public override async Task<bool> CheckForUpdates(string installedPackageName)
{ {
var currentVersion = SettingsManager.Settings.InstalledPackages.FirstOrDefault(x => x.Name == installedPackageName) var currentVersion = SettingsManager.Settings.InstalledPackages.FirstOrDefault(x => x.DisplayName == installedPackageName)
?.PackageVersion; ?.PackageVersion;
if (string.IsNullOrWhiteSpace(currentVersion)) if (string.IsNullOrWhiteSpace(currentVersion))
{ {

113
StabilityMatrix/PackageManagerPage.xaml
Unescape View File

@ -1,17 +1,17 @@
<Page <Page
Background="{DynamicResource ApplicationBackgroundBrush}"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Loaded="InstallPage_OnLoaded"
d:DesignHeight="450"
d:DesignWidth="700"
mc:Ignorable="d"
x:Class="StabilityMatrix.PackageManagerPage" x:Class="StabilityMatrix.PackageManagerPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:models="clr-namespace:StabilityMatrix.Models" xmlns:models="clr-namespace:StabilityMatrix.Models"
d:DesignHeight="450" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
d:DesignWidth="700" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
Loaded="InstallPage_OnLoaded"
Background="{DynamicResource ApplicationBackgroundBrush}"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
mc:Ignorable="d">
<Grid Margin="16"> <Grid Margin="16">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -19,37 +19,50 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Vertical" <StackPanel
Grid.Row="0"
Orientation="Vertical"
Visibility="{Binding ProgressBarVisibility, FallbackValue=Visible}"> Visibility="{Binding ProgressBarVisibility, FallbackValue=Visible}">
<ProgressBar Value="{Binding ProgressValue, FallbackValue=10}" <ProgressBar
IsIndeterminate="{Binding IsIndeterminate, FallbackValue=False}" IsIndeterminate="{Binding IsIndeterminate, FallbackValue=False}"
Maximum="100" Width="500" /> Maximum="100"
<TextBlock Text="{Binding ProgressText, FallbackValue=Installing...}" Value="{Binding ProgressValue, FallbackValue=10}"
HorizontalAlignment="Center" Padding="8" /> Width="500" />
<TextBlock
HorizontalAlignment="Center"
Padding="8"
Text="{Binding ProgressText, FallbackValue=Installing...}" />
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" <StackPanel
Margin="16" HorizontalAlignment="Left"> Grid.Row="1"
HorizontalAlignment="Left"
Margin="16"
Orientation="Horizontal">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<ui:Button Command="{Binding ShowInstallWindowCommand}" <ui:Button
IsEnabled="{Binding InstallButtonEnabled, FallbackValue=true}" Background="Green"
Command="{Binding ShowInstallWindowCommand}"
Foreground="{ui:ThemeResource TextFillColorPrimaryBrush}"
Height="40" Height="40"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Foreground="{ui:ThemeResource TextFillColorPrimaryBrush}" IsEnabled="{Binding InstallButtonEnabled, FallbackValue=true}"
Margin="0,0,0,16" Margin="0,0,0,16"
VerticalContentAlignment="Center" VerticalContentAlignment="Center">
Background="Green">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Add24" /> <ui:SymbolIcon Symbol="Add24" />
<Label Margin="8,4,0,0" <Label
Content="Add Package" VerticalContentAlignment="Center" /> Content="Add Package"
Margin="8,4,0,0"
VerticalContentAlignment="Center" />
</StackPanel> </StackPanel>
</ui:Button> </ui:Button>
<ListView ItemsSource="{Binding Packages}" <ListView
Visibility="{Binding InstallButtonVisibility, FallbackValue=Visible}" ItemsSource="{Binding Packages}"
SelectedItem="{Binding SelectedPackage, Mode=TwoWay}"> SelectedItem="{Binding SelectedPackage, Mode=TwoWay}"
Visibility="{Binding InstallButtonVisibility, FallbackValue=Visible}">
<ListView.Style> <ListView.Style>
<Style TargetType="ListView"> <Style TargetType="ListView">
@ -59,8 +72,10 @@
<ListView.Template> <ListView.Template>
<ControlTemplate> <ControlTemplate>
<Border CornerRadius="5" BorderThickness="1" <Border
BorderBrush="{ui:ThemeResource KeyboardFocusBorderColorBrush}"> BorderBrush="{ui:ThemeResource KeyboardFocusBorderColorBrush}"
BorderThickness="1"
CornerRadius="5">
<ItemsPresenter /> <ItemsPresenter />
</Border> </Border>
</ControlTemplate> </ControlTemplate>
@ -68,39 +83,47 @@
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate DataType="{x:Type models:InstalledPackage}"> <DataTemplate DataType="{x:Type models:InstalledPackage}">
<StackPanel VerticalAlignment="Top" Margin="8"> <StackPanel Margin="8" VerticalAlignment="Top">
<TextBlock Text="{Binding Name}" Margin="0,5,0,5" /> <TextBlock Margin="0,5,0,5" Text="{Binding DisplayName}" />
<TextBlock Text="{Binding PackageVersion}" Margin="0,0,0,5" /> <TextBlock Margin="0,0,0,5" Text="{Binding PackageVersion}" />
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical" Margin="32,0,0,0"> <StackPanel Margin="32,0,0,0" Orientation="Vertical">
<TextBlock Text="{Binding SelectedPackage.Name, FallbackValue=Stable Diffusion Web UI}" <TextBlock
FontSize="24" FontWeight="Bold" /> FontSize="24"
FontWeight="Bold"
Text="{Binding SelectedPackage.Name, FallbackValue=Stable Diffusion Web UI}" />
<TextBlock FontSize="12" Margin="0,5,0,5"> <TextBlock FontSize="12" Margin="0,5,0,5">
<Run Text="{Binding SelectedPackage.PackageName, FallbackValue=stable-diffusion-webui}" /> <Run Text="{Binding SelectedPackage.PackageName, FallbackValue=stable-diffusion-webui}" />
<Run Text="{Binding SelectedPackage.PackageVersion, FallbackValue=v1.3.37}" /> <Run Text="{Binding SelectedPackage.PackageVersion, FallbackValue=v1.3.37}" />
</TextBlock> </TextBlock>
<TextBlock Text="{Binding SelectedPackage.Path, FallbackValue=C:\Users\Example\Downloads}" <TextBlock
FontSize="12" Margin="0,5, 0, 5" /> FontSize="12"
<StackPanel Orientation="Horizontal" Margin="0,16,0,0"> Margin="0,5,0,5"
<ui:Button Content="{Binding InstallButtonText, FallbackValue=Install}" Text="{Binding SelectedPackage.Path, FallbackValue=C:\Users\Example\Downloads}" />
<StackPanel Margin="0,16,0,0" Orientation="Horizontal">
<ui:Button
Background="Green"
Command="{Binding InstallCommand}" Command="{Binding InstallCommand}"
Visibility="{Binding InstallButtonVisibility, FallbackValue=Visible}" Content="{Binding InstallButtonText, FallbackValue=Install}"
Height="50"
IsEnabled="{Binding InstallButtonEnabled, FallbackValue=true}" IsEnabled="{Binding InstallButtonEnabled, FallbackValue=true}"
Width="100" Height="50" VerticalAlignment="Top"
Background="Green"
VerticalAlignment="Top" />
<ui:Button Content="Uninstall"
Command="{Binding UninstallCommand}"
Visibility="{Binding InstallButtonVisibility, FallbackValue=Visible}" Visibility="{Binding InstallButtonVisibility, FallbackValue=Visible}"
Width="100" Height="50" Width="100" />
<ui:Button
Background="DarkRed" Background="DarkRed"
Command="{Binding UninstallCommand}"
Content="Uninstall"
Height="50"
Margin="16,0,0,0" Margin="16,0,0,0"
VerticalAlignment="Top" /> VerticalAlignment="Top"
Visibility="{Binding InstallButtonVisibility, FallbackValue=Visible}"
Width="100" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

2
StabilityMatrix/ViewModels/InstallerViewModel.cs
Unescape View File

@ -243,7 +243,7 @@ public partial class InstallerViewModel : ObservableObject
var package = new InstalledPackage var package = new InstalledPackage
{ {
Name = SelectedPackage.DisplayName, DisplayName = SelectedPackage.DisplayName,
Path = SelectedPackage.InstallLocation, Path = SelectedPackage.InstallLocation,
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
PackageName = SelectedPackage.Name, PackageName = SelectedPackage.Name,

2
StabilityMatrix/ViewModels/LaunchViewModel.cs
Unescape View File

@ -127,7 +127,7 @@ public partial class LaunchViewModel : ObservableObject
public async Task ConfigAsync() public async Task ConfigAsync()
{ {
var activeInstall = SelectedPackage; var activeInstall = SelectedPackage;
var name = activeInstall?.Name; var name = activeInstall?.PackageName;
if (name == null || activeInstall == null) if (name == null || activeInstall == null)
{ {
logger.LogWarning($"Selected package is null"); logger.LogWarning($"Selected package is null");

10
StabilityMatrix/ViewModels/PackageManagerViewModel.cs
Unescape View File

@ -74,7 +74,7 @@ public partial class PackageManagerViewModel : ObservableObject
{ {
SelectedPackage = new InstalledPackage SelectedPackage = new InstalledPackage
{ {
Name = "Click \"Add Package\" to install a package" DisplayName = "Click \"Add Package\" to install a package"
}; };
InstallButtonVisibility = Visibility.Collapsed; InstallButtonVisibility = Visibility.Collapsed;
} }
@ -100,7 +100,7 @@ public partial class PackageManagerViewModel : ObservableObject
DateTimeOffset.Now; DateTimeOffset.Now;
if (canCheckUpdate) if (canCheckUpdate)
{ {
var hasUpdate = await basePackage.CheckForUpdates(packageToUpdate.Name); var hasUpdate = await basePackage.CheckForUpdates(packageToUpdate.DisplayName);
packageToUpdate.UpdateAvailable = hasUpdate; packageToUpdate.UpdateAvailable = hasUpdate;
packageToUpdate.LastUpdateCheck = DateTimeOffset.Now; packageToUpdate.LastUpdateCheck = DateTimeOffset.Now;
settingsManager.SetLastUpdateCheck(packageToUpdate); settingsManager.SetLastUpdateCheck(packageToUpdate);
@ -195,7 +195,7 @@ public partial class PackageManagerViewModel : ObservableObject
return; return;
} }
ProgressText = $"Updating {SelectedPackage.Name} to latest version..."; ProgressText = $"Updating {SelectedPackage.DisplayName} to latest version...";
package.InstallLocation = SelectedPackage.Path!; package.InstallLocation = SelectedPackage.Path!;
package.UpdateProgressChanged += SelectedPackageOnProgressChanged; package.UpdateProgressChanged += SelectedPackageOnProgressChanged;
package.UpdateComplete += (_, _) => package.UpdateComplete += (_, _) =>
@ -206,7 +206,7 @@ public partial class PackageManagerViewModel : ObservableObject
UpdateAvailable = false; UpdateAvailable = false;
}; };
var updateResult = await package.Update(); var updateResult = await package.Update();
settingsManager.UpdatePackageVersionNumber(SelectedPackage.Name!, updateResult!); settingsManager.UpdatePackageVersionNumber(SelectedPackage.DisplayName!, updateResult!);
await OnLoaded(); await OnLoaded();
} }
@ -228,7 +228,7 @@ public partial class PackageManagerViewModel : ObservableObject
{ {
IsIndeterminate = false; IsIndeterminate = false;
ProgressValue = progress; ProgressValue = progress;
ProgressText = $"Updating {SelectedPackage.Name} to latest version... {progress}%"; ProgressText = $"Updating {SelectedPackage.DisplayName} to latest version... {progress}%";
} }
EventManager.Instance.OnGlobalProgressChanged(progress); EventManager.Instance.OnGlobalProgressChanged(progress);

2
StabilityMatrix/ViewModels/SettingsViewModel.cs
Unescape View File

@ -97,7 +97,7 @@ public partial class SettingsViewModel : ObservableObject
var package = new InstalledPackage var package = new InstalledPackage
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Name = Path.GetFileName(path), DisplayName = Path.GetFileName(path),
Path = path, Path = path,
PackageName = "dank-diffusion", PackageName = "dank-diffusion",
PackageVersion = "v1.0.0", PackageVersion = "v1.0.0",

Write Preview
Loading…
Cancel
Save