Feature; Add preview statistics handling.

Author: deanthecoder

CodeIngest.Desktop/CodeIngest.Desktop.csproj

@@ -43,5 +43,9 @@
         <DependentUpon>MainWindow.axaml</DependentUpon>
         <SubType>Code</SubType>
       </Compile>
+      <Compile Update="Views\App.axaml.cs">
+        <DependentUpon>App.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
     </ItemGroup>
 </Project>

CodeIngest.Desktop/MainViewModel.cs

@@ -9,6 +9,7 @@
 // 
 // THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.
 
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using CodeIngestLib;
@@ -23,33 +24,43 @@ namespace CodeIngest.Desktop;
 public class MainViewModel : ViewModelBase
 {
     private readonly IDialogService m_dialogService;
-    private FolderTreeRoot m_root = new FolderTreeRoot(Settings.Instance.RootFolder);
-
+    private readonly ActionConsolidator m_folderSelectionConsolidator;
+    private FolderTreeRoot m_root;
+    private ProgressToken m_backgroundRefreshProgress;
     private bool m_isCSharp = Settings.Instance.IsCSharp;
     private bool m_isCppNoHeaders = Settings.Instance.IsCppNoHeaders;
     private bool m_isCppWithHeaders = Settings.Instance.IsCppWithHeaders;
     private bool m_includeMarkdown = Settings.Instance.IncludeMarkdown;
     private bool m_excludeImports = Settings.Instance.ExcludeImports;
     private bool m_useFullPaths = Settings.Instance.UseFullPaths;
     private bool m_excludeComments = Settings.Instance.ExcludeComments;
+    private int? m_previewFileCount;
+    private long? m_previewFileSize;
+    private bool m_isGeneratingPreview;
 
     public FolderTreeRoot Root
     {
         get => m_root;
         set
         {
-            if (SetField(ref m_root, value))
-                Settings.Instance.RootFolder = value.Root.Clone();
+            if (!SetField(ref m_root, value) || value == null)
+                return;
+            Settings.Instance.RootFolder = m_root.Root.Clone();
+            m_root.SelectionChanged += OnFolderSelectionChanged;
+            InvalidatePreviewStats();
         }
     }
-
+    
     public bool IsCSharp
     {
         get => m_isCSharp;
         set
         {
             if (SetField(ref m_isCSharp, value))
+            {
                 Settings.Instance.IsCSharp = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
@@ -59,7 +70,10 @@ public bool IsCppNoHeaders
         set
         {
             if (SetField(ref m_isCppNoHeaders, value))
+            {
                 Settings.Instance.IsCppNoHeaders = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
@@ -69,7 +83,10 @@ public bool IsCppWithHeaders
         set
         {
             if (SetField(ref m_isCppWithHeaders, value))
+            {
                 Settings.Instance.IsCppWithHeaders = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
@@ -79,7 +96,10 @@ public bool ExcludeImports
         set
         {
             if (SetField(ref m_excludeImports, value))
+            {
                 Settings.Instance.ExcludeImports = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
@@ -89,7 +109,10 @@ public bool ExcludeComments
         set
         {
             if (SetField(ref m_excludeComments, value))
+            {
                 Settings.Instance.ExcludeComments = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
@@ -99,7 +122,10 @@ public bool IncludeMarkdown
         set
         {
             if (SetField(ref m_includeMarkdown, value))
+            {
                 Settings.Instance.IncludeMarkdown = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
@@ -109,10 +135,31 @@ public bool UseFullPaths
         set
         {
             if (SetField(ref m_useFullPaths, value))
+            {
                 Settings.Instance.UseFullPaths = value;
+                InvalidatePreviewStats();
+            }
         }
     }
 
+    public int? PreviewFileCount
+    {
+        get => m_previewFileCount;
+        set => SetField(ref m_previewFileCount, value);
+    }
+
+    public long? PreviewFileSize
+    {
+        get => m_previewFileSize;
+        set => SetField(ref m_previewFileSize, value);
+    }
+
+    public bool IsGeneratingPreview
+    {
+        get => m_isGeneratingPreview;
+        set => SetField(ref m_isGeneratingPreview, value);
+    }
+
     public async Task SelectRoot()
     {
         var rootFolder = await m_dialogService.SelectFolderAsync("Select a folder to scan for code.");
@@ -125,6 +172,9 @@ public async Task SelectRoot()
     public MainViewModel(IDialogService dialogService = null)
     {
         m_dialogService = dialogService ?? DialogService.Instance;
+
+        m_folderSelectionConsolidator = new ActionConsolidator(RefreshPredictedSize, 2.0);
+        Root = new FolderTreeRoot(Settings.Instance.RootFolder);
     }
 
     public async Task RunIngest()
@@ -146,6 +196,25 @@ public async Task RunIngest()
         if (outputFile == null)
             return; // User cancelled.
 
+        var progress = new ProgressToken(true) { IsCancelSupported = true };
+        (int FileCount, long OutputBytes)? result;
+        using (m_dialogService.ShowBusy("Generating code...", progress))
+        {
+            var options = GetIngestOptions();
+            var ingester = new Ingester(options);
+            result = await Task.Run(() => ingester.Run(selectedFolders, outputFile, progress));
+        }
+        if (!result.HasValue)
+        {
+            m_dialogService.ShowMessage("Failed to generate code file.", "Please check your file permissions and try again.", MaterialIconKind.Error);
+            return;
+        }
+        
+        m_dialogService.ShowMessage("Code file generated successfully.", $"{result.Value.FileCount:N0} files produced {result.Value.OutputBytes.ToSize()} of output.");
+    }
+
+    private IngestOptions GetIngestOptions()
+    {
         var options = new IngestOptions
         {
             ExcludeImports = ExcludeImports,
@@ -168,20 +237,53 @@ public async Task RunIngest()
 
         if (IncludeMarkdown)
             options.FilePatterns.Add("*.md");
+        return options;
+    }
 
-        var progress = new ProgressToken(true) { IsCancelSupported = true };
-        (int FileCount, long OutputBytes)? result;
-        using (m_dialogService.ShowBusy("Generating code...", progress))
+    private void OnFolderSelectionChanged(object sender, EventArgs e) =>
+        InvalidatePreviewStats();
+
+    private void InvalidatePreviewStats() =>
+        m_folderSelectionConsolidator.Invoke();
+
+    private void RefreshPredictedSize()
+    {
+        m_backgroundRefreshProgress?.Cancel();
+        
+        var selectedFolders = Root.GetSelectedItems().ToArray();
+        if (selectedFolders.Length == 0)
         {
-            var ingester = new Ingester(options);
-            result = await Task.Run(() => ingester.Run(selectedFolders, outputFile, progress));
+            PreviewFileCount = 0;
+            PreviewFileSize = 0;
+            return; // Nothing to do.
         }
-        if (!result.HasValue)
+        
+        var options = GetIngestOptions();
+        if (options.FilePatterns.Count == 0)
         {
-            m_dialogService.ShowMessage("Failed to generate code file.", "Please check your file permissions and try again.", MaterialIconKind.Error);
-            return;
+            PreviewFileCount = 0;
+            PreviewFileSize = 0;
+            return; // Nothing search.
         }
 
-        m_dialogService.ShowMessage("Code file generated successfully.", $"{result.Value.FileCount:N0} files produced {result.Value.OutputBytes.ToSize()} of output.");
+        var ingester = new Ingester(options);
+        m_backgroundRefreshProgress = new ProgressToken(true);
+        
+        Task.Run(() =>
+        {
+            IsGeneratingPreview = true;
+            try
+            {
+                var result = ingester.Run(selectedFolders, progress: m_backgroundRefreshProgress);
+                if (!result.HasValue || m_backgroundRefreshProgress.CancelRequested)
+                    return;
+                PreviewFileCount = result.Value.FileCount;
+                PreviewFileSize = result.Value.OutputBytes;
+            }
+            finally
+            {
+                IsGeneratingPreview = false;
+            }
+        });
     }
 }

CodeIngest.Desktop/Program.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using System;
 using System.Threading.Tasks;
+using CodeIngest.Desktop.Views;
 using CSharp.Core;
 
 namespace CodeIngest.Desktop;

CodeIngest.Desktop/App.axaml renamed to CodeIngest.Desktop/Views/App.axaml

@@ -4,7 +4,8 @@
              xmlns:themes="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:viewModels="clr-namespace:CodeIngest.Desktop"
-             x:Class="CodeIngest.Desktop.App"
+             xmlns:converters="clr-namespace:CSharp.Core.Converters;assembly=CSharp.Core"
+             x:Class="CodeIngest.Desktop.Views.App"
              RequestedThemeVariant="Default"
              Name="Code Ingest"
              x:DataType="viewModels:AppViewModel">
@@ -26,6 +27,10 @@
         </Style>
     </Application.Styles>
 
+    <Application.Resources>
+        <converters:BytesToUiStringConverter x:Key="BytesToUiStringConverter" />
+    </Application.Resources>
+    
     <NativeMenu.Menu>
         <NativeMenu>
             <NativeMenuItem Header="About Code Ingest" Command="{CompiledBinding AboutCommand}" />

CodeIngest.Desktop/App.axaml.cs renamed to CodeIngest.Desktop/Views/App.axaml.cs

@@ -8,13 +8,13 @@
 // about your modifications. Your contributions are valued!
 //
 // THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND.
+
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using CodeIngest.Desktop.Views;
 using CSharp.Core.UI;
 
-namespace CodeIngest.Desktop;
+namespace CodeIngest.Desktop.Views;
 
 public class App : Application
 {

CodeIngest.Desktop/Views/MainWindow.axaml

@@ -34,9 +34,44 @@
                 </Style>
             </Grid.Styles>
 
-            <Border BorderThickness="1" Margin="8" DragDrop.AllowDrop="True">
-                <ui:FolderTree Root="{Binding Root}" Margin="8" />
-            </Border>
+            <Grid RowDefinitions="*,Auto">
+                <!-- Source Tree -->
+                <Border BorderThickness="1" Margin="8,8,8,4" DragDrop.AllowDrop="True">
+                    <ui:FolderTree Root="{Binding Root}" Margin="8" />
+                </Border>
+                
+                <!-- Statistics -->
+                <Border Grid.Row="1"
+                        BorderThickness="1" Margin="8,4,8,8">
+                    <Border.Styles>
+                        <Style Selector="TextBlock">
+                            <Setter Property="Margin" Value="4"/>
+                        </Style>
+                    </Border.Styles>
+                    
+                    <Grid RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto"
+                          Margin="4">
+                        <TextBlock Grid.Column="0" Grid.Row="0" Text="Source files:"/>
+                        <TextBlock Grid.Column="1" Grid.Row="0" Text="N/A"
+                                   IsVisible="{Binding PreviewFileCount, Converter={x:Static ObjectConverters.IsNull}}"/>
+                        <TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding PreviewFileCount, StringFormat=N0}" 
+                                   IsVisible="{Binding PreviewFileCount, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+
+                        <TextBlock Grid.Column="0" Grid.Row="1" Text="Output size:"/>
+                        <TextBlock Grid.Column="1" Grid.Row="1" Text="N/A"
+                                   IsVisible="{Binding PreviewFileSize, Converter={x:Static ObjectConverters.IsNull}}"/>
+                        <TextBlock Grid.Column="1" Grid.Row="1" Text="{Binding PreviewFileSize, Converter={StaticResource BytesToUiStringConverter}}"
+                                   IsVisible="{Binding PreviewFileSize, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+
+                        <!-- ReSharper disable once Xaml.StyleClassNotFound -->
+                        <ProgressBar Grid.Column="2" Grid.Row="0" Grid.RowSpan="2"
+                                     Classes="circular" IsIndeterminate="True"
+                                     VerticalAlignment="Center"
+                                     Width="36" Height="36" Margin="8,0"
+                                     IsVisible="{Binding IsGeneratingPreview}"/>
+                    </Grid>
+                </Border>
+            </Grid>
 
             <Grid Grid.Column="1" Margin="0,8,8,8"
                   RowDefinitions="Auto,Auto,*">

CodeIngestLib/Ingester.cs

@@ -31,7 +31,7 @@ public Ingester(IngestOptions options)
         m_options = options;
     }
 
-    public (int FileCount, long OutputBytes)? Run(IEnumerable<DirectoryInfo> directories, FileInfo outputFile, ProgressToken progress = null)
+    public (int FileCount, long OutputBytes)? Run(IEnumerable<DirectoryInfo> directories, FileInfo outputFile = null, ProgressToken progress = null)
     {
         var didError = false;
         var sourceFiles = directories
@@ -65,8 +65,12 @@ public Ingester(IngestOptions options)
             return (0, 0);
         }
 
-        using (var fileStream = outputFile.Open(FileMode.Create))
-        using (var writer = new StreamWriter(fileStream, Encoding.UTF8))
+        // If caller isn't collecting output (Just wants size info), write output to a temp file.
+        using var tempOutputFile = new TempFile();
+        outputFile ??= tempOutputFile;
+        
+        using (var outputStream = (outputFile).Open(FileMode.Create))
+        using (var writer = new StreamWriter(outputStream, Encoding.UTF8))
         {
             writer.NewLine = "\n";
             writer.WriteLine("// CodeIngest - A CLI tool that merges and processes code files for GPT reviews.");