Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Lite/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@
<TextBlock x:Name="ImportDataButtonText" Text="Import Data" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button x:Name="ImportConnectionsButton" Click="ImportConnectionsButton_Click" Margin="0,8,0,0"
ToolTip="Import server connections from a previous Lite install">
<Button x:Name="ImportSettingsButton" Click="ImportSettingsButton_Click" Margin="0,8,0,0"
ToolTip="Import server connections and settings from a previous Lite install">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE8FA;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
<TextBlock Text="Import Connections" VerticalAlignment="Center"/>
<TextBlock Text="Import Settings" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button x:Name="SettingsButton" Click="SettingsButton_Click" Margin="0,8,0,0">
Expand Down
41 changes: 36 additions & 5 deletions Lite/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ private void AboutButton_Click(object sender, RoutedEventArgs e)
window.ShowDialog();
}

private void ImportConnectionsButton_Click(object sender, RoutedEventArgs e)
private void ImportSettingsButton_Click(object sender, RoutedEventArgs e)
{
var dialog = new Microsoft.Win32.OpenFolderDialog
{
Expand All @@ -849,35 +849,66 @@ private void ImportConnectionsButton_Click(object sender, RoutedEventArgs e)

if (dialog.ShowDialog() != true) return;

var serversJsonPath = System.IO.Path.Combine(dialog.FolderName, "config", "servers.json");
var oldConfigDir = System.IO.Path.Combine(dialog.FolderName, "config");
var serversJsonPath = System.IO.Path.Combine(oldConfigDir, "servers.json");
if (!System.IO.File.Exists(serversJsonPath))
{
MessageBox.Show(
"No config\\servers.json found in the selected folder.\n\nSelect the root folder of a previous Lite installation.",
"Import Connections",
"Import Settings",
MessageBoxButton.OK,
MessageBoxImage.Warning);
return;
}

try
{
// Import server connections (upsert by server name)
var (imported, skipped) = _serverManager.ImportServersFromFile(serversJsonPath);

// Copy config files that don't already exist in the current install
var settingsFiles = new[] { "settings.json", "collection_schedule.json", "ignored_wait_types.json" };
int settingsCopied = 0;

foreach (var fileName in settingsFiles)
{
var source = System.IO.Path.Combine(oldConfigDir, fileName);
var target = System.IO.Path.Combine(App.ConfigDirectory, fileName);

if (System.IO.File.Exists(source) && !System.IO.File.Exists(target))
{
System.IO.File.Copy(source, target);
settingsCopied++;
}
}

// Copy alert_state.json from old root directory
var oldAlertState = System.IO.Path.Combine(dialog.FolderName, "alert_state.json");
var currentAlertState = System.IO.Path.Combine(App.DataDirectory, "alert_state.json");
if (System.IO.File.Exists(oldAlertState) && !System.IO.File.Exists(currentAlertState))
{
System.IO.File.Copy(oldAlertState, currentAlertState);
settingsCopied++;
}

var message = $"Imported {imported} server connection(s).";
if (skipped > 0)
message += $"\nSkipped {skipped} duplicate(s) (already configured).";
if (settingsCopied > 0)
message += $"\nCopied {settingsCopied} settings file(s).";
if (imported > 0)
message += "\n\nCredentials from the previous install are preserved.\nIf any connections fail to authenticate, re-enter the password in Manage Servers.";
if (settingsCopied > 0)
message += "\n\nRestart the application to apply imported settings.";

MessageBox.Show(message, "Import Connections", MessageBoxButton.OK, MessageBoxImage.Information);
MessageBox.Show(message, "Import Settings", MessageBoxButton.OK, MessageBoxImage.Information);

if (imported > 0)
RefreshServerList();
}
catch (Exception ex)
{
MessageBox.Show($"Failed to import connections: {ex.Message}", "Import Error", MessageBoxButton.OK, MessageBoxImage.Error);
MessageBox.Show($"Failed to import settings: {ex.Message}", "Import Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}

Expand Down
Loading