fix broken build

K8sFileBrowser/ViewModels/MainWindowViewModel.cs

@@ -14,20 +14,20 @@ namespace K8sFileBrowser.ViewModels;
 
 public class MainWindowViewModel : ViewModelBase
 {
-  private ObservableAsPropertyHelper<IEnumerable<ClusterContext>> _clusterContexts = null!;
-  public IEnumerable<ClusterContext> ClusterContexts => _clusterContexts.Value;
+  [Reactive]
+  public IEnumerable<ClusterContext> ClusterContexts { get; set; } = null!;
 
   [Reactive]
   public ClusterContext? SelectedClusterContext { get; set; }
 
   [Reactive]
-  public IEnumerable<Namespace> Namespaces { get; set; }
+  public IEnumerable<Namespace> Namespaces { get; set; } = null!;
 
   [Reactive]
   public Namespace? SelectedNamespace { get; set; }
 
-  private ObservableAsPropertyHelper<IEnumerable<Pod>> _pods = null!;
-  public IEnumerable<Pod> Pods => _pods.Value;
+  [Reactive]
+  public IEnumerable<Pod> Pods  { get; set; } = null!;
 
   [Reactive]
   public Pod? SelectedPod { get; set; }
@@ -38,8 +38,8 @@ public class MainWindowViewModel : ViewModelBase
   [Reactive]
   public Container? SelectedContainer { get; set; }
 
-  private ObservableAsPropertyHelper<IEnumerable<FileInformation>> _fileInformation = null!;
-  public IEnumerable<FileInformation> FileInformation => _fileInformation.Value;
+  [Reactive]
+  public IEnumerable<FileInformation> FileInformation { get; set; } = null!;
 
   [Reactive]
   public FileInformation? SelectedFile { get; set; }
@@ -48,7 +48,7 @@ public class MainWindowViewModel : ViewModelBase
   public string? SelectedPath { get; set; }
 
   [Reactive]
-  public Message Message { get; set; }
+  public Message Message { get; set; } = null!;
 
   public ReactiveCommand<Unit, Unit> DownloadCommand { get; private set; } = null!;
   public ReactiveCommand<Unit, Unit> DownloadLogCommand { get; private set; } = null!;
@@ -86,18 +86,22 @@ public class MainWindowViewModel : ViewModelBase
     // load the cluster contexts when the view model is created
     var loadContexts = ReactiveCommand
       .Create<Unit, IEnumerable<ClusterContext>>(_ => kubernetesService.GetClusterContexts());
-    _clusterContexts = loadContexts.Execute().ToProperty(
-      this, x => x.ClusterContexts, scheduler: RxApp.MainThreadScheduler);
-
+    loadContexts.Execute()
+      .Throttle(new TimeSpan(10))
+      .ObserveOn(RxApp.MainThreadScheduler)
+      .Subscribe(x =>
+      {
+        ClusterContexts = x;
         // select the current cluster context
         SelectedClusterContext = ClusterContexts
           .FirstOrDefault(x => x.Name == kubernetesService.GetCurrentContext());
+      });
   }
 
   private void RegisterResetPath()
   {
     // reset the path when the pod or namespace changes
-    this.WhenAnyValue(c => c.SelectedPod, c => c.SelectedNamespace)
+    this.WhenAnyValue(c => c.SelectedContainer)
       .Throttle(new TimeSpan(10))
       .ObserveOn(RxApp.TaskpoolScheduler)
       .Subscribe(_ => SelectedPath = "/");
@@ -107,13 +111,17 @@ public class MainWindowViewModel : ViewModelBase
   {
     // read the file information when the path changes
     this
-      .WhenAnyValue(c => c.SelectedPod, c => c.SelectedNamespace)
+      .WhenAnyValue(c => c.SelectedPod)
       .Throttle(new TimeSpan(10))
-      .Select(x => x.Item2 == null || x.Item1 == null
+      .Select(x => x == null
         ? new List<Container>()
-        : x.Item1.Containers.Select(c => new Container {Name = c}))
+        : x.Containers.Select(c => new Container {Name = c}))
       .ObserveOn(RxApp.MainThreadScheduler)
-      .Subscribe( x => Containers = x);
+      .Subscribe( x =>
+      {
+        Containers = x;
+        FileInformation = new List<FileInformation>();
+      });
 
     this.WhenAnyValue(x => x.Containers)
       .Throttle(new TimeSpan(10))
@@ -124,25 +132,30 @@ public class MainWindowViewModel : ViewModelBase
   private void RegisterReadFiles(IKubernetesService kubernetesService)
   {
     // read the file information when the path changes
-    _fileInformation = this
-      .WhenAnyValue(c => c.SelectedPath, c => c.SelectedPod, c => c.SelectedNamespace, c => c.SelectedContainer)
+    this
+      .WhenAnyValue(c => c.SelectedContainer, c => c.SelectedPath)
       .Throttle(new TimeSpan(10))
-      .Select(x => x.Item3 == null || x.Item2 == null || x.Item1 == null || x.Item4 == null
+      .Select(x => x.Item1 == null || x.Item2 == null
         ? new List<FileInformation>()
-        : GetFileInformation(kubernetesService, x.Item1, x.Item2, x.Item3, x.Item4))
+        : GetFileInformation(kubernetesService, x.Item2, SelectedPod!, SelectedNamespace!, x.Item1))
       .ObserveOn(RxApp.MainThreadScheduler)
-      .ToProperty(this, x => x.FileInformation);
+      .Subscribe(x => FileInformation = x);
   }
 
   private void RegisterReadPods()
   {
     // read the pods when the namespace changes
-    _pods = this
+    this
       .WhenAnyValue(c => c.SelectedNamespace)
       .Throttle(new TimeSpan(10))
       .SelectMany(ns => GetPodsForNamespace.Execute(ns!))
       .ObserveOn(RxApp.MainThreadScheduler)
-      .ToProperty(this, x => x.Pods);
+      .Subscribe(x =>
+      {
+        Pods = x;
+        Containers = null;
+        FileInformation = new List<FileInformation>();
+      });
   }
 
   private void RegisterReadNamespaces(IKubernetesService kubernetesService)
@@ -153,7 +166,13 @@ public class MainWindowViewModel : ViewModelBase
       .Throttle(new TimeSpan(10))
       .SelectMany(context => GetClusterContextAsync(context, kubernetesService))
       .ObserveOn(RxApp.MainThreadScheduler)
-      .Subscribe(ns => Namespaces = ns);
+      .Subscribe(ns =>
+      {
+        Namespaces = ns;
+        Pods = new List<Pod>();
+        Containers = null;
+        FileInformation = new List<FileInformation>();
+      });
   }
 
   private void ConfigureGetPodsForNamespaceCommand(IKubernetesService kubernetesService)

K8sFileBrowser/Views/MainWindow.axaml

@@ -161,7 +161,7 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate DataType="models:FileInformation">
                                 <Border Background="Transparent">
-                                    <TextBlock Text="{Binding Size}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 8 0"/>
+                                    <TextBlock Text="{Binding Size}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 10 0"/>
                                     <Interaction.Behaviors>
                                         <EventTriggerBehavior EventName="DoubleTapped">
                                             <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />
@@ -175,7 +175,7 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate DataType="models:FileInformation">
                                 <Border Background="Transparent">
-                                    <TextBlock Text="{Binding DateTimeOffsetString}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 8 0"/>
+                                    <TextBlock Text="{Binding DateTimeOffsetString}" VerticalAlignment="Center" Margin="10 0 8 0"/>
                                     <Interaction.Behaviors>
                                         <EventTriggerBehavior EventName="DoubleTapped">
                                             <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window}}" />

