golem84/CodeContextGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iteration 3 - finally works

Browse Source
This commit is contained in:
golem84
2025-12-11 00:23:21 +05:00
parent b1d4f3693b
commit 5b76abb0ae
8 changed files with 440 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CodeContextGenerator/App.xaml.cs
View File

@@ -1,8 +1,8 @@
using System.Windows;
using CodeContextGenerator.Interfaces;
using CodeContextGenerator.Interfaces;
using CodeContextGenerator.Services;
using CodeContextGenerator.ViewModels;
using Microsoft.Extensions.DependencyInjection;
using System.Windows;
namespace CodeContextGenerator;

18
CodeContextGenerator/Converters/BooleanToVisibilityConverter.cs
View File

@@ -1,19 +1,22 @@
using System;
using System.Globalization;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
namespace CodeContextGenerator.Converters
{
namespace CodeContextGenerator.Converters;
public class BooleanToVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is bool boolValue)
bool boolValue = value is true;
// Проверяем параметр для инвертирования
if (parameter is string paramStr && paramStr.Equals("Inverted", StringComparison.OrdinalIgnoreCase))
{
return boolValue ? Visibility.Visible : Visibility.Collapsed;
boolValue = !boolValue;
}
return Visibility.Collapsed;
return boolValue ? Visibility.Visible : Visibility.Collapsed;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -21,4 +24,3 @@ namespace CodeContextGenerator.Converters
throw new NotImplementedException();
}
}
}

51
CodeContextGenerator/Models/FileItem.cs
View File

@@ -15,6 +15,7 @@ public partial class FileItem : ObservableObject
private bool isDirectory;
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(HasSelectedChildren))]
private bool? isSelected;
[ObservableProperty]
@@ -22,6 +23,11 @@ public partial class FileItem : ObservableObject
public ObservableCollection<FileItem> Children { get; } = new ObservableCollection<FileItem>();
// Событие, вызываемое при изменении состояния выбора
public event EventHandler SelectionChanged;
public bool HasSelectedChildren => Children.Any(c => c.IsSelected == true || c.HasSelectedChildren);
partial void OnIsSelectedChanged(bool? oldValue, bool? newValue)
{
if (newValue.HasValue)
@@ -29,6 +35,7 @@ public partial class FileItem : ObservableObject
UpdateChildrenSelection(newValue.Value);
}
UpdateParentSelection();
NotifySelectionChanged();
}
private void UpdateChildrenSelection(bool value)
@@ -37,7 +44,13 @@ public partial class FileItem : ObservableObject
foreach (var child in Children)
{
// Гарантируем вызов события для каждого ребенка
var oldValue = child.IsSelected;
child.IsSelected = value;
if (oldValue != child.IsSelected)
{
child.RaiseSelectionChanged();
}
}
}
@@ -50,7 +63,41 @@ public partial class FileItem : ObservableObject
var noneSelected = children.All(c => c.IsSelected == false);
var hasIndeterminate = children.Any(c => c.IsSelected == null);
Parent.IsSelected = hasIndeterminate ? null : (allSelected ? true : (noneSelected ? false : null));
Parent.UpdateParentSelection();
bool? newParentState = hasIndeterminate ? null : (allSelected ? true : (noneSelected ? false : null));
/*bool? newParentState;
if (hasIndeterminate)
{
newParentState = null;
}
else if (allSelected)
{
newParentState = true;
}
else if (noneSelected)
{
newParentState = false;
}
else
{
newParentState = null;
}*/
if (Parent.IsSelected != newParentState)
{
Parent.IsSelected = newParentState;
Parent.RaiseSelectionChanged();
}
}
private void NotifySelectionChanged()
{
RaiseSelectionChanged();
}
// Публичный метод для гарантии вызова события
public void RaiseSelectionChanged()
{
// Вызываем событие для текущего элемента
SelectionChanged?.Invoke(this, EventArgs.Empty);
}
}

10
CodeContextGenerator/Services/FileScannerService.cs
View File

