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
7 changes: 7 additions & 0 deletions Lite/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@
<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">
<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"/>
</StackPanel>
</Button>
<Button x:Name="SettingsButton" Click="SettingsButton_Click" Margin="0,8,0,0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE713;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
Expand Down
41 changes: 41 additions & 0 deletions Lite/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,47 @@ private void AboutButton_Click(object sender, RoutedEventArgs e)
window.ShowDialog();
}

private void ImportConnectionsButton_Click(object sender, RoutedEventArgs e)
{
var dialog = new Microsoft.Win32.OpenFolderDialog
{
Title = "Select Previous Lite Install Folder"
};

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

var serversJsonPath = System.IO.Path.Combine(dialog.FolderName, "config", "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",
MessageBoxButton.OK,
MessageBoxImage.Warning);
return;
}

try
{
var (imported, skipped) = _serverManager.ImportServersFromFile(serversJsonPath);

var message = $"Imported {imported} server connection(s).";
if (skipped > 0)
message += $"\nSkipped {skipped} duplicate(s) (already configured).";
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.";

MessageBox.Show(message, "Import Connections", 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);
}
}

private async void ImportDataButton_Click(object sender, RoutedEventArgs e)
{
/* Open folder browser to select the old Lite install directory */
Expand Down
54 changes: 54 additions & 0 deletions Lite/Services/ServerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,60 @@ private void LoadServers()
}
}

/// <summary>
/// Imports server connections from an external servers.json file.
/// Upserts by ServerName — existing servers are skipped, new ones are added
/// with their original GUIDs so Credential Manager entries still resolve.
/// Returns (imported count, skipped count).
/// </summary>
public (int Imported, int Skipped) ImportServersFromFile(string serversJsonPath)
{
if (!File.Exists(serversJsonPath))
throw new FileNotFoundException("servers.json not found", serversJsonPath);

var json = File.ReadAllText(serversJsonPath);
var config = JsonSerializer.Deserialize<ServersConfig>(json);
var importedServers = config?.Servers ?? [];

int imported = 0;
int skipped = 0;

lock (_serversLock)
{
foreach (var server in importedServers)
{
// Skip if we already have a server with the same name
var existing = _servers.FirstOrDefault(s =>
string.Equals(s.ServerName, server.ServerName, StringComparison.OrdinalIgnoreCase) &&
s.ReadOnlyIntent == server.ReadOnlyIntent);

if (existing != null)
{
skipped++;
continue;
}

// Also skip if the same GUID already exists (shouldn't happen, but defensive)
if (_servers.Any(s => s.Id == server.Id))
{
skipped++;
continue;
}

// Add with original GUID so Credential Manager entries still work
_servers.Add(server);
_connectionStatuses[server.Id] = new ServerConnectionStatus { ServerId = server.Id };
imported++;
}

if (imported > 0)
SaveServers();
}

_logger?.LogInformation("Imported {Imported} servers, skipped {Skipped} duplicates", imported, skipped);
return (imported, skipped);
}

/// <summary>
/// Saves servers to the JSON config file.
/// </summary>
Expand Down
Loading