README.md

@@ -3,4 +3,14 @@
 A UI tool for downloading files from a Pod.
 The application is also the first Avalonia UI and C# UI app I have written.
 
+## Usage
+
+Just start the executable and select the cluster, namespace and pod you want to download files from.
+Then select the files you want to download and click the download button.
+
+The available clusters are read from the `~/.kube/config` file.
+
+## Limitations
+It only works on linux containers and the container must support `find` and `tar`.
+
 ![screenshot of K8sFileBrowser](https://github.com/frosch95/K8sFileBrowser/blob/master/screenshot.png?raw=true)

build/Build.cs

@@ -1,42 +1,41 @@
+
+using System.IO;
+using System.IO.Compression;
 using Nuke.Common;
 using Nuke.Common.IO;
-using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
 class Build : NukeBuild
 {
-    AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser";
-    AbsolutePath OutputDirectory => RootDirectory / "output";
-    AbsolutePath WinOutputDirectory => OutputDirectory / "win";
-    AbsolutePath LinuxOutputDirectory => OutputDirectory / "linux";
-    
-    AbsolutePath ProjectFile => SourceDirectory / "K8sFileBrowser.csproj";
-    
-    public static int Main () => Execute<Build>(x => x.Publish);
-
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
     [Parameter] readonly string Version = "1.0.0";
 
+    AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser";
+    AbsolutePath OutputDirectory => RootDirectory / "output";
+    AbsolutePath WinOutputDirectory => OutputDirectory / "win";
+    AbsolutePath LinuxOutputDirectory => OutputDirectory / "linux";
+
+    AbsolutePath WinZip => OutputDirectory / $"K8sFileBrowser_{Version}.zip";
+    AbsolutePath LinuxGz => OutputDirectory / $"K8sFileBrowser_{Version}.tgz";
+
+    AbsolutePath ProjectFile => SourceDirectory / "K8sFileBrowser.csproj";
+
+    readonly string ExcludedExtensions = "pdb";
+
+    public static int Main () => Execute<Build>(x => x.Publish);
+
+
+
     Target Clean => _ => _
-        .Before(Restore)
         .Executes(() =>
         {
-            DotNetClean(s => s
-                .SetOutput(OutputDirectory));
+            OutputDirectory.DeleteDirectory();
         });
 
-    Target Restore => _ => _
-        .Executes(() =>
-        {
-            DotNet($"restore {ProjectFile}");
-            //DotNetTasks.DotNetRestore(new DotNetRestoreSettings());
-        });
-
-    
     Target PublishWin => _ => _
         .DependsOn(Clean)
         .Executes(() =>
@@ -54,8 +53,13 @@ class Build : NukeBuild
                 .SetCopyright("Copyright (c) 2023")
                 .SetVersion(Version)
                 .SetProcessArgumentConfigurator(_ => _
-                    .Add("-p:IncludeNativeLibrariesForSelfExtract=true"))
-                .EnableNoRestore());
+                    .Add("-p:IncludeNativeLibrariesForSelfExtract=true")));
+
+            WinOutputDirectory.ZipTo(
+                WinZip,
+                filter: x => !x.HasExtension(ExcludedExtensions),
+                compressionLevel: CompressionLevel.SmallestSize,
+                fileMode: FileMode.CreateNew);
         });
 
     Target PublishLinux => _ => _
@@ -75,8 +79,12 @@ class Build : NukeBuild
                 .SetCopyright("Copyright (c) 2023")
                 .SetVersion(Version)
                 .SetProcessArgumentConfigurator(_ => _
-                    .Add("-p:IncludeNativeLibrariesForSelfExtract=true"))
-                .EnableNoRestore());
+                    .Add("-p:IncludeNativeLibrariesForSelfExtract=true")));
+
+            LinuxOutputDirectory.TarGZipTo(
+                LinuxGz,
+                filter: x => !x.HasExtension(ExcludedExtensions),
+                fileMode: FileMode.CreateNew);
         });
 
     Target Publish => _ => _