mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-21 09:58:13 +00:00
UPD: Change create dir function name; don't change current directory when creating directories.
This commit is contained in:
cobines
parent
c6d6514d91
commit
ddd3c7be18
7 changed files with 245 additions and 256 deletions
|
|
@ -147,7 +147,7 @@ var
|
|||
fTarget,fSource:TFileStreamEx;
|
||||
|
||||
begin
|
||||
if ForceDirectory(ExtractFileDir(edSave.Text)) then
|
||||
if mbForceDirectory(ExtractFileDir(edSave.Text)) then
|
||||
begin
|
||||
fTarget:=TFileStreamEx.Create(edSave.Text,fmCreate);
|
||||
try
|
||||
|
|
|
|||
|
|
@ -715,7 +715,7 @@ begin
|
|||
begin
|
||||
if edFile.Text='' then
|
||||
edFile.Text:=lsvwFile.Items.Item[0].SubItems[1]+ PathDelim+'default.log';
|
||||
ForceDirectory(ExtractFileDir(edFile.Text));
|
||||
mbForceDirectory(ExtractFileDir(edFile.Text));
|
||||
|
||||
if mbFileExists(edFile.Text) then
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ begin
|
|||
begin
|
||||
gpIniDir := GetAppConfigDir;//(False);
|
||||
if not mbDirectoryExists(gpIniDir) then
|
||||
ForceDirectory(gpIniDir);
|
||||
mbForceDirectory(gpIniDir);
|
||||
gpIniDir := IncludeTrailingPathDelimiter(gpIniDir); // add if need path delimiter
|
||||
end;
|
||||
Ini.Free;
|
||||
|
|
|
|||
|
|
@ -1288,7 +1288,7 @@ var
|
|||
begin
|
||||
// Dummy operation for testing.
|
||||
debugln('Starting copy operation');
|
||||
Operation := TFileSystemCopyOutOperation.Create(nil,nil,nil,nil);
|
||||
//Operation := TFileSystemCopyOutOperation.Create(nil,nil,nil,nil);
|
||||
OperationHandle := OperationsManager.AddOperation(Operation, ossAutoQueue);
|
||||
|
||||
// The OperationHandle should now be passed to the dialog displaying progress.
|
||||
|
|
@ -1358,7 +1358,7 @@ begin
|
|||
end
|
||||
else
|
||||
begin
|
||||
if not ForceDirectory(ActiveDir+sPath) then
|
||||
if not mbForceDirectory(ActiveDir+sPath) then
|
||||
begin
|
||||
// write log
|
||||
if (log_dir_op in gLogOptions) and (log_errors in gLogOptions) then
|
||||
|
|
|
|||
|
|
@ -1,246 +1,234 @@
|
|||
{
|
||||
Seksi Commander
|
||||
----------------------------
|
||||
Licence : GNU GPL v 2.0
|
||||
Author : radek.cervinka@centrum.cz
|
||||
|
||||
some file routines
|
||||
|
||||
contributors:
|
||||
|
||||
Mattias Gaertner (from Lazarus code)
|
||||
|
||||
Copyright (C) 2007-2009 Koblov Alexander (Alexx2000@mail.ru)
|
||||
}
|
||||
|
||||
unit uFileProcs;
|
||||
|
||||
{$mode objfpc}{$H+}
|
||||
|
||||
interface
|
||||
uses
|
||||
uTypes, ComCtrls;
|
||||
|
||||
{en
|
||||
Create a chain of directories
|
||||
@param(DirectoryName The full path to directory)
|
||||
@returns(@true if DirectoryName already existed or was created succesfully.
|
||||
If it failed to create any of the parts, @false is returned.)
|
||||
}
|
||||
function ForceDirectory(DirectoryName: string): boolean;
|
||||
{en
|
||||
Copies a file.
|
||||
@param(sSrc String expression that specifies the name of the file to be copied)
|
||||
@param(sDst String expression that specifies the target file name)
|
||||
@returns(The function returns @true if successful, @false otherwise)
|
||||
}
|
||||
function CopyFile(const sSrc, sDst: String; bAppend: Boolean = False): Boolean;
|
||||
{en
|
||||
Remove the contents of directory recursively
|
||||
@param(sFolderName String expression that specifies the name of the folder to be removed)
|
||||
}
|
||||
procedure DelTree(const sFolderName: String);
|
||||
{en
|
||||
Read string from a text file into variable and goto next line
|
||||
@param(hFile Handle of file)
|
||||
@param(S Stores the result string)
|
||||
}
|
||||
procedure FileReadLn(hFile: Integer; var S: String);
|
||||
{en
|
||||
Write string to a text file and append newline
|
||||
@param(hFile Handle of file)
|
||||
@param(S String for writing)
|
||||
}
|
||||
procedure FileWriteLn(hFile: Integer; S: String);
|
||||
|
||||
implementation
|
||||
uses
|
||||
LCLProc, SysUtils, uGlobs, uShowMsg, Classes, uClassesEx, uDCUtils,
|
||||
uOSUtils, uDeleteThread, uFileList;
|
||||
|
||||
const
|
||||
cBlockSize=16384; // size of block if copyfile
|
||||
// if pb is assigned > use, else work without pb :-)
|
||||
|
||||
|
||||
function CopyFile(const sSrc, sDst: String; bAppend: Boolean): Boolean;
|
||||
var
|
||||
src, dst:TFileStreamEx;
|
||||
iDstBeg:Integer; // in the append mode we store original size
|
||||
Buffer: PChar;
|
||||
begin
|
||||
Result:=False;
|
||||
if not FileExists(sSrc) then Exit;
|
||||
|
||||
dst:=nil; // for safety exception handling
|
||||
GetMem(Buffer,cBlockSize+1);
|
||||
|
||||
try
|
||||
try
|
||||
src:=TFileStreamEx.Create(sSrc,fmOpenRead or fmShareDenyNone);
|
||||
if bAppend then
|
||||
begin
|
||||
dst:=TFileStreamEx.Create(sDst,fmOpenReadWrite);
|
||||
dst.Seek(0,soFromEnd); // seek to end
|
||||
end
|
||||
else
|
||||
dst:=TFileStreamEx.Create(sDst,fmCreate);
|
||||
iDstBeg:=dst.Size;
|
||||
// we dont't use CopyFrom, because it's alocate and free buffer every time is called
|
||||
while (dst.Size+cBlockSize)<= (src.Size+iDstBeg) do
|
||||
begin
|
||||
Src.ReadBuffer(Buffer^, cBlockSize);
|
||||
dst.WriteBuffer(Buffer^, cBlockSize);
|
||||
|
||||
end;
|
||||
if (iDstBeg+src.Size)>dst.Size then
|
||||
begin
|
||||
// dst.CopyFrom(src,src.Size-dst.size);
|
||||
src.ReadBuffer(Buffer^, src.Size+iDstBeg-dst.size);
|
||||
dst.WriteBuffer(Buffer^, src.Size+iDstBeg-dst.size);
|
||||
end;
|
||||
Result := FileCopyAttr(sSrc, sDst, gDropReadOnlyFlag); // chmod, chgrp
|
||||
finally
|
||||
if assigned(src) then
|
||||
FreeAndNil(src);
|
||||
if assigned(dst) then
|
||||
FreeAndNil(dst);
|
||||
if assigned(Buffer) then
|
||||
FreeMem(Buffer);
|
||||
end;
|
||||
except
|
||||
on EFCreateError do
|
||||
msgError('!!!!EFCreateError');
|
||||
on EFOpenError do
|
||||
msgError('!!!!EFOpenError');
|
||||
on EWriteError do
|
||||
msgError('!!!!EFWriteError');
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure DelTree(const sFolderName: String);
|
||||
var
|
||||
fl: TFileList;
|
||||
DT: TDeleteThread;
|
||||
pfri: PFileRecItem;
|
||||
begin
|
||||
fl:= TFileList.Create; // free at Thread end by thread
|
||||
try
|
||||
New(pfri);
|
||||
pfri^.sName:= sFolderName;
|
||||
pfri^.iMode:= faFolder;
|
||||
pfri^.bLinkIsDir:= False;
|
||||
fl.AddItem(pfri);
|
||||
try
|
||||
DT:= TDeleteThread.Create(fl);
|
||||
//DT.sDstMask:=sDstMaskTemp;
|
||||
DT.Resume;
|
||||
DT.WaitFor;
|
||||
except
|
||||
DT.Free;
|
||||
end;
|
||||
except
|
||||
FreeAndNil(fl);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure FileReadLn(hFile: Integer; var S: String);
|
||||
const
|
||||
cBufSize = 4096;
|
||||
var
|
||||
Buf: array[1..cBufSize] of Char;
|
||||
iNumRead,
|
||||
iCounter,
|
||||
iBufPos: Integer;
|
||||
bEOLFound: Boolean;
|
||||
iFilePos,
|
||||
iFileSize: Int64;
|
||||
begin
|
||||
S:='';
|
||||
// get current position
|
||||
iFilePos:= FileSeek(hFile, 0, soFromCurrent);
|
||||
// get file size
|
||||
iFileSize:= FileSeek(hFile, 0, soFromEnd);
|
||||
// restore position
|
||||
FileSeek(hFile, iFilePos, soFromBeginning);
|
||||
bEOLFound:= False;
|
||||
|
||||
while (iFilePos < iFileSize) and not bEOLFound do
|
||||
begin
|
||||
iNumRead:= FileRead(hFile, Buf, SizeOf(Buf));
|
||||
|
||||
for iCounter:= 1 to iNumRead do
|
||||
begin
|
||||
if Buf[iCounter] in [#13, #10] then
|
||||
begin
|
||||
bEOLFound:=True;
|
||||
iBufPos:=iCounter+1;
|
||||
if ((iBufPos) <= iNumRead) and (Buf[iBufPos] in [#13, #10]) then
|
||||
Inc(iBufPos);
|
||||
Buf[iCounter]:= #0;
|
||||
S:= StrPas(@Buf);
|
||||
FileSeek(hFile, iFilePos+iBufPos-1, soFromBeginning);
|
||||
Break;
|
||||
end;
|
||||
end; // for
|
||||
|
||||
if (not bEOLFound) then
|
||||
begin
|
||||
if (iNumRead < cBufSize) then
|
||||
Buf[iNumRead+1]:= #0;
|
||||
S:= StrPas(@Buf);
|
||||
end;
|
||||
Inc(iFilePos, iNumRead);
|
||||
end; // while
|
||||
end;
|
||||
|
||||
procedure FileWriteLn(hFile: Integer; S: String);
|
||||
begin
|
||||
S:= S + LineEnding;
|
||||
FileWrite(hFile, PChar(S)[0], Length(S));
|
||||
end;
|
||||
|
||||
function ForceDirectory(DirectoryName: string): boolean;
|
||||
var
|
||||
i: integer;
|
||||
iBeg:Integer;
|
||||
sDir: string;
|
||||
begin
|
||||
//DebugLn('ForceDirectory:',DirectoryName);
|
||||
i:=1;
|
||||
iBeg:=1;
|
||||
if DirectoryName[Length(DirectoryName)]<>PathDelim then
|
||||
DirectoryName:=DirectoryName+PathDelim;
|
||||
//DebugLn('ForceDirectory:',DirectoryName);
|
||||
|
||||
if Pos('\\', DirectoryName) = 1 then // if network path
|
||||
begin
|
||||
i := CharPos(PathDelim, DirectoryName, 3); // index of the end of computer name
|
||||
i := CharPos(PathDelim, DirectoryName, i + 1); // index of the end of first remote directory
|
||||
end;
|
||||
|
||||
while i<=length(DirectoryName) do
|
||||
begin
|
||||
if DirectoryName[i]=PathDelim then
|
||||
begin
|
||||
sDir:=copy(DirectoryName,1,i-1);
|
||||
if (sDir='') then
|
||||
sDir:= mbGetCurrentDir;
|
||||
|
||||
//DebugLn('Dir: ' + sDir);
|
||||
if not mbDirectoryExists(sDir) then
|
||||
begin
|
||||
//DebugLn(copy(DirectoryName,1,iBeg-1));
|
||||
mbSetCurrentDir(copy(DirectoryName,1,iBeg-1));
|
||||
Result:=mbCreateDir(Copy(DirectoryName, iBeg, i-iBeg));
|
||||
if not Result then exit;
|
||||
end;
|
||||
iBeg:=i+1;
|
||||
|
||||
end;
|
||||
inc(i);
|
||||
end;
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
end.
|
||||
{
|
||||
Seksi Commander
|
||||
----------------------------
|
||||
Licence : GNU GPL v 2.0
|
||||
Author : radek.cervinka@centrum.cz
|
||||
|
||||
some file routines
|
||||
|
||||
contributors:
|
||||
|
||||
Mattias Gaertner (from Lazarus code)
|
||||
|
||||
Copyright (C) 2007-2009 Koblov Alexander (Alexx2000@mail.ru)
|
||||
}
|
||||
|
||||
unit uFileProcs;
|
||||
|
||||
{$mode objfpc}{$H+}
|
||||
|
||||
interface
|
||||
uses
|
||||
uTypes, ComCtrls;
|
||||
|
||||
{en
|
||||
Create a chain of directories
|
||||
@param(DirectoryName The full path to directory)
|
||||
@returns(@true if DirectoryName already existed or was created succesfully.
|
||||
If it failed to create any of the parts, @false is returned.)
|
||||
}
|
||||
function mbForceDirectory(DirectoryName: string): boolean;
|
||||
{en
|
||||
Copies a file.
|
||||
@param(sSrc String expression that specifies the name of the file to be copied)
|
||||
@param(sDst String expression that specifies the target file name)
|
||||
@returns(The function returns @true if successful, @false otherwise)
|
||||
}
|
||||
function CopyFile(const sSrc, sDst: String; bAppend: Boolean = False): Boolean;
|
||||
{en
|
||||
Remove the contents of directory recursively
|
||||
@param(sFolderName String expression that specifies the name of the folder to be removed)
|
||||
}
|
||||
procedure DelTree(const sFolderName: String);
|
||||
{en
|
||||
Read string from a text file into variable and goto next line
|
||||
@param(hFile Handle of file)
|
||||
@param(S Stores the result string)
|
||||
}
|
||||
procedure FileReadLn(hFile: Integer; var S: String);
|
||||
{en
|
||||
Write string to a text file and append newline
|
||||
@param(hFile Handle of file)
|
||||
@param(S String for writing)
|
||||
}
|
||||
procedure FileWriteLn(hFile: Integer; S: String);
|
||||
|
||||
implementation
|
||||
uses
|
||||
LCLProc, SysUtils, uGlobs, uShowMsg, Classes, uClassesEx, uDCUtils,
|
||||
uOSUtils, uDeleteThread, uFileList;
|
||||
|
||||
const
|
||||
cBlockSize=16384; // size of block if copyfile
|
||||
// if pb is assigned > use, else work without pb :-)
|
||||
|
||||
|
||||
function CopyFile(const sSrc, sDst: String; bAppend: Boolean): Boolean;
|
||||
var
|
||||
src, dst:TFileStreamEx;
|
||||
iDstBeg:Integer; // in the append mode we store original size
|
||||
Buffer: PChar;
|
||||
begin
|
||||
Result:=False;
|
||||
if not FileExists(sSrc) then Exit;
|
||||
|
||||
dst:=nil; // for safety exception handling
|
||||
GetMem(Buffer,cBlockSize+1);
|
||||
|
||||
try
|
||||
try
|
||||
src:=TFileStreamEx.Create(sSrc,fmOpenRead or fmShareDenyNone);
|
||||
if bAppend then
|
||||
begin
|
||||
dst:=TFileStreamEx.Create(sDst,fmOpenReadWrite);
|
||||
dst.Seek(0,soFromEnd); // seek to end
|
||||
end
|
||||
else
|
||||
dst:=TFileStreamEx.Create(sDst,fmCreate);
|
||||
iDstBeg:=dst.Size;
|
||||
// we dont't use CopyFrom, because it's alocate and free buffer every time is called
|
||||
while (dst.Size+cBlockSize)<= (src.Size+iDstBeg) do
|
||||
begin
|
||||
Src.ReadBuffer(Buffer^, cBlockSize);
|
||||
dst.WriteBuffer(Buffer^, cBlockSize);
|
||||
|
||||
end;
|
||||
if (iDstBeg+src.Size)>dst.Size then
|
||||
begin
|
||||
// dst.CopyFrom(src,src.Size-dst.size);
|
||||
src.ReadBuffer(Buffer^, src.Size+iDstBeg-dst.size);
|
||||
dst.WriteBuffer(Buffer^, src.Size+iDstBeg-dst.size);
|
||||
end;
|
||||
Result := FileCopyAttr(sSrc, sDst, gDropReadOnlyFlag); // chmod, chgrp
|
||||
finally
|
||||
if assigned(src) then
|
||||
FreeAndNil(src);
|
||||
if assigned(dst) then
|
||||
FreeAndNil(dst);
|
||||
if assigned(Buffer) then
|
||||
FreeMem(Buffer);
|
||||
end;
|
||||
except
|
||||
on EFCreateError do
|
||||
msgError('!!!!EFCreateError');
|
||||
on EFOpenError do
|
||||
msgError('!!!!EFOpenError');
|
||||
on EWriteError do
|
||||
msgError('!!!!EFWriteError');
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure DelTree(const sFolderName: String);
|
||||
var
|
||||
fl: TFileList;
|
||||
DT: TDeleteThread;
|
||||
pfri: PFileRecItem;
|
||||
begin
|
||||
fl:= TFileList.Create; // free at Thread end by thread
|
||||
try
|
||||
New(pfri);
|
||||
pfri^.sName:= sFolderName;
|
||||
pfri^.iMode:= faFolder;
|
||||
pfri^.bLinkIsDir:= False;
|
||||
fl.AddItem(pfri);
|
||||
try
|
||||
DT:= TDeleteThread.Create(fl);
|
||||
//DT.sDstMask:=sDstMaskTemp;
|
||||
DT.Resume;
|
||||
DT.WaitFor;
|
||||
except
|
||||
DT.Free;
|
||||
end;
|
||||
except
|
||||
FreeAndNil(fl);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure FileReadLn(hFile: Integer; var S: String);
|
||||
const
|
||||
cBufSize = 4096;
|
||||
var
|
||||
Buf: array[1..cBufSize] of Char;
|
||||
iNumRead,
|
||||
iCounter,
|
||||
iBufPos: Integer;
|
||||
bEOLFound: Boolean;
|
||||
iFilePos,
|
||||
iFileSize: Int64;
|
||||
begin
|
||||
S:='';
|
||||
// get current position
|
||||
iFilePos:= FileSeek(hFile, 0, soFromCurrent);
|
||||
// get file size
|
||||
iFileSize:= FileSeek(hFile, 0, soFromEnd);
|
||||
// restore position
|
||||
FileSeek(hFile, iFilePos, soFromBeginning);
|
||||
bEOLFound:= False;
|
||||
|
||||
while (iFilePos < iFileSize) and not bEOLFound do
|
||||
begin
|
||||
iNumRead:= FileRead(hFile, Buf, SizeOf(Buf));
|
||||
|
||||
for iCounter:= 1 to iNumRead do
|
||||
begin
|
||||
if Buf[iCounter] in [#13, #10] then
|
||||
begin
|
||||
bEOLFound:=True;
|
||||
iBufPos:=iCounter+1;
|
||||
if ((iBufPos) <= iNumRead) and (Buf[iBufPos] in [#13, #10]) then
|
||||
Inc(iBufPos);
|
||||
Buf[iCounter]:= #0;
|
||||
S:= StrPas(@Buf);
|
||||
FileSeek(hFile, iFilePos+iBufPos-1, soFromBeginning);
|
||||
Break;
|
||||
end;
|
||||
end; // for
|
||||
|
||||
if (not bEOLFound) then
|
||||
begin
|
||||
if (iNumRead < cBufSize) then
|
||||
Buf[iNumRead+1]:= #0;
|
||||
S:= StrPas(@Buf);
|
||||
end;
|
||||
Inc(iFilePos, iNumRead);
|
||||
end; // while
|
||||
end;
|
||||
|
||||
procedure FileWriteLn(hFile: Integer; S: String);
|
||||
begin
|
||||
S:= S + LineEnding;
|
||||
FileWrite(hFile, PChar(S)[0], Length(S));
|
||||
end;
|
||||
|
||||
function mbForceDirectory(DirectoryName: string): boolean;
|
||||
var
|
||||
i: integer;
|
||||
sDir: string;
|
||||
begin
|
||||
if DirectoryName = '' then Exit;
|
||||
|
||||
DirectoryName := IncludeTrailingPathDelimiter(DirectoryName);
|
||||
|
||||
if Pos('\\', DirectoryName) = 1 then // if network path
|
||||
begin
|
||||
i := CharPos(PathDelim, DirectoryName, 3); // index of the end of computer name
|
||||
i := CharPos(PathDelim, DirectoryName, i + 1); // index of the end of first remote directory
|
||||
end;
|
||||
|
||||
for i := 1 to length(DirectoryName) do
|
||||
begin
|
||||
if DirectoryName[i]=PathDelim then
|
||||
begin
|
||||
sDir:=copy(DirectoryName,1,i-1);
|
||||
|
||||
if not mbDirectoryExists(sDir) then
|
||||
begin
|
||||
Result:=mbCreateDir(sDir);
|
||||
if not Result then exit;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
end.
|
||||
|
|
|
|||
|
|
@ -233,7 +233,8 @@ function IsBlocked : Boolean;
|
|||
|
||||
implementation
|
||||
uses Forms, SysUtils, Masks, uFileOp, uGlobs, uLog, uOSUtils, LCLProc,
|
||||
uDCUtils, uLng, Controls, fPackInfoDlg, fDialogBox, uGlobsPaths, FileUtil;
|
||||
uDCUtils, uLng, Controls, fPackInfoDlg, fDialogBox, uGlobsPaths, FileUtil,
|
||||
uFileProcs;
|
||||
|
||||
const
|
||||
WcxIniFileName = 'wcx.ini';
|
||||
|
|
@ -1004,7 +1005,7 @@ begin
|
|||
sDestPath := IncludeTrailingPathDelimiter(sDestPath);
|
||||
|
||||
// Create path to destination directory (we don't have attributes for that).
|
||||
ForceDirectory(sDestPath);
|
||||
mbForceDirectory(sDestPath);
|
||||
|
||||
CreatedPaths.Clear;
|
||||
|
||||
|
|
@ -1024,7 +1025,7 @@ begin
|
|||
if (CreatedPaths.Find(TargetDir) = -1) and
|
||||
(not DirPathExists(TargetDir)) then
|
||||
begin
|
||||
if ForceDirectory(TargetDir) = False then
|
||||
if mbForceDirectory(TargetDir) = False then
|
||||
begin
|
||||
// Error, cannot create directory.
|
||||
Break; // Don't try to create subdirectories.
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ type
|
|||
implementation
|
||||
uses
|
||||
LCLProc, LCLType, uGlobs, uLog, uVFSutil, uFileOp, uOSUtils, uLng,
|
||||
Dialogs, Forms, Controls, FileUtil, uDCUtils, uGlobsPaths;
|
||||
Dialogs, Forms, Controls, FileUtil, uDCUtils, uGlobsPaths, uFileProcs;
|
||||
|
||||
const
|
||||
WfxIniFileName = 'wfx.ini';
|
||||
|
|
@ -613,7 +613,7 @@ begin
|
|||
|
||||
if FPS_ISDIR(FFileList.GetItem(I)^.iMode) then
|
||||
begin
|
||||
ForceDirectory(LocalName);
|
||||
mbForceDirectory(LocalName);
|
||||
Continue;
|
||||
end;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue