feat: Add original text preservation and configurable export separator

claude · claude · commit d64927fb0ed4 · 2026-01-17T05:47:07.000+08:00
- Preserve original proxy line during parsing
- Add option to export original line
- Add custom export separator configuration
- Fix ExportOptionsDialog layout and interaction
- Fix potential null dereference in CopyAsync
diff --git a/Dialogs/Models/ExportOptionsModel.cs b/Dialogs/Models/ExportOptionsModel.cs
@@ -2,6 +2,9 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Irihi.Avalonia.Shared.Contracts;
 
+using Ursa.Common;
+using Ursa.Controls;
+
 namespace ProxyChecker.Dialogs.Models;
 
 public partial class ExportOptionsModel : ObservableObject, IDialogContext
@@ -14,6 +17,8 @@ public partial class ExportOptionsModel : ObservableObject, IDialogContext
     [ObservableProperty] private bool _includeLocation = false;
     [ObservableProperty] private bool _includeIsp = false;
     [ObservableProperty] private bool _includeResponseTime = false;
+    [ObservableProperty] private bool _includeOriginalLine = false;
+    [ObservableProperty] private string _separator = ",";
     [ObservableProperty] private bool _onlySuccess = true;
 
     public void Close()
@@ -23,8 +28,8 @@ public void Close()
 
     public event EventHandler<object?>? RequestClose;
 
-    public void Confirm() => RequestClose?.Invoke(this, true);
-    public void Cancel() => RequestClose?.Invoke(this, false);
+    public void Confirm() => RequestClose?.Invoke(this, DialogResult.OK);
+    public void Cancel() => RequestClose?.Invoke(this, DialogResult.Cancel);
 
     // 全选所有字段
     public void SelectAll()
@@ -37,6 +42,7 @@ public void SelectAll()
         IncludeLocation = true;
         IncludeIsp = true;
         IncludeResponseTime = true;
+        IncludeOriginalLine = true;
     }
 
     // 取消全选
@@ -50,5 +56,6 @@ public void DeselectAll()
         IncludeLocation = false;
         IncludeIsp = false;
         IncludeResponseTime = false;
+        IncludeOriginalLine = false;
     }
 }
diff --git a/Dialogs/Views/ExportOptionsDialog.axaml b/Dialogs/Views/ExportOptionsDialog.axaml
@@ -30,11 +30,12 @@
                         CornerRadius="6" Padding="12" Margin="0,0,0,8">
                     <StackPanel Spacing="8">
                         <TextBlock Text="代理信息" Foreground="{DynamicResource SemiColorText2}" FontWeight="Bold"/>
-                        <UniformGrid Columns="2" Rows="2">
+                        <UniformGrid Columns="2">
                             <CheckBox Content="IP" IsChecked="{Binding IncludeIp}" Margin="0,4"/>
                             <CheckBox Content="端口" IsChecked="{Binding IncludePort}" Margin="0,4"/>
                             <CheckBox Content="用户名" IsChecked="{Binding IncludeUsername}" Margin="0,4"/>
                             <CheckBox Content="密码" IsChecked="{Binding IncludePassword}" Margin="0,4"/>
+                            <CheckBox Content="原始行" IsChecked="{Binding IncludeOriginalLine}" Margin="0,4"/>
                         </UniformGrid>
                     </StackPanel>
                 </Border>
@@ -57,16 +58,21 @@
             
             <u:Divider Margin="0,4"/>
 
-            <Grid ColumnDefinitions="Auto,*" Margin="0,4">
+            <Grid ColumnDefinitions="Auto,*,Auto" Margin="0,4">
                  <CheckBox Grid.Column="0" Content="仅导出成功的代理" IsChecked="{Binding OnlySuccess}" 
                            FontWeight="Bold"
                            VerticalAlignment="Center"/>
                 
-                <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
-                    <Button Content="取消" Command="{Binding Cancel}" Classes="Tertiary" Width="80"/>
-                    <Button Content="确定" Command="{Binding Confirm}" Classes="Primary" Theme="{DynamicResource SolidButton}" Width="80"/>
+                <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="8">
+                    <TextBlock Text="分隔符" VerticalAlignment="Center"/>
+                    <TextBox Text="{Binding Separator}" Width="60" TextAlignment="Center"/>
                 </StackPanel>
             </Grid>
+
+            <StackPanel Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right" Margin="0,8,0,0">
+                <Button Content="取消" Command="{Binding Cancel}" Classes="Tertiary" Width="80"/>
+                <Button Content="确定" Command="{Binding Confirm}" Classes="Primary" Theme="{DynamicResource SolidButton}" Width="80"/>
+            </StackPanel>
         </StackPanel>
     </Border>
 </UserControl>
