mirror of
https://github.com/frosch95/K8sFileBrowser.git
synced 2026-04-11 12:58:22 +02:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f2ada68be | |||
| 171ef6a87c | |||
|
|
74807bcfac | ||
| 6223e982d7 | |||
| 07912b3239 |
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
@@ -22,21 +22,22 @@
|
|||||||
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="11.2.5" />
|
<PackageReference Include="Avalonia" Version="11.3.7" />
|
||||||
<PackageReference Include="Avalonia.Desktop" Version="11.2.5" />
|
<PackageReference Include="Avalonia.Desktop" Version="11.3.7" />
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5" />
|
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.7" />
|
||||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5" />
|
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.7" />
|
||||||
|
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7" />
|
||||||
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
||||||
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.5" />
|
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.7" />
|
||||||
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.5" />
|
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.7" />
|
||||||
<PackageReference Include="Avalonia.Xaml.Interactions" Version="11.2.0.14" />
|
<PackageReference Include="Avalonia.Xaml.Interactions" Version="11.3.0.6" />
|
||||||
<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.2.0.14" />
|
<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.3.0.6" />
|
||||||
<PackageReference Include="KubernetesClient" Version="16.0.2" />
|
<PackageReference Include="KubernetesClient" Version="17.0.14" />
|
||||||
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
|
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
|
||||||
<PackageReference Include="Serilog" Version="4.2.0" />
|
<PackageReference Include="Serilog" Version="4.3.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
|
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
|
||||||
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
|
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ using System.Reflection;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using K8sFileBrowser.Models;
|
using K8sFileBrowser.Models;
|
||||||
using K8sFileBrowser.Services;
|
using K8sFileBrowser.Services;
|
||||||
using Microsoft.IdentityModel.Tokens;
|
|
||||||
using ReactiveUI;
|
using ReactiveUI;
|
||||||
using ReactiveUI.Fody.Helpers;
|
using ReactiveUI.Fody.Helpers;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
@@ -66,13 +65,10 @@ public class MainWindowViewModel : ViewModelBase
|
|||||||
|
|
||||||
#region Commands
|
#region Commands
|
||||||
|
|
||||||
public ReactiveCommand<Unit, Unit> DownloadCommand { get; private set; } = null!;
|
|
||||||
public ReactiveCommand<Unit, Unit> DownloadLogCommand { get; private set; } = null!;
|
public ReactiveCommand<Unit, Unit> DownloadLogCommand { get; private set; } = null!;
|
||||||
public ReactiveCommand<Unit, Unit> RefreshCommand { get; private set; } = null!;
|
public ReactiveCommand<Unit, Unit> RefreshCommand { get; private set; } = null!;
|
||||||
public ReactiveCommand<Unit, Unit> ParentCommand { get; private set; } = null!;
|
public ReactiveCommand<Unit, Unit> ParentCommand { get; private set; } = null!;
|
||||||
public ReactiveCommand<Unit, Unit> OpenCommand { get; private set; } = null!;
|
|
||||||
public ReactiveCommand<FileInformation, Unit> OpenContextCommand { get; private set; } = null!;
|
public ReactiveCommand<FileInformation, Unit> OpenContextCommand { get; private set; } = null!;
|
||||||
|
|
||||||
public ReactiveCommand<FileInformation, Unit> DownloadContextCommand { get; private set; } = null!;
|
public ReactiveCommand<FileInformation, Unit> DownloadContextCommand { get; private set; } = null!;
|
||||||
private ReactiveCommand<Namespace, IEnumerable<Pod>> GetPodsForNamespace { get; set; } = null!;
|
private ReactiveCommand<Namespace, IEnumerable<Pod>> GetPodsForNamespace { get; set; } = null!;
|
||||||
|
|
||||||
@@ -85,9 +81,7 @@ public class MainWindowViewModel : ViewModelBase
|
|||||||
Version = Assembly.GetExecutingAssembly().GetName().Version?.ToString();
|
Version = Assembly.GetExecutingAssembly().GetName().Version?.ToString();
|
||||||
|
|
||||||
// commands
|
// commands
|
||||||
ConfigureOpenDirectoryCommand();
|
|
||||||
ConfigureOpenDirectoryContextCommand();
|
ConfigureOpenDirectoryContextCommand();
|
||||||
ConfigureDownloadFileCommand(kubernetesService);
|
|
||||||
ConfigureDownloadFileContextCommand(kubernetesService);
|
ConfigureDownloadFileContextCommand(kubernetesService);
|
||||||
ConfigureRefreshCommand(kubernetesService);
|
ConfigureRefreshCommand(kubernetesService);
|
||||||
ConfigureDownloadLogCommand(kubernetesService);
|
ConfigureDownloadLogCommand(kubernetesService);
|
||||||
@@ -275,32 +269,7 @@ public class MainWindowViewModel : ViewModelBase
|
|||||||
.Subscribe(ShowErrorMessage);
|
.Subscribe(ShowErrorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ConfigureDownloadFileCommand(IKubernetesService kubernetesService)
|
|
||||||
{
|
|
||||||
var isFile = this
|
|
||||||
.WhenAnyValue(x => x.SelectedFile, x => x.Message.IsVisible)
|
|
||||||
.Select(x => x is { Item1.Type: FileType.File, Item2: false });
|
|
||||||
|
|
||||||
DownloadCommand = ReactiveCommand.CreateFromTask(async () =>
|
|
||||||
{
|
|
||||||
await Observable.StartAsync(async () =>
|
|
||||||
{
|
|
||||||
var fileName = SelectedFile!.Name.Substring(SelectedFile!.Name.LastIndexOf('/') + 1,
|
|
||||||
SelectedFile!.Name.Length - SelectedFile!.Name.LastIndexOf('/') - 1);
|
|
||||||
var saveFileName = await ApplicationHelper.SaveFile(_lastDirectory, fileName);
|
|
||||||
if (saveFileName != null)
|
|
||||||
{
|
|
||||||
SetLastDirectory(saveFileName);
|
|
||||||
ShowWorkingMessage("Downloading File...");
|
|
||||||
await kubernetesService.DownloadFile(SelectedNamespace, SelectedPod, SelectedContainer, SelectedFile, saveFileName);
|
|
||||||
HideWorkingMessage();
|
|
||||||
}
|
|
||||||
}, RxApp.TaskpoolScheduler);
|
|
||||||
}, isFile, RxApp.MainThreadScheduler);
|
|
||||||
|
|
||||||
DownloadCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
|
|
||||||
.Subscribe(ShowErrorMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ConfigureDownloadFileContextCommand(IKubernetesService kubernetesService)
|
private void ConfigureDownloadFileContextCommand(IKubernetesService kubernetesService)
|
||||||
{
|
{
|
||||||
@@ -322,7 +291,7 @@ public class MainWindowViewModel : ViewModelBase
|
|||||||
}, RxApp.TaskpoolScheduler);
|
}, RxApp.TaskpoolScheduler);
|
||||||
}, outputScheduler: RxApp.MainThreadScheduler);
|
}, outputScheduler: RxApp.MainThreadScheduler);
|
||||||
|
|
||||||
DownloadCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
|
DownloadContextCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
|
||||||
.Subscribe(ShowErrorMessage);
|
.Subscribe(ShowErrorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -331,24 +300,6 @@ public class MainWindowViewModel : ViewModelBase
|
|||||||
_lastDirectory = saveFileName.Substring(0, saveFileName.LastIndexOf(Path.DirectorySeparatorChar));
|
_lastDirectory = saveFileName.Substring(0, saveFileName.LastIndexOf(Path.DirectorySeparatorChar));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ConfigureOpenDirectoryCommand()
|
|
||||||
{
|
|
||||||
var isDirectory = this
|
|
||||||
.WhenAnyValue(x => x.SelectedFile, x => x.Message.IsVisible)
|
|
||||||
.Select(x => x is { Item1.Type: FileType.Directory, Item2: false });
|
|
||||||
|
|
||||||
OpenCommand = ReactiveCommand.Create(() =>
|
|
||||||
{
|
|
||||||
if (".." == SelectedFile?.Name)
|
|
||||||
SelectedPath = SelectedFile?.Parent;
|
|
||||||
else
|
|
||||||
SelectedPath = SelectedFile != null ? SelectedFile!.Name : "/";
|
|
||||||
},
|
|
||||||
isDirectory, RxApp.MainThreadScheduler);
|
|
||||||
|
|
||||||
OpenCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
|
|
||||||
.Subscribe(ShowErrorMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ConfigureOpenDirectoryContextCommand()
|
private void ConfigureOpenDirectoryContextCommand()
|
||||||
{
|
{
|
||||||
@@ -357,7 +308,7 @@ public class MainWindowViewModel : ViewModelBase
|
|||||||
SelectedPath = ".." == file.Name ? file.Parent : file.Name;
|
SelectedPath = ".." == file.Name ? file.Parent : file.Name;
|
||||||
}, outputScheduler: RxApp.MainThreadScheduler);
|
}, outputScheduler: RxApp.MainThreadScheduler);
|
||||||
|
|
||||||
OpenCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
|
OpenContextCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
|
||||||
.Subscribe(ShowErrorMessage);
|
.Subscribe(ShowErrorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,10 +15,15 @@
|
|||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Border ZIndex="1" IsVisible="{Binding Message.IsVisible}" Background="{Binding Message.Color}" Opacity="{Binding Message.Opacity}">
|
<Border ZIndex="1" IsVisible="{Binding Message.IsVisible}" Background="{Binding Message.Color}"
|
||||||
|
Opacity="{Binding Message.Opacity}">
|
||||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="20" MaxWidth="500">
|
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="20" MaxWidth="500">
|
||||||
<PathIcon Classes="loading" Data="{StaticResource arrow_rotate_clockwise_regular}" Width="100" Height="100" IsVisible="{Binding !Message.IsError}"></PathIcon>
|
<PathIcon Classes="loading" Data="{StaticResource arrow_rotate_clockwise_regular}" Width="100"
|
||||||
<PathIcon Data="{StaticResource warning_regular}" Width="100" Height="100" IsVisible="{Binding Message.IsError}"></PathIcon>
|
Height="100" IsVisible="{Binding !Message.IsError}">
|
||||||
|
</PathIcon>
|
||||||
|
<PathIcon Data="{StaticResource warning_regular}" Width="100" Height="100"
|
||||||
|
IsVisible="{Binding Message.IsError}">
|
||||||
|
</PathIcon>
|
||||||
<TextBlock TextWrapping="Wrap" Text="{Binding Message.Text}">.</TextBlock>
|
<TextBlock TextWrapping="Wrap" Text="{Binding Message.Text}">.</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -49,7 +54,8 @@
|
|||||||
MinWidth="200"
|
MinWidth="200"
|
||||||
Margin="0 0 10 0">
|
Margin="0 0 10 0">
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
<TextBlock Grid.Column="4" HorizontalAlignment="Right" VerticalAlignment="Center" Text="{Binding Version}"/>
|
<TextBlock Grid.Column="4" HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||||
|
Text="{Binding Version}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
@@ -90,20 +96,28 @@
|
|||||||
Margin="0 0 10 0">
|
Margin="0 0 10 0">
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" Margin="10" HorizontalAlignment="Right">
|
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" Margin="10"
|
||||||
<Button Command="{Binding DownloadLogCommand}" VerticalAlignment="Center" ToolTip.Tip="Download Container Log" Margin="0 0 48 0 ">
|
HorizontalAlignment="Right">
|
||||||
|
<Button Command="{Binding DownloadLogCommand}" VerticalAlignment="Center"
|
||||||
|
ToolTip.Tip="Download Container Log" Margin="0 0 48 0 ">
|
||||||
<PathIcon Data="{StaticResource document_one_page_regular}"></PathIcon>
|
<PathIcon Data="{StaticResource document_one_page_regular}"></PathIcon>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding RefreshCommand}" VerticalAlignment="Center" ToolTip.Tip="Refresh Directory">
|
<Button Command="{Binding RefreshCommand}" VerticalAlignment="Center"
|
||||||
|
ToolTip.Tip="Refresh Directory">
|
||||||
<PathIcon Data="{StaticResource arrow_sync_circle_regular}"></PathIcon>
|
<PathIcon Data="{StaticResource arrow_sync_circle_regular}"></PathIcon>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding ParentCommand}" VerticalAlignment="Center" ToolTip.Tip="Go To Parent Directory">
|
<Button Command="{Binding ParentCommand}" VerticalAlignment="Center"
|
||||||
|
ToolTip.Tip="Go To Parent Directory">
|
||||||
<PathIcon Data="{StaticResource arrow_curve_up_left_regular}"></PathIcon>
|
<PathIcon Data="{StaticResource arrow_curve_up_left_regular}"></PathIcon>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding OpenCommand}" VerticalAlignment="Center" ToolTip.Tip="Browse Directory">
|
<Button Command="{Binding OpenContextCommand}" CommandParameter="{Binding SelectedFile}"
|
||||||
|
IsEnabled="{Binding SelectedFile.IsDirectory}" VerticalAlignment="Center"
|
||||||
|
ToolTip.Tip="Browse Directory">
|
||||||
<PathIcon Data="{StaticResource arrow_right_regular}"></PathIcon>
|
<PathIcon Data="{StaticResource arrow_right_regular}"></PathIcon>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding DownloadCommand}" VerticalAlignment="Center" ToolTip.Tip="Download File">
|
<Button Command="{Binding DownloadContextCommand}"
|
||||||
|
CommandParameter="{Binding SelectedFile}" IsEnabled="{Binding SelectedFile.IsFile}"
|
||||||
|
VerticalAlignment="Center" ToolTip.Tip="Download File">
|
||||||
<PathIcon Data="{StaticResource arrow_download_regular}"></PathIcon>
|
<PathIcon Data="{StaticResource arrow_download_regular}"></PathIcon>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
@@ -132,15 +146,46 @@
|
|||||||
<DataGridTemplateColumn.CellTemplate>
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate DataType="models:FileInformation">
|
<DataTemplate DataType="models:FileInformation">
|
||||||
<Border ToolTip.Tip="{Binding Type}" Background="Transparent">
|
<Border ToolTip.Tip="{Binding Type}" Background="Transparent">
|
||||||
|
<Border.ContextFlyout>
|
||||||
|
<MenuFlyout>
|
||||||
|
<MenuItem Header="Open"
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_right_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Download"
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DownloadContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsFile}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_download_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
</MenuFlyout>
|
||||||
|
</Border.ContextFlyout>
|
||||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
|
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
|
||||||
<PathIcon Data="{StaticResource folder_regular}" IsVisible="{Binding IsDirectory}"></PathIcon>
|
<PathIcon Data="{StaticResource folder_regular}"
|
||||||
<PathIcon Data="{StaticResource document_regular}" IsVisible="{Binding IsFile}"></PathIcon>
|
IsVisible="{Binding IsDirectory}">
|
||||||
<PathIcon Data="{StaticResource document_error_regular}" IsVisible="{Binding IsSymbolicLink}"></PathIcon>
|
</PathIcon>
|
||||||
<PathIcon Data="{StaticResource document_unknown_regular}" IsVisible="{Binding IsUnknown}"></PathIcon>
|
<PathIcon Data="{StaticResource document_regular}"
|
||||||
|
IsVisible="{Binding IsFile}">
|
||||||
|
</PathIcon>
|
||||||
|
<PathIcon Data="{StaticResource document_error_regular}"
|
||||||
|
IsVisible="{Binding IsSymbolicLink}">
|
||||||
|
</PathIcon>
|
||||||
|
<PathIcon Data="{StaticResource document_unknown_regular}"
|
||||||
|
IsVisible="{Binding IsUnknown}">
|
||||||
|
</PathIcon>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="DoubleTapped">
|
<EventTriggerBehavior EventName="DoubleTapped">
|
||||||
<InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
|
<InvokeCommandAction
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}"/>
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -156,17 +201,28 @@
|
|||||||
<MenuItem Header="Open"
|
<MenuItem Header="Open"
|
||||||
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
IsEnabled="{Binding IsDirectory}"/>
|
IsEnabled="{Binding IsDirectory}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_right_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
<MenuItem Header="Download"
|
<MenuItem Header="Download"
|
||||||
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DownloadContextCommand}"
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DownloadContextCommand}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
IsEnabled="{Binding IsFile}"/>
|
IsEnabled="{Binding IsFile}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_download_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
</MenuFlyout>
|
</MenuFlyout>
|
||||||
</Border.ContextFlyout>
|
</Border.ContextFlyout>
|
||||||
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" />
|
<TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" />
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="DoubleTapped">
|
<EventTriggerBehavior EventName="DoubleTapped">
|
||||||
<InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
|
<InvokeCommandAction
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}"/>
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -177,10 +233,34 @@
|
|||||||
<DataGridTemplateColumn.CellTemplate>
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate DataType="models:FileInformation">
|
<DataTemplate DataType="models:FileInformation">
|
||||||
<Border Background="Transparent">
|
<Border Background="Transparent">
|
||||||
<TextBlock Text="{Binding Size}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 10 0"/>
|
<Border.ContextFlyout>
|
||||||
|
<MenuFlyout>
|
||||||
|
<MenuItem Header="Open"
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_right_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Download"
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DownloadContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsFile}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_download_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
</MenuFlyout>
|
||||||
|
</Border.ContextFlyout>
|
||||||
|
<TextBlock Text="{Binding Size}" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Right" Margin="0 0 10 0" />
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="DoubleTapped">
|
<EventTriggerBehavior EventName="DoubleTapped">
|
||||||
<InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
|
<InvokeCommandAction
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}"/>
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -191,10 +271,34 @@
|
|||||||
<DataGridTemplateColumn.CellTemplate>
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate DataType="models:FileInformation">
|
<DataTemplate DataType="models:FileInformation">
|
||||||
<Border Background="Transparent">
|
<Border Background="Transparent">
|
||||||
<TextBlock Text="{Binding DateTimeOffsetString}" VerticalAlignment="Center" Margin="10 0 8 0"/>
|
<Border.ContextFlyout>
|
||||||
|
<MenuFlyout>
|
||||||
|
<MenuItem Header="Open"
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_right_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Download"
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DownloadContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsFile}">
|
||||||
|
<MenuItem.Icon>
|
||||||
|
<PathIcon Data="{StaticResource arrow_download_regular}"></PathIcon>
|
||||||
|
</MenuItem.Icon>
|
||||||
|
</MenuItem>
|
||||||
|
</MenuFlyout>
|
||||||
|
</Border.ContextFlyout>
|
||||||
|
<TextBlock Text="{Binding DateTimeOffsetString}" VerticalAlignment="Center"
|
||||||
|
Margin="10 0 8 0" />
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="DoubleTapped">
|
<EventTriggerBehavior EventName="DoubleTapped">
|
||||||
<InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window}}" />
|
<InvokeCommandAction
|
||||||
|
Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
|
||||||
|
CommandParameter="{Binding}"
|
||||||
|
IsEnabled="{Binding IsDirectory}"/>
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class Build : NukeBuild
|
|||||||
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
|
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
|
||||||
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
|
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
|
||||||
|
|
||||||
[Parameter] readonly string Version = "1.4.0";
|
[Parameter] readonly string Version = "1.6.0";
|
||||||
|
|
||||||
AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser";
|
AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser";
|
||||||
AbsolutePath OutputDirectory => RootDirectory / "output";
|
AbsolutePath OutputDirectory => RootDirectory / "output";
|
||||||
@@ -47,15 +47,14 @@ class Build : NukeBuild
|
|||||||
.SetConfiguration(Configuration)
|
.SetConfiguration(Configuration)
|
||||||
.SetOutput(WinOutputDirectory)
|
.SetOutput(WinOutputDirectory)
|
||||||
.EnableSelfContained()
|
.EnableSelfContained()
|
||||||
.SetFramework("net8.0")
|
.SetFramework("net9.0")
|
||||||
.SetRuntime("win-x64")
|
.SetRuntime("win-x64")
|
||||||
.EnablePublishSingleFile()
|
.EnablePublishSingleFile()
|
||||||
.EnablePublishReadyToRun()
|
.EnablePublishReadyToRun()
|
||||||
.SetAuthors("Andreas Billmann")
|
.SetAuthors("Andreas Billmann")
|
||||||
.SetCopyright("Copyright (c) 2023")
|
.SetCopyright("Copyright (c) 2023")
|
||||||
.SetVersion(Version)
|
.SetVersion(Version)
|
||||||
.SetProcessArgumentConfigurator(_ => _
|
.SetProcessAdditionalArguments("-p:IncludeNativeLibrariesForSelfExtract=true"));
|
||||||
.Add("-p:IncludeNativeLibrariesForSelfExtract=true")));
|
|
||||||
|
|
||||||
WinOutputDirectory.ZipTo(
|
WinOutputDirectory.ZipTo(
|
||||||
WinZip,
|
WinZip,
|
||||||
@@ -73,15 +72,14 @@ class Build : NukeBuild
|
|||||||
.SetConfiguration(Configuration)
|
.SetConfiguration(Configuration)
|
||||||
.SetOutput(LinuxOutputDirectory)
|
.SetOutput(LinuxOutputDirectory)
|
||||||
.EnableSelfContained()
|
.EnableSelfContained()
|
||||||
.SetFramework("net8.0")
|
.SetFramework("net9.0")
|
||||||
.SetRuntime("linux-x64")
|
.SetRuntime("linux-x64")
|
||||||
.EnablePublishSingleFile()
|
.EnablePublishSingleFile()
|
||||||
.EnablePublishReadyToRun()
|
.EnablePublishReadyToRun()
|
||||||
.SetAuthors("Andreas Billmann")
|
.SetAuthors("Andreas Billmann")
|
||||||
.SetCopyright("Copyright (c) 2023")
|
.SetCopyright("Copyright (c) 2023")
|
||||||
.SetVersion(Version)
|
.SetVersion(Version)
|
||||||
.SetProcessArgumentConfigurator(_ => _
|
.SetProcessAdditionalArguments("-p:IncludeNativeLibrariesForSelfExtract=true"));
|
||||||
.Add("-p:IncludeNativeLibrariesForSelfExtract=true")));
|
|
||||||
|
|
||||||
LinuxOutputDirectory.TarGZipTo(
|
LinuxOutputDirectory.TarGZipTo(
|
||||||
LinuxGz,
|
LinuxGz,
|
||||||
@@ -98,15 +96,14 @@ class Build : NukeBuild
|
|||||||
.SetConfiguration(Configuration)
|
.SetConfiguration(Configuration)
|
||||||
.SetOutput(OsxOutputDirectory)
|
.SetOutput(OsxOutputDirectory)
|
||||||
.EnableSelfContained()
|
.EnableSelfContained()
|
||||||
.SetFramework("net8.0")
|
.SetFramework("net9.0")
|
||||||
.SetRuntime("osx-arm64")
|
.SetRuntime("osx-arm64")
|
||||||
.EnablePublishSingleFile()
|
.EnablePublishSingleFile()
|
||||||
.EnablePublishReadyToRun()
|
.EnablePublishReadyToRun()
|
||||||
.SetAuthors("Andreas Billmann")
|
.SetAuthors("Andreas Billmann")
|
||||||
.SetCopyright("Copyright (c) 2023")
|
.SetCopyright("Copyright (c) 2023")
|
||||||
.SetVersion(Version)
|
.SetVersion(Version)
|
||||||
.SetProcessArgumentConfigurator(_ => _
|
.SetProcessAdditionalArguments("-p:IncludeNativeLibrariesForSelfExtract=true"));
|
||||||
.Add("-p:IncludeNativeLibrariesForSelfExtract=true")));
|
|
||||||
|
|
||||||
OsxOutputDirectory.TarGZipTo(
|
OsxOutputDirectory.TarGZipTo(
|
||||||
OsxGz,
|
OsxGz,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<RootNamespace></RootNamespace>
|
<RootNamespace></RootNamespace>
|
||||||
<NoWarn>CS0649;CS0169</NoWarn>
|
<NoWarn>CS0649;CS0169</NoWarn>
|
||||||
<NukeRootDirectory>..</NukeRootDirectory>
|
<NukeRootDirectory>..</NukeRootDirectory>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Nuke.Common" Version="8.1.4" />
|
<PackageReference Include="Nuke.Common" Version="9.0.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "8.0.0",
|
"version": "9.0.0",
|
||||||
"rollForward": "latestFeature",
|
"rollForward": "latestFeature",
|
||||||
"allowPrerelease": false
|
"allowPrerelease": false
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user