diff --git a/.idea/.idea.PSCHelpdesk/.idea/workspace.xml b/.idea/.idea.PSCHelpdesk/.idea/workspace.xml
index 2d0e715..a68c554 100644
--- a/.idea/.idea.PSCHelpdesk/.idea/workspace.xml
+++ b/.idea/.idea.PSCHelpdesk/.idea/workspace.xml
@@ -11,21 +11,10 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -82,7 +71,7 @@
+
@@ -277,43 +267,30 @@
file://$PROJECT_DIR$/PSCHelpdesk/PSCHelpdesk/Views/ContentDisplay.axaml.cs
- 91
+ 92
-
+
-
+
file://$PROJECT_DIR$/PSCHelpdesk/PSCHelpdesk/Views/ContentDisplay.axaml.cs
- 80
+ 81
-
+
-
+
-
- file://$PROJECT_DIR$/HetznerServer/ViewModels/ServerViewModel.cs
- 82
-
-
-
-
-
-
-
-
-
-
diff --git a/HetznerServer/ViewModels/ServerViewModel.cs b/HetznerServer/ViewModels/ServerViewModel.cs
index f9c2584..6a96ec2 100644
--- a/HetznerServer/ViewModels/ServerViewModel.cs
+++ b/HetznerServer/ViewModels/ServerViewModel.cs
@@ -2,6 +2,7 @@
using System.Diagnostics;
using System.Reactive;
using Avalonia.Controls;
+using Avalonia.Interactivity;
using CommunityToolkit.Mvvm.DependencyInjection;
using CommunityToolkit.Mvvm.Input;
using HetznerCloudApi;
@@ -16,13 +17,11 @@ namespace PSCHelpdesk.Plugins.HetznerServer.ViewModels;
public partial class ServerViewModel : ViewModelBase, IViewModelBase
{
- public ReactiveCommand OpenSSH { get; }
public ReactiveCommand SelectionChanged { get; }
private SettingsManager _settingsManager;
public ServerViewModel()
{
- OpenSSH = ReactiveCommand.Create(openSSH);
SelectionChanged = ReactiveCommand.Create(selectionChanged);
Server = new ObservableCollection();
SelectedServer = new Server(1,"","","","","");
@@ -71,24 +70,24 @@ public partial class ServerViewModel : ViewModelBase, IViewModelBase
}
}
-
-
- void openSSH(Server server)
- {
- //Process.Start(_settingsManager.CoreSettings.SSHClientExecutable,string.Format(_settingsManager.CoreSettings.SSHClientExecutableArgs, server.Ipv4));
- }
-
- public void RunTheThing(Server server)
- {
- Process.Start(_settingsManager.CoreSettings.SSHClientExecutable,string.Format(_settingsManager.CoreSettings.SSHClientExecutableArgs, server.Ipv4));
- }
-
void selectionChanged(SelectionChangedEventArgs args)
{
this.SelectedServer = (args.Source as DataGrid).SelectedItem as Server;
IsPagePaneOpen = true;
}
+ public void SSH(Server server)
+ {
+ Process.Start(_settingsManager.CoreSettings.SSHClientExecutable,string.Format(_settingsManager.CoreSettings.SSHClientExecutableArgs, server.Ipv4, _settingsManager.CoreSettings.PrivateSSHKeyPath));
+
+ }
+
+ public void SCP(Server server)
+ {
+ Process.Start(_settingsManager.CoreSettings.SCPClientExecutable,string.Format(_settingsManager.CoreSettings.SCPClientExecutableArgs, server.Ipv4, _settingsManager.CoreSettings.PrivateSSHKeyPath));
+
+ }
+
public UserControl GetViewControl()
{
return new ServerView();
diff --git a/HetznerServer/Views/ServerView.axaml b/HetznerServer/Views/ServerView.axaml
index 68164d8..a3f2640 100644
--- a/HetznerServer/Views/ServerView.axaml
+++ b/HetznerServer/Views/ServerView.axaml
@@ -38,7 +38,7 @@
HorizontalContentAlignment="Center"
Background="#232323"
Command="{Binding ShowServerDetails}"
- CommandParameter="{Binding .}"
+ CommandParameter="{Binding $self}"
Content="View"
Foreground="White" />
@@ -51,8 +51,7 @@
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Background="#232323"
- Command="{Binding Path=$parent[DataGrid].((vm:ServerViewModel)DataContext).OpenSSH}"
- CommandParameter="{Binding .}"
+ Click="openSSH"
Content="Open SSH"
Foreground="White" />
@@ -65,8 +64,7 @@
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Background="#232323"
- Command="{Binding #ServerTable.((vm:ServerViewModel)DataContext).OpenSSH}"
- CommandParameter="{Binding .}"
+ Click="openSCP"
Content="Open SCP"
Foreground="White" />
diff --git a/HetznerServer/Views/ServerView.axaml.cs b/HetznerServer/Views/ServerView.axaml.cs
index 2a6a999..183fbd3 100644
--- a/HetznerServer/Views/ServerView.axaml.cs
+++ b/HetznerServer/Views/ServerView.axaml.cs
@@ -1,4 +1,6 @@
using Avalonia.Controls;
+using Avalonia.Interactivity;
+using PSCHelpdesk.Plugins.HetznerServer.Models;
using PSCHelpdesk.Plugins.HetznerServer.ViewModels;
namespace PSCHelpdesk.Plugins.HetznerServer.Views;
@@ -8,7 +10,15 @@ public partial class ServerView : UserControl
public ServerView()
{
InitializeComponent();
+ }
- this.DataContext = new ServerViewModel();
+ private void openSSH(object? sender, RoutedEventArgs e)
+ {
+ ((ServerViewModel)DataContext).SSH(((Button)sender).DataContext as Server);
+ }
+
+ private void openSCP(object? sender, RoutedEventArgs e)
+ {
+ ((ServerViewModel)DataContext).SCP(((Button)sender).DataContext as Server);
}
}
\ No newline at end of file
diff --git a/testdisk.log b/testdisk.log
new file mode 100644
index 0000000..f60e55c
--- /dev/null
+++ b/testdisk.log
@@ -0,0 +1,37 @@
+
+
+Thu Nov 7 13:56:49 2024
+Command line: TestDisk
+
+TestDisk 7.1, Data Recovery Utility, July 2019
+Christophe GRENIER
+https://www.cgsecurity.org
+OS: Linux, kernel 6.8.0-48-generic (#48-Ubuntu SMP PREEMPT_DYNAMIC Fri Sep 27 14:04:52 UTC 2024) x86_64
+Compiler: GCC 13.2
+ext2fs lib: 1.47.0, ntfs lib: libntfs-3g, reiserfs lib: none, ewf lib: none, curses lib: ncurses 6.4
+Warning: can't get size for Disk /dev/mapper/control - 0 B - 0 sectors, sector size=512
+Warning: can't get size for Disk /dev/loop19 - 0 B - 0 sectors, sector size=512
+Hard disk list
+Disk /dev/loop0 - 4096 B - 8 sectors (RO), sector size=512
+Disk /dev/loop1 - 1545 MB / 1474 MiB - 3019392 sectors (RO), sector size=512
+Disk /dev/loop10 - 96 MB / 91 MiB - 187776 sectors (RO), sector size=512
+Disk /dev/loop11 - 222 MB / 212 MiB - 434664 sectors (RO), sector size=512
+Disk /dev/loop12 - 700 MB / 668 MiB - 1368944 sectors (RO), sector size=512
+Disk /dev/loop13 - 813 MB / 775 MiB - 1588960 sectors (RO), sector size=512
+Disk /dev/loop14 - 1019 MB / 972 MiB - 1990800 sectors (RO), sector size=512
+Disk /dev/loop15 - 1949 MB / 1858 MiB - 3806848 sectors (RO), sector size=512
+Disk /dev/loop16 - 40 MB / 38 MiB - 79520 sectors (RO), sector size=512
+Disk /dev/loop17 - 107 MB / 102 MiB - 209168 sectors (RO), sector size=512
+Disk /dev/loop18 - 107 MB / 102 MiB - 209616 sectors (RO), sector size=512
+Disk /dev/loop2 - 58 MB / 55 MiB - 113384 sectors (RO), sector size=512
+Disk /dev/loop3 - 77 MB / 74 MiB - 152056 sectors (RO), sector size=512
+Disk /dev/loop4 - 77 MB / 73 MiB - 151296 sectors (RO), sector size=512
+Disk /dev/loop5 - 58 MB / 55 MiB - 113992 sectors (RO), sector size=512
+Disk /dev/loop6 - 71 MB / 67 MiB - 138768 sectors (RO), sector size=512
+Disk /dev/loop7 - 71 MB / 67 MiB - 138776 sectors (RO), sector size=512
+Disk /dev/loop8 - 172 MB / 164 MiB - 337560 sectors (RO), sector size=512
+Disk /dev/loop9 - 529 MB / 505 MiB - 1034424 sectors (RO), sector size=512
+Disk /dev/nvme0n1 - 1000 GB / 931 GiB - CHS 953869 64 32, sector size=512
+
+
+TestDisk exited normally.