diff --git a/Models/ProxyInfo.cs b/Models/ProxyInfo.cs
@@ -5,7 +5,8 @@ public record ProxyInfo(
     string Ip,
     int Port,
     string Username,
-    string Password = ""
+    string Password = "",
+    string OriginalLine = ""
 )
 {
     public string Address => $"{Ip}:{Port}";
diff --git a/Services/ProxyFileParser.cs b/Services/ProxyFileParser.cs
@@ -122,7 +122,8 @@ public static List<ProxyInfo> ParseFromContent(string content)
                                     Ip: subIp,
                                     Port: subPort,
                                     Username: subUser ?? "",
-                                    Password: subPass ?? ""
+                                    Password: subPass ?? "",
+                                    OriginalLine: line
                                 );
                             }
                         }
@@ -161,7 +162,8 @@ public static List<ProxyInfo> ParseFromContent(string content)
                     Ip: ip,
                     Port: port,
                     Username: username ?? "",
-                    Password: password ?? ""
+                    Password: password ?? "",
+                    OriginalLine: line
                 );
             }
         }
@@ -184,7 +186,8 @@ public static List<ProxyInfo> ParseFromContent(string content)
                 Index: int.Parse(match1.Groups[1].Value),
                 Ip: match1.Groups[2].Value,
                 Port: int.Parse(match1.Groups[3].Value),
-                Username: match1.Groups[4].Value
+                Username: match1.Groups[4].Value,
+                OriginalLine: line
             );
         }
 
@@ -197,7 +200,8 @@ public static List<ProxyInfo> ParseFromContent(string content)
                 Ip: match2.Groups[1].Value,
                 Port: int.Parse(match2.Groups[2].Value),
                 Username: match2.Groups[3].Value,
-                Password: match2.Groups[4].Value
+                Password: match2.Groups[4].Value,
+                OriginalLine: line
             );
         }
 
@@ -209,7 +213,8 @@ public static List<ProxyInfo> ParseFromContent(string content)
                 Index: defaultIndex,
                 Ip: match3.Groups[1].Value,
                 Port: int.Parse(match3.Groups[2].Value),
-                Username: match3.Groups[3].Value
+                Username: match3.Groups[3].Value,
+                OriginalLine: line
             );
         }
 
@@ -221,7 +226,8 @@ public static List<ProxyInfo> ParseFromContent(string content)
                 Index: defaultIndex,
                 Ip: match4.Groups[1].Value,
                 Port: int.Parse(match4.Groups[2].Value),
-                Username: match4.Groups[3].Value
+                Username: match4.Groups[3].Value,
+                OriginalLine: line
             );
         }
 
diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs
@@ -575,6 +575,11 @@ private async Task ExportAllAsync()
         {
             var parts = new List<string>();
 
+            if (optionsModel.IncludeOriginalLine && !string.IsNullOrEmpty(r.Proxy.OriginalLine))
+            {
+                parts.Add(r.Proxy.OriginalLine);
+            }
+
             if (optionsModel.IncludeIp) parts.Add(r.Proxy.Ip);
             if (optionsModel.IncludePort) parts.Add(r.Proxy.Port.ToString());
             if (optionsModel.IncludeUsername) parts.Add(r.Proxy.Username ?? "");
@@ -584,7 +589,7 @@ private async Task ExportAllAsync()
             if (optionsModel.IncludeIsp) parts.Add(r.Isp ?? "");
             if (optionsModel.IncludeResponseTime) parts.Add(r.ResponseTimeDisplay);
 
-            return string.Join(",", parts);
+            return string.Join(optionsModel.Separator, parts);
         }).ToList();
 
         if (lines.Count == 0) return;
@@ -751,8 +756,9 @@ private async Task CopyAsync()
         var selection = ResultsSource.Selection as ITreeDataGridRowSelectionModel<CheckResult>;
         if (selection == null || selection.SelectedItems.Count == 0) return;
 
-        var text = string.Join(Environment.NewLine, selection.SelectedItems.Select(r =>
-            string.IsNullOrEmpty(r.Proxy.Username)
+        var text = string.Join(Environment.NewLine, selection.SelectedItems
+            .Where(r => r != null)
+            .Select(r => string.IsNullOrEmpty(r!.Proxy.Username)
                 ? $"{r.Proxy.Ip}:{r.Proxy.Port}"
                 : $"{r.Proxy.Ip}:{r.Proxy.Port}:{r.Proxy.Username}:{r.Proxy.Password}"));
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ public record ProxyInfo(`
`5`	`5`	`string Ip,`
`6`	`6`	`int Port,`
`7`	`7`	`string Username,`
`8`		`- string Password = ""`
	`8`	`+ string Password = "",`
	`9`	`+ string OriginalLine = ""`
`9`	`10`	`)`
`10`	`11`	`{`
`11`	`12`	`public string Address => $"{Ip}:{Port}";`