From 491127d4604150fe04963e4649495aebf5678139 Mon Sep 17 00:00:00 2001
From: Andreas Billmann <andreas@billmann.de>
Date: Fri, 11 Aug 2023 14:30:20 +0200
Subject: [PATCH] fix broken path selection

---
 .../ViewModels/MainWindowViewModel.cs         |  6 ++--
 build/Build.cs                                | 36 +++++++------------
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/K8sFileBrowser/ViewModels/MainWindowViewModel.cs b/K8sFileBrowser/ViewModels/MainWindowViewModel.cs
index c17951a..8dca822 100644
--- a/K8sFileBrowser/ViewModels/MainWindowViewModel.cs
+++ b/K8sFileBrowser/ViewModels/MainWindowViewModel.cs
@@ -133,11 +133,11 @@ public class MainWindowViewModel : ViewModelBase
   {
     // read the file information when the path changes
     this
-      .WhenAnyValue(c => c.SelectedContainer)
+      .WhenAnyValue(c => c.SelectedContainer, c => c.SelectedPath)
       .Throttle(new TimeSpan(10))
-      .Select(x => x == null
+      .Select(x => x.Item1 == null || x.Item2 == null
         ? new List<FileInformation>()
-        : GetFileInformation(kubernetesService, SelectedPath!, SelectedPod!, SelectedNamespace!, x))
+        : GetFileInformation(kubernetesService, x.Item2, SelectedPod!, SelectedNamespace!, x.Item1))
       .ObserveOn(RxApp.MainThreadScheduler)
       .Subscribe(x => FileInformation = x);
   }
diff --git a/build/Build.cs b/build/Build.cs
index 9fdf37d..3e9578c 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -11,21 +11,21 @@ class Build : NukeBuild
 {
     [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);
 
 
@@ -37,14 +37,6 @@ class Build : NukeBuild
             OutputDirectory.DeleteDirectory();
         });
 
-    Target Restore => _ => _
-        .Executes(() =>
-        {
-            DotNet($"restore {ProjectFile}");
-            //DotNetTasks.DotNetRestore(new DotNetRestoreSettings());
-        });
-
-    
     Target PublishWin => _ => _
         .DependsOn(Clean)
         .Executes(() =>
@@ -62,18 +54,17 @@ 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 => _ => _
-        .DependsOn(Clean)
+      .DependsOn(Clean)
         .Executes(() =>
         {
             DotNetPublish(s => s
@@ -89,19 +80,18 @@ 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 => _ => _
         .DependsOn(PublishWin, PublishLinux)
         .Executes(() =>
         {
         });
 
-}
+}
\ No newline at end of file