Merge pull request #2 from agailloty/multi-xpaths

Adding the ability to evaluate multiple xpath expressions

XpathRunner/ResultModel.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace XpathRunner;
+
+public class ResultModel
+{
+    public string ColumnName { get; set; }
+    public List<string> Rows { get; set; } = new();
+}

XpathRunner/Service/DialogService.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -30,10 +32,16 @@ public class DialogService
         return fileList;
     }
 
-    public async Task SaveResultsToCsvAsync(string[] content)
+    public async Task SaveResultsToCsvAsync(IEnumerable<IList<string>> content)
     {
-        var result = string.Join(Environment.NewLine, content);
-        await ExportFile(result);
+        StringBuilder lines = new();
+        foreach (var line in content)
+        {
+            var result = string.Join(",", line);
+            lines.AppendLine(result);
+        }
+
+        await ExportFile(lines.ToString());
     }
 
     private async Task ExportFile(string content)

XpathRunner/Service/XpathService.cs

@@ -1,46 +1,62 @@
 using System.Collections.Generic;
+using System.Linq;
 using HtmlAgilityPack;
 
 namespace XpathRunner.Service;
 
 public class XpathService
 {
-    public IList<string> ExtractHtmlContent(string filepath, string xpath)
+    public IList<ResultModel> ExtractMultipleHtmlContent(string[] filepaths, string[] xpaths)
     {
-        if (string.IsNullOrEmpty(filepath) || string.IsNullOrEmpty(xpath))
-            return new List<string>();
+        // keep only the paths and xpaths that are not empty
+        var paths = filepaths.Where(path => !string.IsNullOrEmpty(path)).ToArray();
+        var xpathsList = xpaths.Where(xpath => !string.IsNullOrEmpty(xpath)).ToArray();
 
-        var content = new List<string>();
-        var doc = new HtmlDocument();
-        doc.Load(filepath);
-
-        var results = doc.DocumentNode.SelectNodes(xpath);
-        if (results == null)
-            return content;
-
-        foreach (var result in results)
-            content.Add(result.InnerText.Trim());
-        return content;
-    }
-
-    public IList<string> ExtractHtmlContent(string[] filepaths, string xpath)
-    {
-        if (filepaths == null || filepaths.Length == 0 || string.IsNullOrEmpty(xpath))
-            return new List<string>();
+        // if there are no paths or xpaths, return an empty list
+        if (paths.Length == 0 || xpathsList.Length == 0)
+            return new List<ResultModel>();
 
-        var content = new List<string>();
-        foreach (var filepath in filepaths)
+        var results = new List<ResultModel>();
+
+        foreach (var filepath in paths)
         {
             var doc = new HtmlDocument();
             doc.Load(filepath);
+            var content = EvaluateMultipleXpaths(doc, xpathsList);
+            results.AddRange(content);
+        }
+
+        // Get unique xpath expressions
+        var uniqueXpaths = results.Select(x => x.ColumnName).Distinct().ToList();
+        var uniqueResults = new List<ResultModel>();
+        foreach (var xpath in uniqueXpaths)
+        {
+            var rows = results.Where(r => r.ColumnName == xpath).SelectMany(r => r.Rows).ToList();
+            uniqueResults.Add(new ResultModel { ColumnName = xpath, Rows = rows });
+
+        }
+
+        return uniqueResults;
+    }
 
-            var results = doc.DocumentNode.SelectNodes(xpath);
-            if (results == null)
+    public IList<ResultModel> EvaluateMultipleXpaths(HtmlDocument doc, IEnumerable<string> xpaths)
+    {
+        var results = new List<ResultModel>();
+        foreach (var xpath in xpaths)
+        {
+            var content = new ResultModel( ) { ColumnName = xpath };
+            var resultsNode = doc.DocumentNode.SelectNodes(xpath);
+            if (resultsNode == null)
+            {
+                results.Add(content);
                 continue;
+            }
 
-            foreach (var result in results)
-                content.Add(result.InnerText.Trim());
+            foreach (var result in resultsNode)
+                content.Rows.Add(result.InnerText.Trim());
+            results.Add(content);
         }
-        return content;
+        return results;
     }
+
 }

