mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 9a172ea610 into 54d6654ad1

Browse source
This commit is contained in:
EH 2026-06-19 05:46:13 -06:00 • committed by GitHub
commit 78fa5d4393
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/fileviews/ufileview.pas
View file

@ -444,6 +444,13 @@ type
function Reload(const PathToReload: String): Boolean; overload;
procedure Reload(AForced: Boolean);
procedure ReloadIfNeeded;
{en
Suspend/resume the directory watcher around an app-initiated bulk
operation. While suspended, inotify changes are not turned into
repeated full reloads (which is O(n²) for large folders); resuming
performs a single reconciling reload. No-op for non-filesystem views.
}
procedure SetWatcherEnabled(AEnabled: Boolean);
procedure StopWorkers; virtual;
// For now we use here the knowledge that there are tabs.
@ -3406,6 +3413,22 @@ begin
end;
end;
procedure TFileView.SetWatcherEnabled(AEnabled: Boolean);
begin
if AEnabled then
begin
// Only the filesystem watcher causes the per-file reload storm, so only
// it was suspended; re-enable and do one reload to catch up on changes.
if Assigned(FileSource) and FileSource.IsClass(TFileSystemFileSource) then
begin
EnableWatcher(True);
Reload(True);
end;
end
else if WatcherActive then
EnableWatcher(False);
end;
procedure TFileView.SetFlatView(AFlatView: Boolean);
begin
FFlatView:= AFlatView;

30
src/fsyncdirsdlg.pas
View file

@ -166,6 +166,9 @@ type
FCmpFileSourceL, FCmpFileSourceR: IFileSource;
FCmpFilePathL, FCmpFilePathR: string;
FAddressL, FAddressR: string;
// The two source panels, kept so their directory watchers can be
// suspended during bulk copy/delete (avoids the per-file reload storm).
FFileView1, FFileView2: TFileView;
hCols: array [0..6] of record Left, Width: Integer end;
CheckContentThread: TObject;
Ftotal, Fequal, Fnoneq, FuniqueL, FuniqueR: Integer;
@ -189,6 +192,7 @@ type
procedure SetSyncRecState(AState: TSyncRecState);
procedure DeleteFiles(ALeft, ARight: Boolean);
function DeleteFiles(FileSource: IFileSource; var Files: TFiles): Boolean;
procedure SetPanelWatchers(AEnabled: Boolean);
procedure UpdateList(ALeft, ARight: TFiles; ARemoveLeft, ARemoveRight: Boolean);
procedure SetProgressBytes(AProgressBar: TKASProgressBar; CurrentBytes: Int64; TotalBytes: Int64);
procedure SetProgressFiles(AProgressBar: TKASProgressBar; CurrentFiles: Int64; TotalFiles: Int64);
@ -783,6 +787,8 @@ begin
pnlCopyProgress.Visible:= CopyLeft or CopyRight;
pnlDeleteProgress.Visible:= DeleteLeft or DeleteRight;
SetPanelWatchers(False);
try
i := 0;
while i < FVisibleItems.Count do
begin
@ -834,6 +840,9 @@ begin
else DeleteRightFiles.Free;
if not pnlProgress.Visible then Break;
end;
finally
SetPanelWatchers(True);
end;
EnableControls(True);
btnCompare.Click;
end;
@ -1836,6 +1845,16 @@ begin
end;
end;
procedure TfrmSyncDirsDlg.SetPanelWatchers(AEnabled: Boolean);
begin
// Suspend the source panels' directory watchers while we copy/delete, so a
// large local operation does not trigger one full O(n) panel reload per ~100
// changes (which makes a big delete behave as O(n²), ~1 file/sec). Resuming
// does a single reconciling reload of each panel.
if Assigned(FFileView1) then FFileView1.SetWatcherEnabled(AEnabled);
if Assigned(FFileView2) then FFileView2.SetWatcherEnabled(AEnabled);
end;
procedure TfrmSyncDirsDlg.DeleteFiles(ALeft, ARight: Boolean);
var
Message: String;
@ -1883,8 +1902,13 @@ begin
EnableControls(False);
pnlCopyProgress.Visible:= False;
pnlDeleteProgress.Visible:= True;
if ALeft then DeleteFiles(FCmpFileSourceL, ALeftList);
if ARight then DeleteFiles(FCmpFileSourceR, ARightList);
SetPanelWatchers(False);
try
if ALeft then DeleteFiles(FCmpFileSourceL, ALeftList);
if ARight then DeleteFiles(FCmpFileSourceR, ARightList);
finally
SetPanelWatchers(True);
end;
UpdateList(nil, nil, ALeft, ARight);
EnableControls(True);
end;
@ -2049,6 +2073,8 @@ begin
FFoundItems := TStringListEx.Create;
FFoundItems.CaseSensitive := FileNameCaseSensitive;
FFoundItems.Sorted := True;
FFileView1 := FileView1;
FFileView2 := FileView2;
FFileSourceL := FileView1.FileSource;
FFileSourceR := FileView2.FileSource;
FAddressL := FileView1.CurrentAddress;