Merge pull request #10 from frosch95/pr-9

Refresh button for the file list

K8sFileBrowser/K8sFileBrowser.csproj

@@ -9,7 +9,7 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
         <ApplicationIcon>Assets/app.ico</ApplicationIcon>
-        <Version>0.0.9</Version>
+        <Version>0.1.2</Version>
         <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

K8sFileBrowser/ViewModels/MainWindowViewModel.cs

@@ -17,12 +17,12 @@ namespace K8sFileBrowser.ViewModels;
 
 public class MainWindowViewModel : ViewModelBase
 {
-  
+
   #region Properties
-  
+
   [Reactive]
-  public string? Version { get; set; } = null!;
-  
+  public string? Version { get; set; }
+
   [Reactive]
   public IEnumerable<ClusterContext> ClusterContexts { get; set; } = null!;
 
@@ -59,12 +59,15 @@ public class MainWindowViewModel : ViewModelBase
   [Reactive]
   public Message Message { get; set; } = null!;
   
+  private string _lastDirectory = ".";
+
   #endregion Properties
 
   #region Commands
-  
+
   public ReactiveCommand<Unit, Unit> DownloadCommand { 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> ParentCommand { get; private set; } = null!;
   public ReactiveCommand<Unit, Unit> OpenCommand { get; private set; } = null!;
   private ReactiveCommand<Namespace, IEnumerable<Pod>> GetPodsForNamespace { get; set; } = null!;
@@ -80,6 +83,7 @@ public class MainWindowViewModel : ViewModelBase
     // commands
     ConfigureOpenDirectoryCommand();
     ConfigureDownloadFileCommand(kubernetesService);
+    ConfigureRefreshCommand(kubernetesService);
     ConfigureDownloadLogCommand(kubernetesService);
     ConfigureParentDirectoryCommand();
     ConfigureGetPodsForNamespaceCommand(kubernetesService);
@@ -96,7 +100,7 @@ public class MainWindowViewModel : ViewModelBase
   }
 
   #region Property Subscriptions
-  
+
   private void InitiallyLoadContexts(IKubernetesService kubernetesService)
   {
     // load the cluster contexts when the view model is created
@@ -108,14 +112,14 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(x =>
       {
         ResetNamespaces();
-        ClusterContexts = x;
+        ClusterContexts = x.OrderBy(c => c.Name);
 
         // select the current cluster context
         SelectedClusterContext = ClusterContexts
           .FirstOrDefault(c => c.Name == kubernetesService.GetCurrentContext());
       });
   }
-  
+
   private void RegisterReadNamespaces(IKubernetesService kubernetesService)
   {
     // read the cluster contexts
@@ -127,10 +131,10 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(ns =>
       {
         ResetPods();
-        Namespaces = ns;
+        Namespaces = ns.OrderBy(n => n.Name);
       });
   }
-  
+
   private void RegisterReadPods()
   {
     // read the pods when the namespace changes
@@ -143,10 +147,10 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(x =>
       {
         ResetContainers();
-        Pods = x;
+        Pods = x.OrderBy(p => p.Name);
       });
   }
-  
+
   private void RegisterReadContainers()
   {
     // read the file information when the path changes
@@ -232,9 +236,10 @@ public class MainWindowViewModel : ViewModelBase
       await Observable.StartAsync(async () =>
       {
         var fileName = SelectedPod?.Name + ".log";
-        var saveFileName = await ApplicationHelper.SaveFile(".", fileName);
+        var saveFileName = await ApplicationHelper.SaveFile(_lastDirectory, fileName);
         if (saveFileName != null)
         {
+          SetLastDirectory(saveFileName);
           ShowWorkingMessage("Downloading Log...");
           await kubernetesService.DownloadLog(SelectedNamespace, SelectedPod, SelectedContainer, saveFileName);
           HideWorkingMessage();
@@ -245,6 +250,24 @@ public class MainWindowViewModel : ViewModelBase
     DownloadLogCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
       .Subscribe(ShowErrorMessage);
   }
+  
+  private void ConfigureRefreshCommand(IKubernetesService kubernetesService)
+  {
+    var isSelectedContainer = this
+      .WhenAnyValue(x => x.SelectedContainer)
+      .Select(x => x != null);
+
+    RefreshCommand = ReactiveCommand.CreateFromTask(async () =>
+    {
+      await Observable.Start(() =>
+      {
+        FileInformation = GetFileInformation(kubernetesService, SelectedPath!, SelectedPod!, SelectedNamespace!, SelectedContainer!);
+      }, RxApp.TaskpoolScheduler);
+    }, isSelectedContainer, RxApp.MainThreadScheduler);
+
+    RefreshCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
+      .Subscribe(ShowErrorMessage);
+  }
 
   private void ConfigureDownloadFileCommand(IKubernetesService kubernetesService)
   {
@@ -258,9 +281,10 @@ public class MainWindowViewModel : ViewModelBase
       {
         var fileName = SelectedFile!.Name.Substring(SelectedFile!.Name.LastIndexOf('/') + 1,
           SelectedFile!.Name.Length - SelectedFile!.Name.LastIndexOf('/') - 1);
-        var saveFileName = await ApplicationHelper.SaveFile(".", fileName);
+        var saveFileName = await ApplicationHelper.SaveFile(_lastDirectory, fileName);
         if (saveFileName != null)
         {
+          SetLastDirectory(saveFileName);
           ShowWorkingMessage("Downloading File...");
           await kubernetesService.DownloadFile(SelectedNamespace, SelectedPod, SelectedContainer, SelectedFile, saveFileName);
           HideWorkingMessage();
@@ -272,6 +296,11 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(ShowErrorMessage);
   }
 
+  private void SetLastDirectory(string saveFileName)
+  {
+    _lastDirectory = saveFileName.Substring(0, saveFileName.LastIndexOf('\\'));
+  }
+
   private void ConfigureOpenDirectoryCommand()
   {
     var isDirectory = this
@@ -290,11 +319,11 @@ public class MainWindowViewModel : ViewModelBase
     OpenCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
       .Subscribe(ShowErrorMessage);
   }
-  
+
   #endregion Configure Commands
 
   #region Get Data
-  
+
   private static async Task<IEnumerable<Pod>> PodsAsync(Namespace? ns, IKubernetesService kubernetesService)
   {
     if (ns == null)
@@ -346,67 +375,74 @@ public class MainWindowViewModel : ViewModelBase
       Parent = parent
     }).ToList();
   }
-  
+
   #endregion Get Data
-  
+
   #region Reset Data
-  
+
   private void ResetPath()
   {
     FileInformation = new List<FileInformation>();
     SelectedPath = null;
     SelectedContainer = null;
-  }  
-  
+  }
+
   private void ResetContainers()
   {
     ResetPath();
     Containers = new List<Container>();
     SelectedPod = null;
 
-  }  
-  
+  }
+
   private void ResetPods()
   {
     ResetContainers();
     SelectedNamespace = null;
     Pods = new List<Pod>();
 
-  }  
-  
+  }
+
   private void ResetNamespaces()
   {
     ResetPods();
     Namespaces = new List<Namespace>();
     SelectedClusterContext = null;
-  }  
-  
+  }
+
   #endregion Reset Data
