github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another

Browse Source
This commit is contained in:
Matt Parker
2025-10-24 21:10:52 +10:00
parent 4c10ae7cc7
commit ddbb5423aa
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SharpIDE.Application/Features/FileWatching/IdeFileExternalChangeHandler.cs
View File

@@ -1,4 +1,5 @@
using Ardalis.GuardClauses; using Ardalis.GuardClauses;
using Microsoft.Extensions.Logging;
using SharpIDE.Application.Features.Events; using SharpIDE.Application.Features.Events;
using SharpIDE.Application.Features.SolutionDiscovery; using SharpIDE.Application.Features.SolutionDiscovery;
using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence; using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
@@ -7,11 +8,13 @@ namespace SharpIDE.Application.Features.FileWatching;
public class IdeFileExternalChangeHandler public class IdeFileExternalChangeHandler
{ {
private readonly ILogger<IdeFileExternalChangeHandler> _logger;
private readonly FileChangedService _fileChangedService; private readonly FileChangedService _fileChangedService;
private readonly SharpIdeSolutionModificationService _sharpIdeSolutionModificationService; private readonly SharpIdeSolutionModificationService _sharpIdeSolutionModificationService;
public SharpIdeSolutionModel SolutionModel { get; set; } = null!; public SharpIdeSolutionModel SolutionModel { get; set; } = null!;
public IdeFileExternalChangeHandler(FileChangedService fileChangedService, SharpIdeSolutionModificationService sharpIdeSolutionModificationService) public IdeFileExternalChangeHandler(FileChangedService fileChangedService, SharpIdeSolutionModificationService sharpIdeSolutionModificationService, ILogger<IdeFileExternalChangeHandler> logger)
{ {
_logger = logger;
_fileChangedService = fileChangedService; _fileChangedService = fileChangedService;
_sharpIdeSolutionModificationService = sharpIdeSolutionModificationService; _sharpIdeSolutionModificationService = sharpIdeSolutionModificationService;
GlobalEvents.Instance.FileSystemWatcherInternal.FileChanged.Subscribe(OnFileChanged); GlobalEvents.Instance.FileSystemWatcherInternal.FileChanged.Subscribe(OnFileChanged);
@@ -72,14 +75,13 @@ public class IdeFileExternalChangeHandler
var sharpIdeFolder = SolutionModel.AllFolders.SingleOrDefault(f => f.Path == folderPath); var sharpIdeFolder = SolutionModel.AllFolders.SingleOrDefault(f => f.Path == folderPath);
if (sharpIdeFolder is not null) if (sharpIdeFolder is not null)
{ {
//Console.WriteLine($"Error - Folder {folderPath} already exists");
return; return;
} }
var containingFolderPath = Path.GetDirectoryName(folderPath)!; var containingFolderPath = Path.GetDirectoryName(folderPath)!;
var containingFolderOrProject = (IFolderOrProject?)SolutionModel.AllFolders.SingleOrDefault(f => f.ChildNodeBasePath == containingFolderPath) ?? SolutionModel.AllProjects.SingleOrDefault(s => s.ChildNodeBasePath == containingFolderPath); var containingFolderOrProject = (IFolderOrProject?)SolutionModel.AllFolders.SingleOrDefault(f => f.ChildNodeBasePath == containingFolderPath) ?? SolutionModel.AllProjects.SingleOrDefault(s => s.ChildNodeBasePath == containingFolderPath);
if (containingFolderOrProject is null) if (containingFolderOrProject is null)
{ {
Console.WriteLine($"Error - Containing Folder or Project of {folderPath} does not exist"); _logger.LogError("Containing Folder or Project of folder '{FolderPath}' does not exist", folderPath);
return; return;
} }
var folderName = Path.GetFileName(folderPath); var folderName = Path.GetFileName(folderPath);
@@ -101,7 +103,7 @@ public class IdeFileExternalChangeHandler
var containingFolderOrProject = (IFolderOrProject?)SolutionModel.AllFolders.SingleOrDefault(f => f.ChildNodeBasePath == createdFileDirectory) ?? SolutionModel.AllProjects.SingleOrDefault(s => s.ChildNodeBasePath == createdFileDirectory); var containingFolderOrProject = (IFolderOrProject?)SolutionModel.AllFolders.SingleOrDefault(f => f.ChildNodeBasePath == createdFileDirectory) ?? SolutionModel.AllProjects.SingleOrDefault(s => s.ChildNodeBasePath == createdFileDirectory);
if (containingFolderOrProject is null) if (containingFolderOrProject is null)
{ {
Console.WriteLine($"Error - Containing Folder or Project of {filePath} does not exist"); _logger.LogError("Containing Folder or Project of file '{FilePath}' does not exist", filePath);
return; return;
} }
@@ -122,11 +124,11 @@ public class IdeFileExternalChangeHandler
var now = DateTimeOffset.Now; var now = DateTimeOffset.Now;
if (now - sharpIdeFile.LastIdeWriteTime.Value < TimeSpan.FromMilliseconds(300)) if (now - sharpIdeFile.LastIdeWriteTime.Value < TimeSpan.FromMilliseconds(300))
{ {
Console.WriteLine($"IdeFileExternalChangeHandler: Ignored - {filePath}"); _logger.LogTrace("File change ignored - recently modified by the IDE: '{FilePath}'", filePath);
return; return;
} }
} }
Console.WriteLine($"IdeFileExternalChangeHandler: Changed - {filePath}"); _logger.LogInformation("IdeFileExternalChangeHandler: Changed - '{FilePath}'", filePath);
var file = SolutionModel.AllFiles.SingleOrDefault(f => f.Path == filePath); var file = SolutionModel.AllFiles.SingleOrDefault(f => f.Path == filePath);
if (file is not null) if (file is not null)
{ {