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

FIX: Copy extended attributes when move files (fixes #1670)

Browse source 
(cherry picked from commit c0ff9250bf)
This commit is contained in:
Alexander Koblov 2024-05-23 21:12:06 +03:00
commit 4a6642f164
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/filesources/filesystem/ffilesystemcopymoveoperationoptions.pas
View file

@ -311,6 +311,11 @@ begin
1: SetPropertyError := fsoospeDontSet;
2: SetPropertyError := fsoospeIgnoreErrors;
end;
case chkCopyOnWrite.State of
cbGrayed : CopyOnWrite := fsoogNone;
cbChecked : CopyOnWrite := fsoogYes;
cbUnchecked : CopyOnWrite := fsoogNo;
end;
CorrectSymLinks := cbCorrectLinks.Checked;
CheckFreeSpace := cbCheckFreeSpace.Checked;
ReserveSpace := cbReserveSpace.Checked;

34
src/filesources/filesystem/ufilesystemmoveoperation.pas
View file

@ -36,6 +36,7 @@ type
FCheckFreeSpace: Boolean;
FSkipAllBigFiles: Boolean;
FCorrectSymlinks: Boolean;
FCopyOnWrite: TFileSourceOperationOptionGeneral;
procedure SetSearchTemplate(AValue: TSearchTemplate);
protected
@ -60,6 +61,7 @@ type
property CopyAttributesOptions: TCopyAttributesOptions read FCopyAttributesOptions write FCopyAttributesOptions;
property SkipAllBigFiles: Boolean read FSkipAllBigFiles write FSkipAllBigFiles;
property CorrectSymLinks: Boolean read FCorrectSymLinks write FCorrectSymLinks;
property CopyOnWrite: TFileSourceOperationOptionGeneral read FCopyOnWrite write FCopyOnWrite;
property SetPropertyError: TFileSourceOperationOptionSetPropertyError read FSetPropertyError write FSetPropertyError;
property ExcludeEmptyTemplateDirectories: Boolean read FExcludeEmptyTemplateDirectories write FExcludeEmptyTemplateDirectories;
{en
@ -77,24 +79,33 @@ constructor TFileSystemMoveOperation.Create(aFileSource: IFileSource;
var theSourceFiles: TFiles;
aTargetPath: String);
begin
// Here we can read global settings if there are any.
FCopyAttributesOptions := [];
if gOperationOptionCopyAttributes then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyAttributes];
if gOperationOptionCopyTime then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyTime];
if gOperationOptionCopyOwnership then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyOwnership];
FFileExistsOption := gOperationOptionFileExists;
FDirExistsOption := gOperationOptionDirectoryExists;
// Here we can read global settings if there are any
FSetPropertyError := gOperationOptionSetPropertyError;
FReserveSpace := gOperationOptionReserveSpace;
FCheckFreeSpace := gOperationOptionCheckFreeSpace;
FSkipAllBigFiles := False;
FCorrectSymlinks := gOperationOptionCorrectLinks;
FCorrectSymLinks := gOperationOptionCorrectLinks;
FExcludeEmptyTemplateDirectories := True;
inherited Create(aFileSource, theSourceFiles, aTargetPath);
// Here we can read global settings if there are any
FCopyOnWrite := gOperationOptionCopyOnWrite;
FFileExistsOption := gOperationOptionFileExists;
FDirExistsOption := gOperationOptionDirectoryExists;
if gOperationOptionCopyAttributes then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyAttributes];
if gOperationOptionCopyXattributes then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyXattributes];
if gOperationOptionCopyTime then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyTime];
if gOperationOptionCopyOwnership then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyOwnership];
if gOperationOptionCopyPermissions then
FCopyAttributesOptions := FCopyAttributesOptions + [caoCopyPermissions];
if gDropReadOnlyFlag then
FCopyAttributesOptions := FCopyAttributesOptions + [caoRemoveReadOnlyAttr];
end;
destructor TFileSystemMoveOperation.Destroy;
@ -147,6 +158,7 @@ begin
FOperationHelper.Verify := FVerify;
FOperationHelper.RenameMask := RenameMask;
FOperationHelper.CopyOnWrite := FCopyOnWrite;
FOperationHelper.ReserveSpace := FReserveSpace;
FOperationHelper.CheckFreeSpace := CheckFreeSpace;
FOperationHelper.CopyAttributesOptions := CopyAttributesOptions;