-  
+
   #region show messages
-  
+
   private void ShowWorkingMessage(string message)
   {
-    Message = new Message
+    RxApp.MainThreadScheduler.Schedule(Action);
+    return;
+
+    void Action()
     {
-      IsVisible = true,
-      Text = message,
-      IsError = false
-    };
+      Message = new Message
+      {
+        IsVisible = true,
+        Text = message,
+        IsError = false
+      };
+    }
   }
 
   private void ShowErrorMessage(string message)
   {
+    RxApp.MainThreadScheduler.Schedule(Action);
+    return;
+
     async void Action()
     {
       Message = new Message { IsVisible = true, Text = message, IsError = true };
       await Task.Delay(7000);
       HideWorkingMessage();
     }
-
-    RxApp.MainThreadScheduler.Schedule(Action);
   }
-  
+
   private void ShowErrorMessage(Exception exception)
   {
     // ReSharper disable once TemplateIsNotCompileTimeConstantProblem
@@ -423,6 +459,6 @@ public class MainWindowViewModel : ViewModelBase
       IsError = false
     });
   }
-  
+
   #endregion show messages
 }

K8sFileBrowser/Views/MainWindow.axaml

@@ -94,6 +94,9 @@
                         <Button Command="{Binding DownloadLogCommand}" VerticalAlignment="Center" ToolTip.Tip="Download Container Log" Margin="0 0 48 0 ">
                             <PathIcon Data="{StaticResource document_one_page_regular}"></PathIcon>
                         </Button>
+                        <Button Command="{Binding RefreshCommand}" VerticalAlignment="Center" ToolTip.Tip="Refresh Directory">
+                            <PathIcon Data="{StaticResource arrow_sync_circle_regular}"></PathIcon>
+                        </Button>
                         <Button Command="{Binding ParentCommand}" VerticalAlignment="Center" ToolTip.Tip="Go To Parent Directory">
                             <PathIcon Data="{StaticResource arrow_curve_up_left_regular}"></PathIcon>
                         </Button>