@@ -9,7 +9,7 @@ public class FileScannerService : IFileScannerService
private static readonly string[] ExcludedDirectories = {
"bin", "obj", ".git", "packages", ".vs", "Properties",
"node_modules", ".vscode", ".idea", "Debug", "Release",
"wwwroot", "dist", "build", "node_modules"
"wwwroot", "dist", "build", ".gitignore", ".dockerignore"
};
private static readonly string[] IncludedExtensions = { ".cs", ".xaml" };
@@ -25,13 +25,13 @@ public class FileScannerService : IFileScannerService
var directories = Directory.GetDirectories(path)
.Where(d => !ExcludedDirectories.Any(ex =>
d.EndsWith(ex, System.StringComparison.OrdinalIgnoreCase) ||
Path.GetFileName(d).Equals(ex, System.StringComparison.OrdinalIgnoreCase)))
d.EndsWith(ex, StringComparison.OrdinalIgnoreCase) ||
Path.GetFileName(d).Equals(ex, StringComparison.OrdinalIgnoreCase)))
.ToList();
var files = Directory.GetFiles(path)
.Where(f => IncludedExtensions.Any(ext =>
f.EndsWith(ext, System.StringComparison.OrdinalIgnoreCase)))
f.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
.ToList();
int totalItems = directories.Count + files.Count;
@@ -55,7 +55,7 @@ public class FileScannerService : IFileScannerService
await BuildDirectoryTreeAsync(dir, dirItem, progress, cancellationToken);
// Добавляем директорию только если в ней есть файлы или поддиректории с файлами
if (dirItem.Children.Any())
if (dirItem.Children.Count > 0 || files.Count > 0)
{
parentItem.Children.Add(dirItem);
}

71
CodeContextGenerator/Services/ProjectLoaderService.cs
View File

