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: Show error when cannot move file

Browse source
This commit is contained in:
Alexander Koblov 2021-01-20 17:19:12 +00:00
commit 9cf8a4ddd3
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/filesources/filesystem/ufilesystemutil.pas
View file

@ -74,6 +74,7 @@ type
{$IF DEFINED(UNIX)}
FSkipAllSpecialFiles: Boolean;
{$ENDIF}
FSkipRenameError: Boolean;
FSkipOpenForReadingError: Boolean;
FSkipOpenForWritingError: Boolean;
FSkipReadError: Boolean;
@ -847,14 +848,28 @@ function TFileSystemOperationHelper.MoveFile(SourceFile: TFile; TargetFileName:
Mode: TFileSystemOperationHelperCopyMode): Boolean;
var
Message: String;
RetryRename: Boolean;
RetryDelete: Boolean;
begin
if not (Mode in [fsohcmAppend, fsohcmResume]) then
begin
if RenameFileUAC(SourceFile.FullPath, TargetFileName) then
Exit(True);
if (GetLastOSError <> ERROR_NOT_SAME_DEVICE) then
Exit(False);
repeat
RetryRename := True;
if RenameFileUAC(SourceFile.FullPath, TargetFileName) then
Exit(True);
if (GetLastOSError <> ERROR_NOT_SAME_DEVICE) then
begin
if FSkipRenameError then Exit(False);
Message := Format(rsMsgErrCannotMoveFile, [WrapTextSimple(SourceFile.FullPath, 100)]) +
LineEnding + LineEnding + mbSysErrorMessage;
case AskQuestion('', Message, [fsourSkip, fsourRetry, fsourAbort, fsourSkipAll], fsourSkip, fsourAbort) of
fsourSkip: Exit(False);
fsourAbort: AbortOperation;
fsourRetry: RetryRename := False;
fsourSkipAll: FSkipRenameError := True;
end;
end;
until RetryRename;
end;
if FVerify then FStatistics.TotalBytes += SourceFile.Size;

1
src/ulng.pas
View file

@ -34,6 +34,7 @@ resourcestring
rsMsgCannotCopySpecialFile = 'Cannot copy special file %s';
rsMsgErrDirExists = 'Directory %s exists!';
rsMsgErrRename = 'Cannot rename file %s to %s';
rsMsgErrCannotMoveFile = 'Cannot move file %s';
rsMsgErrCannotCopyFile = 'Cannot copy file %s to %s';
rsMsgFileExistsOverwrite = 'Overwrite:';
rsMsgFileExistsWithFile = 'With file:';