XpathRunner/ViewModels/MainWindowViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -23,10 +24,17 @@ public class MainWindowViewModel : ObservableObject
     private int _xpathResultCount;
     private ObservableCollection<FileInfo>? _selectedFiles;
     private string _selectedFileLabel;
+    private ObservableCollection<XpathExpressionItem> _xpathExpressions;
+    private readonly XpathService _xpathService;
 
     public MainWindowViewModel()
     {
+        _xpathService = new XpathService();
         IsXpathResultsEmpty = true;
+        XpathExpressions =
+        [
+            new XpathExpressionItem()
+        ];
         FilePickerCommand = new RelayCommand(async () =>
         {
             IsBusy = true;
@@ -35,24 +43,7 @@ public MainWindowViewModel()
             IsBusy = false;
         });
 
-        GetXpathResultsCommand = new RelayCommand(() =>
-        {
-            IsBusy = true;
-            var xpathService = new XpathService();
-            var filePaths = SelectedFiles?.Select(file => file.FullName).ToArray();
-            if (filePaths != null)
-            {
-                var results = xpathService.ExtractHtmlContent(filePaths, XpathExpression);
-                XpathResults.Clear();
-                foreach (var result in results)
-                {
-                    XpathResults.Add(result);
-                }
-                XpathResultsCount = XpathResults.Count;
-                IsXpathResultsEmpty = XpathResultsCount == 0;
-            }
-            IsBusy = false;
-        });
+        GetXpathResultsCommand = new RelayCommand(GetXpathResults);
 
         AddFilesFileCommand = new RelayCommand(async () => await AddFiles());
         RemoveFileCommand = new RelayCommand<FileInfo>(RemoveFile);
@@ -73,10 +64,15 @@ public MainWindowViewModel()
         ExportResultsCommand = new RelayCommand(async () =>
         {
             IsBusy = true;
-            var content = XpathResults.ToArray();
-            await _dialogService.SaveResultsToCsvAsync(content);
+            var content = XpathResults.ToList();
+            //await _dialogService.SaveResultsToCsvAsync(content);
             IsBusy = false;
         });
+
+        AddXpathCommand = new RelayCommand(() =>
+        {
+                XpathExpressions.Add(new XpathExpressionItem());
+        });
     }
 
     #region  Public properties
@@ -117,7 +113,8 @@ public string XpathExpression
         set => SetProperty(ref _xpathExpression, value);
     }
 
-    public ObservableCollection<string> XpathResults { get; } = new();
+    public event PropertyChangedEventHandler? ResultsChanged;
+    public ObservableCollection<ResultModel> XpathResults { get; } = new();
 
     public bool IsXpathResultsEmpty
     {
@@ -148,13 +145,22 @@ public string SelectedFilesLabel
     public ICommand AddFilesFileCommand { get; }
     public ICommand RemoveFileCommand { get; }
     public ICommand ExportResultsCommand { get; }
+
+    public ICommand AddXpathCommand { get; }
 
     public ObservableCollection<FileInfo>? SelectedFiles
     {
         get => _selectedFiles;
         set => SetProperty(ref _selectedFiles, value);
     }
 
+    public ObservableCollection<XpathExpressionItem> XpathExpressions
+    {
+        get => _xpathExpressions;
+        set => SetProperty(ref _xpathExpressions, value);
+    }
+
+
     #endregion
 
     #region Private methods
@@ -186,7 +192,7 @@ private void RemoveFile(FileInfo? file)
 
     private void UpdateSelectedFilesLabel()
     {
-        if (SelectedFiles.Count == 1)
+        if (SelectedFiles?.Count == 1)
         {
             SelectedFilesLabel = $"Selected file : {FilePath}";
         }
@@ -195,5 +201,28 @@ private void UpdateSelectedFilesLabel()
             SelectedFilesLabel = $"Number of selected files : {SelectedFiles.Count}";
         }
     }
+
+    private void GetXpathResults()
+    {
+        IsBusy = true;
+        var filePaths = SelectedFiles?.Select(file => file.FullName).ToArray();
+        if (filePaths != null)
+        {
+            var nonEmptyXpaths = XpathExpressions.Where(expression => !string.IsNullOrEmpty(expression.XpathExpression))
+                .Select(x => x.XpathExpression).ToArray();
+            var results = _xpathService.ExtractMultipleHtmlContent(filePaths, nonEmptyXpaths);
+            XpathResults.Clear();
+            foreach (var result in results)
+            {
+                XpathResults.Add(result);
+            }
+
+            XpathResultsCount = XpathResults
+                .Select(x => x.Rows.Count).Sum();
+            IsXpathResultsEmpty = XpathResultsCount == 0;
+        }
+        IsBusy = false;
+    }
+
     #endregion
 }

XpathRunner/ViewModels/XpathExpressionItem.cs

@@ -0,0 +1,14 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace XpathRunner.ViewModels;
+
+public class XpathExpressionItem : ObservableObject
+{
+    private string _xpathExpression;
+
+    public string XpathExpression
+    {
+        get => _xpathExpression;
+        set => SetProperty(ref _xpathExpression, value);
+    }
+}

XpathRunner/Views/MainView.axaml

@@ -38,7 +38,7 @@
 									        VerticalAlignment="Top" HorizontalAlignment="Right">
 										<Button.ContentTemplate>
 											<DataTemplate>
-												<Image Margin="0" Width="15" Height="15" VerticalAlignment="Top"
+												<Image Margin="0 0 0 5" Width="15" Height="15" VerticalAlignment="Top"
 												       HorizontalAlignment="Right" Source="/Assets/deletebtn.png" />
 											</DataTemplate>
 										</Button.ContentTemplate>
@@ -60,8 +60,16 @@
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<TextBlock VerticalAlignment="Center" Grid.Column="0" FontWeight="Bold" FontSize="15" Text="Xpath: "/>
-				<TextBox Grid.Column="1" Text="{Binding XpathExpression}" TextWrapping="Wrap" FontSize="15" MaxHeight="100"/>
+				<Button Grid.Column="0" Content="Add Xpath" Command="{Binding AddXpathCommand}"></Button>
+				<ScrollViewer Grid.Column="1" MaxHeight="150">
+					<ItemsControl  ItemsSource="{Binding XpathExpressions}">
+						<ItemsControl.ItemTemplate>
+							<DataTemplate>
+								<TextBox Margin="2" Text="{Binding XpathExpression, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" FontSize="15" MaxHeight="100"/>
+							</DataTemplate>
+						</ItemsControl.ItemTemplate>
+					</ItemsControl>
+				</ScrollViewer>
 				<Button Grid.Column="2" Margin="10 0 0 0" ClickMode="Press" Command="{Binding GetXpathResultsCommand}">Search</Button>
 			</Grid>
 

XpathRunner/Views/XpathResults.axaml

@@ -4,11 +4,29 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:vm="using:XpathRunner.ViewModels"
+             xmlns:xpathRunner="clr-namespace:XpathRunner"
              x:DataType="vm:MainWindowViewModel"
-             x:Class="XpathRunner.Views.XpathResults">
+             x:Class="XpathRunner.Views.XpathResults"
+             >
     <Border>
-        <ScrollViewer>
-            <ListBox ItemsSource="{Binding XpathResults}" />
+        <ScrollViewer HorizontalScrollBarVisibility="Auto">
+            <ItemsControl ItemsSource="{Binding XpathResults}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <Expander MinWidth="100" BorderBrush="Transparent" Background="Transparent" IsExpanded="True" Header="{Binding ColumnName}">
+                                <StackPanel>
+                                    <StackPanel Margin="0 10 10 10" Orientation="Horizontal">
+                                        <TextBlock FontWeight="Bold" FontSize="16" Text="{Binding ColumnName}" />
+                                        <TextBlock FontWeight="Bold" FontSize="16" Text="{Binding Rows.Count, StringFormat=' (Count : {0} )'}" />
+                                    </StackPanel>
+                                    <ListBox Background="Transparent" ItemsSource="{Binding Rows}" />
+                                </StackPanel>
+                            </Expander>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
         </ScrollViewer>
     </Border>
 </UserControl>

XpathRunner/Views/XpathResults.axaml.cs

@@ -1,6 +1,8 @@
+using System.ComponentModel;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using XpathRunner.ViewModels;
 
 namespace XpathRunner.Views;
 

XpathRunner/XpathRunner.csproj

@@ -12,10 +12,6 @@
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
-
-  <PropertyGroup>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
 
   <ItemGroup>
     <None Remove="Assets\html_tag.png" />