@@ -1,6 +1,7 @@
using CodeContextGenerator.Interfaces;
using CodeContextGenerator.Models;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows;
namespace CodeContextGenerator.Services;
@@ -63,7 +64,7 @@ public class ProjectLoaderService : IProjectLoaderService
try
{
var projectPaths = ParseSolutionProjects(solutionPath);
var projectPaths = ParseSolutionProjects(solutionPath, solutionDir);
int totalProjects = projectPaths.Count;
int processedProjects = 0;
@@ -94,7 +95,10 @@ public class ProjectLoaderService : IProjectLoaderService
}
processedProjects++;
progress?.Report((int)((processedProjects * 100.0) / totalProjects));
if (totalProjects > 0 && progress != null)
{
progress.Report((int)((processedProjects * 100.0) / totalProjects));
}
}
}
catch (Exception ex)
@@ -105,50 +109,40 @@ public class ProjectLoaderService : IProjectLoaderService
return solutionItem;
}
private async Task<FileItem> LoadCsprojAsync(string csprojPath, IProgress<int> progress, CancellationToken cancellationToken)
{
string projectDir = Path.GetDirectoryName(csprojPath);
string projectName = Path.GetFileNameWithoutExtension(csprojPath);
var projectItem = new FileItem
{
Name = projectName,
FullName = projectDir,
IsDirectory = true,
IsSelected = false
};
await _fileScannerService.BuildDirectoryTreeAsync(projectDir, projectItem, progress, cancellationToken);
return projectItem;
}
private List<string> ParseSolutionProjects(string solutionPath)
// Улучшенный парсинг .sln файлов
private List<string> ParseSolutionProjects(string solutionPath, string solutionDir)
{
var projects = new List<string>();
string solutionDir = Path.GetDirectoryName(solutionPath);
var projectRegex = new Regex(@"Project\(""[^""]*""\)\s*=\s*""([^""]*)"",\s*""([^""]*)""", RegexOptions.IgnoreCase);
try
{
foreach (string line in File.ReadAllLines(solutionPath))
{
if (line.Trim().StartsWith("Project(", StringComparison.OrdinalIgnoreCase))
var match = projectRegex.Match(line);
if (match.Success && match.Groups.Count >= 3)
{
var parts = line.Split(new[] { '"' }, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length >= 3)
{
string relativePath = parts[2].Trim();
if (relativePath.EndsWith(".csproj", StringComparison.OrdinalIgnoreCase))
string projectName = match.Groups[1].Value;
string relativePath = match.Groups[2].Value;
// Пропускаем служебные проекты
if (projectName.Contains("Solution Items") ||
relativePath.EndsWith(".sln", StringComparison.OrdinalIgnoreCase) ||
relativePath.EndsWith(".suo", StringComparison.OrdinalIgnoreCase))
{
continue;
}
string absolutePath = Path.GetFullPath(Path.Combine(solutionDir, relativePath));
if (File.Exists(absolutePath))
// Проверяем, что это .csproj файл
if (absolutePath.EndsWith(".csproj", StringComparison.OrdinalIgnoreCase) && File.Exists(absolutePath))
{
projects.Add(absolutePath);
}
}
}
}
}
}
catch (Exception ex)
{
throw new Exception($"Ошибка парсинга файла решения: {ex.Message}", ex);
@@ -157,6 +151,23 @@ public class ProjectLoaderService : IProjectLoaderService
return projects;
}
private async Task<FileItem> LoadCsprojAsync(string csprojPath, IProgress<int> progress, CancellationToken cancellationToken)
{
string projectDir = Path.GetDirectoryName(csprojPath);
string projectName = Path.GetFileNameWithoutExtension(csprojPath);
var projectItem = new FileItem
{
Name = $"{projectName} (Проект)",
FullName = projectDir,
IsDirectory = true,
IsSelected = false
};
await _fileScannerService.BuildDirectoryTreeAsync(projectDir, projectItem, progress, cancellationToken);
return projectItem;
}
public string GetDefaultOutputFileName(string projectPath)
{
if (Directory.Exists(projectPath))

35
CodeContextGenerator/Services/UIService.cs
View File

@@ -7,20 +7,32 @@ namespace CodeContextGenerator.Services;
public class UIService : IUIService
{
private readonly ISettingsService _settingsService;
public UIService(ISettingsService settingsService)
{
_settingsService = settingsService;
}
public string ShowFolderBrowserDialog(string initialDirectory = null)
{
// Используем OpenFileDialog для выбора папки - это стандартный способ в WPF
// Используем специальный трюк для выбора папки в WPF
var dialog = new OpenFileDialog
{
Title = "Выберите папку с проектом",
Filter = "Папки|*.folder", // Фильтр для отображения только папок
FileName = "select_folder", // Имя файла для обхода проверки существования файла
Filter = "Папки|*.dummy", // Фильтр для отображения только папок
FileName = "выберите_папку", // Специальное имя файла
CheckFileExists = false,
CheckPathExists = true,
ValidateNames = false, // Отключаем валидацию имен для выбора папок
ValidateNames = false,
DereferenceLinks = true
};
if (string.IsNullOrEmpty(initialDirectory) || !Directory.Exists(initialDirectory))
{
initialDirectory = _settingsService.GetLastProjectPath();
}
if (!string.IsNullOrEmpty(initialDirectory) && Directory.Exists(initialDirectory))
{
dialog.InitialDirectory = initialDirectory;
@@ -29,8 +41,9 @@ public class UIService : IUIService
var result = dialog.ShowDialog();
if (result == true)
{
// Возвращаем папку, а не файл
return Path.GetDirectoryName(dialog.FileName);
// Возвращаем директорию, а не путь к файлу
string selectedFolder = Path.GetDirectoryName(dialog.FileName);
return selectedFolder;
}
return null;
@@ -42,11 +55,17 @@ public class UIService : IUIService
var dialog = new OpenFileDialog
{
Title = "Выберите файл решения, проекта или папку",
Filter = "Все поддерживаемые файлы (*.sln;*.csproj;*.razor)|*.sln;*.csproj;*.razor|Файлы решений (*.sln)|*.sln|Файлы проектов (*.csproj)|*.csproj|Файлы Razor (*.razor)|*.razor|Все файлы (*.*)|*.*",
Title = "Выберите файл решения или проекта",
Filter = "Все поддерживаемые файлы (*.sln;*.csproj)|*.sln;*.csproj|Файлы решений Visual Studio (*.sln)|*.sln|Файлы проектов C# (*.csproj)|*.csproj|Все файлы (*.*)|*.*",
Multiselect = false
};
var lastPath = _settingsService.GetLastProjectPath();
if (!string.IsNullOrEmpty(lastPath) && Directory.Exists(lastPath))
{
dialog.InitialDirectory = lastPath;
}
bool? result = dialog.ShowDialog();
if (result == true)
{

104
CodeContextGenerator/ViewModels/MainViewModel.cs
View File

@@ -1,12 +1,17 @@
using CodeContextGenerator.Interfaces;
using CodeContextGenerator.Models;
using CodeContextGenerator.Services;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
namespace CodeContextGenerator.ViewModels;
namespace CodeContextGenerator.ViewModels
{
public partial class MainViewModel : ObservableObject
{
private readonly IProjectLoaderService _projectLoaderService;
@@ -35,6 +40,12 @@ public partial class MainViewModel : ObservableObject
[ObservableProperty]
private bool isProjectLoaded;
// Явное объявление команд для гарантии их создания
public IRelayCommand SelectProjectCommand { get; }
public IAsyncRelayCommand GenerateContextFileCommand { get; }
public IRelayCommand CancelProcessingCommand { get; }
public IRelayCommand ExitApplicationCommand { get; }
public MainViewModel(
IProjectLoaderService projectLoaderService,
IFileScannerService fileScannerService,
@@ -47,24 +58,41 @@ public partial class MainViewModel : ObservableObject
_contextFileGenerator = contextFileGenerator;
_uiService = uiService;
_settingsService = settingsService;
// Явная инициализация команд
SelectProjectCommand = new RelayCommand(SelectProject, CanSelectProject);
GenerateContextFileCommand = new AsyncRelayCommand(GenerateContextFileAsync, CanGenerate);
CancelProcessingCommand = new RelayCommand(CancelProcessing);
ExitApplicationCommand = new RelayCommand(ExitApplication);
}
public bool CanSelectProject => !IsProcessing;
public bool CanGenerate => !IsProcessing && IsProjectLoaded && HasSelectedFiles(RootDirectory);
private bool CanSelectProject() => !IsProcessing;
private bool CanGenerate()
{
bool result = !IsProcessing &&
IsProjectLoaded &&
RootDirectory != null &&
HasSelectedFiles(RootDirectory);
// Отладочная информация
System.Diagnostics.Debug.WriteLine($"CanGenerate: {result}, IsProcessing: {IsProcessing}, IsProjectLoaded: {IsProjectLoaded}, RootDirectory: {(RootDirectory != null)}, HasSelectedFiles: {HasSelectedFiles(RootDirectory)}");
return result;
}
[RelayCommand(CanExecute = nameof(CanSelectProject))]
private void SelectProject()
{
var initialDir = _settingsService.GetLastProjectPath();
var initialDir = !string.IsNullOrEmpty(SelectedProjectPath) && Directory.Exists(SelectedProjectPath)
? Path.GetDirectoryName(SelectedProjectPath)
: _settingsService.GetLastProjectPath();
// Сначала пробуем выбрать файл проекта/решения
if (_uiService.ShowOpenProjectFileDialog(out var filePath))
{
LoadProject(filePath);
return;
}
// Если отменили выбор файла - предлагаем выбрать папку
var folderPath = _uiService.ShowFolderBrowserDialog(initialDir);
if (!string.IsNullOrEmpty(folderPath))
{
@@ -72,7 +100,6 @@ public partial class MainViewModel : ObservableObject
}
}
[RelayCommand(CanExecute = nameof(CanGenerate))]
private async Task GenerateContextFileAsync()
{
var selectedFiles = _fileScannerService.GetSelectedFiles(RootDirectory);
@@ -83,7 +110,7 @@ public partial class MainViewModel : ObservableObject
}
var defaultFileName = _projectLoaderService.GetDefaultOutputFileName(SelectedProjectPath);
var initialDir = _settingsService.GetLastProjectPath();
var initialDir = _settingsService.GetLastProjectPath() ?? Path.GetDirectoryName(SelectedProjectPath);
if (!_uiService.ShowSaveFileDialog(defaultFileName, initialDir, out var savePath))
return;
@@ -125,16 +152,17 @@ public partial class MainViewModel : ObservableObject
finally
{
IsProcessing = false;
// Принудительно обновляем команды после завершения операции
UpdateCommandsCanExecute();
}
}
[RelayCommand]
private void CancelProcessing()
{
_cancellationTokenSource?.Cancel();
ProgressText = "Операция отменена";
}
[RelayCommand]
private void ExitApplication()
{
Application.Current.Shutdown();
@@ -146,12 +174,14 @@ public partial class MainViewModel : ObservableObject
_settingsService.SaveLastProjectPath(Path.GetDirectoryName(projectPath));
IsProjectLoaded = false;
RootDirectory = null;
UpdateCommandsCanExecute();
LoadProjectAsync(projectPath);
}
private async void LoadProjectAsync(string projectPath)
{
IsProcessing = true;
ProgressText = "Загрузка проекта...";
ProgressValue = 0;
@@ -169,9 +199,18 @@ public partial class MainViewModel : ObservableObject
IsProjectLoaded = true;
ProgressText = "Проект загружен успешно";
// Подписываемся на события изменения выбора
SubscribeToSelectionChanges(RootDirectory);
// Сбрасываем выделение после загрузки
if (RootDirectory != null)
{
ClearSelections(RootDirectory);
}
// Принудительно обновляем команды
UpdateCommandsCanExecute();
}
catch (OperationCanceledException)
{
ProgressText = "Загрузка отменена";
@@ -183,11 +222,30 @@ public partial class MainViewModel : ObservableObject
finally
{
IsProcessing = false;
UpdateCommandsCanExecute();
}
}
// Рекурсивная подписка на события изменения выбора
private void SubscribeToSelectionChanges(FileItem item)
{
if (item == null) return;
item.SelectionChanged += (sender, args) =>
{
UpdateCommandsCanExecute();
};
foreach (var child in item.Children)
{
SubscribeToSelectionChanges(child);
}
}
private void ClearSelections(FileItem item)
{
if (item == null) return;
item.IsSelected = false;
foreach (var child in item.Children)
{
@@ -198,11 +256,27 @@ public partial class MainViewModel : ObservableObject
private bool HasSelectedFiles(FileItem item)
{
if (item == null) return false;
if (item.IsSelected == true && !item.IsDirectory) return true;
if (!item.IsDirectory && item.IsSelected == true)
return true;
if (item.IsDirectory)
{
foreach (var child in item.Children)
{
if (HasSelectedFiles(child)) return true;
if (HasSelectedFiles(child))
return true;
}
}
return false;
}
// Метод для принудительного обновления всех команд
private void UpdateCommandsCanExecute()
{
(SelectProjectCommand as RelayCommand)?.NotifyCanExecuteChanged();
(GenerateContextFileCommand as AsyncRelayCommand)?.NotifyCanExecuteChanged();
}
}
}

13
CodeContextGenerator/Views/MainWindow.xaml
View File

@@ -59,8 +59,9 @@
TextWrapping="Wrap" />
</StackPanel>
<!-- Контейнер для дерева и сообщения -->
<Grid Grid.Row="2">
<Border
Grid.Row="2"
Padding="5"
BorderBrush="Gray"
BorderThickness="1"
@@ -96,13 +97,13 @@
</Border>
<TextBlock
Grid.Row="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
Foreground="Gray"
Text="Проект еще не загружен. Выберите файл решения или проекта."
Visibility="{Binding IsProjectLoaded, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter=Collapsed}" />
Visibility="{Binding IsProjectLoaded, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter=Inverted}" />
</Grid>
<ProgressBar
Grid.Row="3"
@@ -130,14 +131,12 @@
Content="Отмена"
Foreground="White"
Visibility="{Binding IsProcessing, Converter={StaticResource BooleanToVisibilityConverter}}" />
<Button Command="{Binding ExitApplicationCommand}" Content="Закрыть" />
<Button Command="{Binding ExitApplicationCommand}" Content="В главное меню" />
<Button
Background="#FF28A745"
Command="{Binding GenerateContextFileCommand}"
Content="Сформировать"
Foreground="White"
IsEnabled="{Binding CanGenerate}"
Visibility="{Binding IsProjectLoaded, Converter={StaticResource BooleanToVisibilityConverter}}" />
Foreground="White" />
</StackPanel>
</Grid>
</Window>