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

UPD: more accurate TotalFiles and TotalBytes in TarWriter

Browse source
This commit is contained in:
rich2014 2026-06-20 16:38:14 +08:00
commit 35c02857da
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/filesources/multiarchive/umultiarchivecopyinoperation.pas
View file

@ -390,7 +390,7 @@ function TMultiArchiveCopyInOperation.Tar: Boolean;
try
resultCode:= ProcessFilesWithMultiRootPath( SourceFiles, @self.doTarFiles );
finally
Result:= FTarWriter.TarEnd( resultCode=0 );
Result:= FTarWriter.TarEnd( FStatistics, resultCode=0 );
end;
end;
end;

2
src/filesources/wcxarchive/uwcxarchivecopyinoperation.pas
View file

@ -627,7 +627,7 @@ function TWcxArchiveCopyInOperation.Tar: Boolean;
try
resultCode:= ProcessFilesWithMultiRootPath( SourceFiles, @self.doTarFiles );
finally
Result:= FTarWriter.TarEnd( resultCode=0 );
Result:= FTarWriter.TarEnd( FStatistics, resultCode=0 );
end;
end;
end;

20
src/platform/utarwriter.pas
View file

@ -129,7 +129,7 @@ type
function TarBegin(var Statistics: TFileSourceCopyOperationStatistics): Boolean;
function TarFiles(const Files: TFiles; var Statistics: TFileSourceCopyOperationStatistics): Boolean;
function TarEnd(const beforeResult: Boolean): Boolean;
function TarEnd(var Statistics: TFileSourceCopyOperationStatistics; const beforeResult: Boolean): Boolean;
end;
implementation
@ -711,8 +711,9 @@ function TTarWriter.TarBegin(
with Statistics do
begin
CurrentFileTo:= FArchiveFileName;
Statistics.TotalFiles:= Statistics.TotalFiles + 1; // add .tar file
if FMemPack = 0 then
TotalBytes:= TotalBytes * 2;
TotalBytes:= TotalBytes * 2; // take TotalBytes as an approximation of the tar file
UpdateStatistics(Statistics);
end;
//if FCheckFreeSpace = True then
@ -779,7 +780,11 @@ begin
Result:= True;
end;
function TTarWriter.TarEnd(const beforeResult: Boolean): Boolean;
function TTarWriter.TarEnd(
var Statistics: TFileSourceCopyOperationStatistics;
const beforeResult: Boolean ): Boolean;
var
tarSize: Int64;
begin
Result:= False;
try
@ -792,7 +797,14 @@ begin
finally
if Assigned(FTargetStream) then begin
FreeAndNil(FTargetStream);
if NOT Result then begin
if Result then begin
if FMemPack = 0 then begin
// calculate the exact value of TotalBytes
tarSize:= mbFileSize(FArchiveFileName);
Statistics.TotalBytes:= Statistics.TotalBytes div 2 + tarSize;
UpdateStatistics(Statistics);
end;
end else begin
// There was some error, because not all files has been archived.
// Delete the not completed target file.
mbDeleteFile(FArchiveFileName)