mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-28 10:02:14 +00:00
UPD: Use mbForceDirectory
This commit is contained in:
Alexander Koblov
parent
dca21e9f1b
commit
e02cbca284
2 changed files with 170 additions and 170 deletions
|
|
@ -58,7 +58,7 @@ begin
|
|||
|
||||
// Create destination path if it doesn't exist.
|
||||
if not mbDirectoryExists(sDstPath) then
|
||||
ForceDirectory(sDstPath);
|
||||
mbForceDirectory(sDstPath);
|
||||
|
||||
for xIndex:=0 to NewFileList.Count-1 do // copy
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -1,169 +1,169 @@
|
|||
{
|
||||
Seksi Commander
|
||||
----------------------------
|
||||
Implementing of Move files thread
|
||||
|
||||
Licence : GNU GPL v 2.0
|
||||
Author : radek.cervinka@centrum.cz
|
||||
|
||||
contributors:
|
||||
|
||||
Copyright (C) 2007-2009 Koblov Alexander (Alexx2000@mail.ru)
|
||||
}
|
||||
|
||||
unit uMoveThread;
|
||||
|
||||
{$mode objfpc}{$H+}
|
||||
|
||||
interface
|
||||
uses
|
||||
uTypes, uCopyThread;
|
||||
type
|
||||
TMoveThread = class(TCopyThread)
|
||||
protected
|
||||
procedure MainExecute; override;
|
||||
function GetCaptionLng: String; override;
|
||||
end;
|
||||
|
||||
implementation
|
||||
uses
|
||||
SysUtils, FileUtil, uShowMsg, uLng, uGlobs, uLog, uDCUtils, uOSUtils;
|
||||
|
||||
|
||||
procedure TMoveThread.MainExecute;
|
||||
var
|
||||
pr:PFileRecItem;
|
||||
xIndex:Integer;
|
||||
sDstExt:String;
|
||||
sDstName:String;
|
||||
sDstNew:String;
|
||||
iTotalDiskSize,
|
||||
iFreeDiskSize : Int64;
|
||||
bProceed: Boolean;
|
||||
begin
|
||||
CorrectMask;
|
||||
FReplaceAll:=False;
|
||||
FSkipAll:=False;
|
||||
FCopied:=0;
|
||||
|
||||
// Create destination path if it doesn't exist.
|
||||
if not mbDirectoryExists(sDstPath) then
|
||||
ForceDirectory(sDstPath);
|
||||
|
||||
// we first create dir structure
|
||||
for xIndex:=0 to NewFileList.Count-1 do // copy
|
||||
begin
|
||||
pr:=NewFileList.GetItem(xIndex);
|
||||
if FPS_ISDIR(pr^.iMode) then
|
||||
begin
|
||||
if not mbDirectoryExists(sDstPath+pr^.sPath+ pr^.sNameNoExt) then
|
||||
ForceDirectory(sDstPath+pr^.sPath+pr^.sNameNoExt);
|
||||
// DebugLn('move:mkdir:',sDstPath+pr^.sNameNoExt);
|
||||
end;
|
||||
end;
|
||||
|
||||
for xIndex:=NewFileList.Count-1 downto 0 do // copy and delete
|
||||
begin
|
||||
if Paused then Suspend;
|
||||
|
||||
bProceed := True;
|
||||
|
||||
pr:=NewFileList.GetItem(xIndex);
|
||||
|
||||
EstimateTime(FCopied);
|
||||
|
||||
if FPS_ISDIR(pr^.iMode) then
|
||||
begin
|
||||
mbRemoveDir(pr^.sName);
|
||||
end
|
||||
else
|
||||
begin
|
||||
// change dst name by mask
|
||||
DivFileName(pr^.sNameNoExt,sDstName, sDstExt);
|
||||
sDstName:=CorrectDstName(sDstName);
|
||||
sDstExt:=CorrectDstExt(sDstExt);
|
||||
sDstNew:='';
|
||||
if sDstName<>'' then
|
||||
sDstNew:=sDstName;
|
||||
if sDstExt<>'.' then
|
||||
sDstNew:=sDstNew+sDstExt;
|
||||
|
||||
if CompareFilenames(pr^.sName, sDstPath+pr^.sPath+sDstNew) <> 0 then
|
||||
begin
|
||||
FFileOpDlg.sFileNameFrom:= pr^.sName;
|
||||
FFileOpDlg.sFileNameTo:= sDstPath + pr^.sPath + sDstNew;
|
||||
Synchronize(@FFileOpDlg.UpdateDlg);
|
||||
|
||||
// test if exists and show dialog
|
||||
FAppend:=False;
|
||||
if mbFileExists(sDstPath+pr^.sPath+sDstNew) and not FReplaceAll then
|
||||
begin
|
||||
if FSkipAll then
|
||||
Exit;
|
||||
if not DlgFileExist(Format(rsMsgFileExistsRwrt,[sDstPath+pr^.sPath+sDstNew, pr^.sName])) then
|
||||
bProceed := False;
|
||||
end;
|
||||
|
||||
if bProceed then
|
||||
begin
|
||||
if FAppend or not mbRenameFile(pr^.sName, sDstPath+pr^.sPath+ sDstNew) then
|
||||
begin
|
||||
// rename failed, maybe not the same filesystem (or we want append)
|
||||
// OK, copy standard way and delete src file
|
||||
|
||||
// Check disk free space
|
||||
GetDiskFreeSpace(sDstPath, iFreeDiskSize, iTotalDiskSize);
|
||||
if pr^.iSize > iFreeDiskSize then
|
||||
begin
|
||||
case MsgBox(Self, rsMsgNoFreeSpaceCont, [msmbYes, msmbNo,msmbSkip], msmbYes, msmbNo) of
|
||||
mmrNo:
|
||||
Exit;
|
||||
mmrSkip:
|
||||
bProceed := False;
|
||||
end;
|
||||
end;
|
||||
|
||||
if bProceed then
|
||||
begin
|
||||
if cpFile(pr, sDstPath, False) then // False >> not show confirmation dialog
|
||||
begin
|
||||
if mbDeleteFile(pr^.sName) then
|
||||
begin
|
||||
if (log_delete in gLogOptions) and (log_success in gLogOptions) then
|
||||
logWrite(Self, Format(rsMsgLogSuccess+rsMsgLogDelete, [pr^.sName]), lmtSuccess);
|
||||
end
|
||||
else
|
||||
begin
|
||||
if (log_delete in gLogOptions) and (log_errors in gLogOptions) then
|
||||
logWrite(Self, Format(rsMsgLogError+rsMsgLogDelete, [pr^.sName]), lmtError);
|
||||
end;
|
||||
end; // cpFile
|
||||
end;
|
||||
end
|
||||
else
|
||||
begin // rename succes
|
||||
// process comments if need
|
||||
if gProcessComments and Assigned(FDescr) then
|
||||
FDescr.MoveDescription(pr^.sName, sDstPath+pr^.sPath+ sDstNew);
|
||||
// write log
|
||||
if (log_cp_mv_ln in gLogOptions) and (log_success in gLogOptions) then
|
||||
logWrite(Self, Format(rsMsgLogSuccess+rsMsgLogMove, [pr^.sName+' -> '+sDstPath+pr^.sPath+ sDstNew]), lmtSuccess)
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
inc(FCopied,pr^.iSize);
|
||||
|
||||
if FFilesSize <> 0 then
|
||||
FFileOpDlg.iProgress2Pos:= (FCopied * 100) div FFilesSize;
|
||||
Synchronize(@FFileOpDlg.UpdateDlg);
|
||||
end; // FPS_ISDIR(pr^.iMode)
|
||||
end; // for
|
||||
end;
|
||||
|
||||
function TMoveThread.GetCaptionLng: String;
|
||||
begin
|
||||
Result:= rsDlgMv;
|
||||
end;
|
||||
|
||||
end.
|
||||
{
|
||||
Seksi Commander
|
||||
----------------------------
|
||||
Implementing of Move files thread
|
||||
|
||||
Licence : GNU GPL v 2.0
|
||||
Author : radek.cervinka@centrum.cz
|
||||
|
||||
contributors:
|
||||
|
||||
Copyright (C) 2007-2009 Koblov Alexander (Alexx2000@mail.ru)
|
||||
}
|
||||
|
||||
unit uMoveThread;
|
||||
|
||||
{$mode objfpc}{$H+}
|
||||
|
||||
interface
|
||||
uses
|
||||
uTypes, uCopyThread;
|
||||
type
|
||||
TMoveThread = class(TCopyThread)
|
||||
protected
|
||||
procedure MainExecute; override;
|
||||
function GetCaptionLng: String; override;
|
||||
end;
|
||||
|
||||
implementation
|
||||
uses
|
||||
SysUtils, FileUtil, uShowMsg, uLng, uGlobs, uLog, uFileProcs, uDCUtils, uOSUtils;
|
||||
|
||||
|
||||
procedure TMoveThread.MainExecute;
|
||||
var
|
||||
pr:PFileRecItem;
|
||||
xIndex:Integer;
|
||||
sDstExt:String;
|
||||
sDstName:String;
|
||||
sDstNew:String;
|
||||
iTotalDiskSize,
|
||||
iFreeDiskSize : Int64;
|
||||
bProceed: Boolean;
|
||||
begin
|
||||
CorrectMask;
|
||||
FReplaceAll:=False;
|
||||
FSkipAll:=False;
|
||||
FCopied:=0;
|
||||
|
||||
// Create destination path if it doesn't exist.
|
||||
if not mbDirectoryExists(sDstPath) then
|
||||
mbForceDirectory(sDstPath);
|
||||
|
||||
// we first create dir structure
|
||||
for xIndex:=0 to NewFileList.Count-1 do // copy
|
||||
begin
|
||||
pr:=NewFileList.GetItem(xIndex);
|
||||
if FPS_ISDIR(pr^.iMode) then
|
||||
begin
|
||||
if not mbDirectoryExists(sDstPath+pr^.sPath+ pr^.sNameNoExt) then
|
||||
mbForceDirectory(sDstPath+pr^.sPath+pr^.sNameNoExt);
|
||||
// DebugLn('move:mkdir:',sDstPath+pr^.sNameNoExt);
|
||||
end;
|
||||
end;
|
||||
|
||||
for xIndex:=NewFileList.Count-1 downto 0 do // copy and delete
|
||||
begin
|
||||
if Paused then Suspend;
|
||||
|
||||
bProceed := True;
|
||||
|
||||
pr:=NewFileList.GetItem(xIndex);
|
||||
|
||||
EstimateTime(FCopied);
|
||||
|
||||
if FPS_ISDIR(pr^.iMode) then
|
||||
begin
|
||||
mbRemoveDir(pr^.sName);
|
||||
end
|
||||
else
|
||||
begin
|
||||
// change dst name by mask
|
||||
DivFileName(pr^.sNameNoExt,sDstName, sDstExt);
|
||||
sDstName:=CorrectDstName(sDstName);
|
||||
sDstExt:=CorrectDstExt(sDstExt);
|
||||
sDstNew:='';
|
||||
if sDstName<>'' then
|
||||
sDstNew:=sDstName;
|
||||
if sDstExt<>'.' then
|
||||
sDstNew:=sDstNew+sDstExt;
|
||||
|
||||
if CompareFilenames(pr^.sName, sDstPath+pr^.sPath+sDstNew) <> 0 then
|
||||
begin
|
||||
FFileOpDlg.sFileNameFrom:= pr^.sName;
|
||||
FFileOpDlg.sFileNameTo:= sDstPath + pr^.sPath + sDstNew;
|
||||
Synchronize(@FFileOpDlg.UpdateDlg);
|
||||
|
||||
// test if exists and show dialog
|
||||
FAppend:=False;
|
||||
if mbFileExists(sDstPath+pr^.sPath+sDstNew) and not FReplaceAll then
|
||||
begin
|
||||
if FSkipAll then
|
||||
Exit;
|
||||
if not DlgFileExist(Format(rsMsgFileExistsRwrt,[sDstPath+pr^.sPath+sDstNew, pr^.sName])) then
|
||||
bProceed := False;
|
||||
end;
|
||||
|
||||
if bProceed then
|
||||
begin
|
||||
if FAppend or not mbRenameFile(pr^.sName, sDstPath+pr^.sPath+ sDstNew) then
|
||||
begin
|
||||
// rename failed, maybe not the same filesystem (or we want append)
|
||||
// OK, copy standard way and delete src file
|
||||
|
||||
// Check disk free space
|
||||
GetDiskFreeSpace(sDstPath, iFreeDiskSize, iTotalDiskSize);
|
||||
if pr^.iSize > iFreeDiskSize then
|
||||
begin
|
||||
case MsgBox(Self, rsMsgNoFreeSpaceCont, [msmbYes, msmbNo,msmbSkip], msmbYes, msmbNo) of
|
||||
mmrNo:
|
||||
Exit;
|
||||
mmrSkip:
|
||||
bProceed := False;
|
||||
end;
|
||||
end;
|
||||
|
||||
if bProceed then
|
||||
begin
|
||||
if cpFile(pr, sDstPath, False) then // False >> not show confirmation dialog
|
||||
begin
|
||||
if mbDeleteFile(pr^.sName) then
|
||||
begin
|
||||
if (log_delete in gLogOptions) and (log_success in gLogOptions) then
|
||||
logWrite(Self, Format(rsMsgLogSuccess+rsMsgLogDelete, [pr^.sName]), lmtSuccess);
|
||||
end
|
||||
else
|
||||
begin
|
||||
if (log_delete in gLogOptions) and (log_errors in gLogOptions) then
|
||||
logWrite(Self, Format(rsMsgLogError+rsMsgLogDelete, [pr^.sName]), lmtError);
|
||||
end;
|
||||
end; // cpFile
|
||||
end;
|
||||
end
|
||||
else
|
||||
begin // rename succes
|
||||
// process comments if need
|
||||
if gProcessComments and Assigned(FDescr) then
|
||||
FDescr.MoveDescription(pr^.sName, sDstPath+pr^.sPath+ sDstNew);
|
||||
// write log
|
||||
if (log_cp_mv_ln in gLogOptions) and (log_success in gLogOptions) then
|
||||
logWrite(Self, Format(rsMsgLogSuccess+rsMsgLogMove, [pr^.sName+' -> '+sDstPath+pr^.sPath+ sDstNew]), lmtSuccess)
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
inc(FCopied,pr^.iSize);
|
||||
|
||||
if FFilesSize <> 0 then
|
||||
FFileOpDlg.iProgress2Pos:= (FCopied * 100) div FFilesSize;
|
||||
Synchronize(@FFileOpDlg.UpdateDlg);
|
||||
end; // FPS_ISDIR(pr^.iMode)
|
||||
end; // for
|
||||
end;
|
||||
|
||||
function TMoveThread.GetCaptionLng: String;
|
||||
begin
|
||||
Result:= rsDlgMv;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue