Extract a per-user background host so indexing can later run outside the window.
Keep the GUI as the index writer for now; mutex, named pipe, and opt-in logon autostart prepare Explorer.Host.exe without two SQLite writers. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,21 +1,11 @@
|
||||
using Explorer.Analysis;
|
||||
using Explorer.Application;
|
||||
using Explorer.Domain;
|
||||
using Explorer.Domain.Abstractions;
|
||||
using Explorer.FileOperations;
|
||||
using Explorer.Indexing;
|
||||
using Explorer.Plugin.Abstractions;
|
||||
using Explorer.Plugin.GoogleDrive;
|
||||
using Explorer.Plugin.Nextcloud;
|
||||
using Explorer.Plugin.OneDrive;
|
||||
using Explorer.Hosting;
|
||||
using Explorer.Presentation;
|
||||
using Explorer.Presentation.ViewModels;
|
||||
using Explorer.Search;
|
||||
using Explorer.Storage.Sqlite;
|
||||
using Explorer.Windows;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Explorer.App;
|
||||
|
||||
@@ -23,105 +13,20 @@ public static class AppServices
|
||||
{
|
||||
public static IServiceCollection AddExplorer(this IServiceCollection services)
|
||||
{
|
||||
services.AddSingleton<IClock, SystemClock>();
|
||||
services.AddSingleton<IAppEnvironment, WindowsAppEnvironment>();
|
||||
services.AddSingleton<IVolumeService, WindowsVolumeService>();
|
||||
services.AddSingleton<IFileSystemEnumerator, WindowsFileSystemEnumerator>();
|
||||
services.AddSingleton<IUsnJournal, WindowsUsnJournal>();
|
||||
services.AddSingleton<IShellFileOperations, WindowsShellFileOperations>();
|
||||
services.AddExplorerCore();
|
||||
services.AddExplorerUi();
|
||||
return services;
|
||||
}
|
||||
|
||||
public static IServiceCollection AddExplorerUi(this IServiceCollection services)
|
||||
{
|
||||
services.AddSingleton<IOsClipboard, Services.WpfClipboard>();
|
||||
services.AddSingleton<IIndexStore>(sp =>
|
||||
{
|
||||
var env = sp.GetRequiredService<IAppEnvironment>();
|
||||
var logger = sp.GetRequiredService<ILogger<SqliteIndexStore>>();
|
||||
return new SqliteIndexStore(env.DatabasePath, logger);
|
||||
});
|
||||
services.AddSingleton<IStorageProvider, OneDriveStorageProvider>();
|
||||
services.AddSingleton<IStorageProvider, GoogleDriveStorageProvider>();
|
||||
services.AddSingleton<IStorageProvider, NextcloudStorageProvider>();
|
||||
services.AddSingleton<StorageProviderRegistry>();
|
||||
services.AddSingleton<IHydrationGuard, HydrationGuard>();
|
||||
services.AddSingleton<IArchiveExecutor, SevenZipArchiveExecutor>();
|
||||
services.AddSingleton<WindowsGitStatusProvider>();
|
||||
services.AddSingleton<IGitStatusProvider>(sp => sp.GetRequiredService<WindowsGitStatusProvider>());
|
||||
services.AddSingleton<IGitCommandProvider>(sp => sp.GetRequiredService<WindowsGitStatusProvider>());
|
||||
services.AddSingleton<IWorkspaceLauncher, WindowsWorkspaceLauncher>();
|
||||
services.AddSingleton<IElevatedScanService, WindowsElevatedScanService>();
|
||||
services.AddSingleton<IRecycleBinCatalog, WindowsRecycleBinCatalog>();
|
||||
services.AddSingleton<SourceManager>();
|
||||
services.AddSingleton<PathHistoryStore>();
|
||||
services.AddSingleton<CloudPlaceStore>();
|
||||
services.AddSingleton<UiPreferencesStore>();
|
||||
services.AddSingleton<IArchiveCatalog, ArchiveCatalog>();
|
||||
services.AddSingleton<ArchiveContentsIndexer>();
|
||||
services.AddSingleton<BrowseService>();
|
||||
services.AddSingleton<ThumbnailService>();
|
||||
services.AddSingleton<IThumbnailService>(sp => sp.GetRequiredService<ThumbnailService>());
|
||||
services.AddSingleton<FilesystemScanner>();
|
||||
services.AddSingleton<FolderReconciler>();
|
||||
services.AddSingleton<UsnChangeApplier>();
|
||||
services.AddSingleton<IndexingCoordinator>();
|
||||
services.AddSingleton<DirectoryWatcherHub>();
|
||||
services.AddSingleton<SearchService>();
|
||||
services.AddSingleton<AnalysisService>();
|
||||
services.AddSingleton<IOperationExecutor, NativeFileOperationExecutor>();
|
||||
services.AddSingleton<TransferQueue>();
|
||||
services.AddSingleton<FileOperationService>();
|
||||
services.AddSingleton<RenamePlanner>();
|
||||
services.AddSingleton<RenameBatchService>();
|
||||
services.AddSingleton<FolderSyncPlanner>();
|
||||
services.AddSingleton<FolderSyncService>();
|
||||
services.AddSingleton<FileOperationProfilePlanner>();
|
||||
services.AddSingleton<OperationProfileService>();
|
||||
services.AddSingleton<ReorganizePlanner>();
|
||||
services.AddSingleton<ReorganizeService>();
|
||||
services.AddSingleton<DuplicateHashWorker>();
|
||||
services.AddSingleton<HistoryRollupService>();
|
||||
services.AddSingleton<MainViewModel>();
|
||||
services.AddSingleton<MainWindow>();
|
||||
services.AddHostedService(sp => sp.GetRequiredService<IndexingCoordinator>());
|
||||
services.AddHostedService(sp => sp.GetRequiredService<TransferQueue>());
|
||||
services.AddHostedService(sp => sp.GetRequiredService<DuplicateHashWorker>());
|
||||
services.AddHostedService(sp => sp.GetRequiredService<HistoryRollupService>());
|
||||
services.AddHostedService(sp => sp.GetRequiredService<ThumbnailService>());
|
||||
services.AddHostedService<WatcherHostedService>();
|
||||
return services;
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class WatcherHostedService : BackgroundService
|
||||
{
|
||||
private readonly DirectoryWatcherHub _hub;
|
||||
private readonly SourceManager _sources;
|
||||
private readonly TransferQueue _transfers;
|
||||
private readonly FolderSyncService _sync;
|
||||
private readonly OperationProfileService _profiles;
|
||||
|
||||
public WatcherHostedService(
|
||||
DirectoryWatcherHub hub,
|
||||
SourceManager sources,
|
||||
TransferQueue transfers,
|
||||
FolderSyncService sync,
|
||||
OperationProfileService profiles)
|
||||
{
|
||||
_hub = hub;
|
||||
_sources = sources;
|
||||
_transfers = transfers;
|
||||
_sync = sync;
|
||||
_profiles = profiles;
|
||||
}
|
||||
|
||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||
{
|
||||
using var timer = new PeriodicTimer(TimeSpan.FromSeconds(20));
|
||||
await _hub.RefreshAsync(stoppingToken).ConfigureAwait(false);
|
||||
while (await timer.WaitForNextTickAsync(stoppingToken).ConfigureAwait(false))
|
||||
{
|
||||
await _sources.RefreshOnlineStateAsync(forceRefresh: true, stoppingToken).ConfigureAwait(false);
|
||||
_transfers.NotifyAvailability();
|
||||
await _sync.TryAutoRunAsync(stoppingToken).ConfigureAwait(false);
|
||||
await _profiles.TryAutoRunAsync(stoppingToken).ConfigureAwait(false);
|
||||
await _hub.RefreshAsync(stoppingToken).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user