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

ADD: Zip - show total progress when extract

Browse source 
(cherry picked from commit f89ab9056e)
This commit is contained in:
Alexander Koblov 2023-10-06 19:31:23 +03:00
commit b323b32a2b
1 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
plugins/wcx/zip/src/ZipFunc.pas
View file

@ -40,6 +40,8 @@ type
TAbZipKitEx = class (TAbZipKit)
private
FItemProgress: Byte;
FItem: TAbArchiveItem;
FNeedPassword: Boolean;
FOperationResult: LongInt;
FChangeVolProcW: TChangeVolProcW;
@ -237,6 +239,7 @@ end;
function ProcessFileW(hArcData : TArcHandle; Operation : Integer; DestPath, DestName : PWideChar) : Integer;dcpcall;
var
Abort: Boolean;
DestNameUtf8: String;
Arc : TAbZipKitEx absolute hArcData;
begin
@ -257,8 +260,9 @@ begin
// Show progress and ask if aborting.
if Assigned(Arc.FProcessDataProcW) then
begin
if Arc.FProcessDataProcW(PWideChar(CeUtf8ToUtf16(Arc.Items[Arc.Tag].FileName)), -1100) = 0 then
Arc.FOperationResult := E_EABORTED;
Abort := False;
Arc.AbArchiveItemProgressEvent(Arc, Arc.Items[Arc.Tag], 100, Abort);
if Abort then Arc.FOperationResult := E_EABORTED;
end;
end;
@ -284,8 +288,9 @@ begin
// Show progress and ask if aborting.
if Assigned(Arc.FProcessDataProcW) then
begin
if Arc.FProcessDataProcW(PWideChar(CeUtf8ToUtf16(Arc.Items[Arc.Tag].FileName)), -1100) = 0 then
Arc.FOperationResult := E_EABORTED;
Abort := False;
Arc.AbArchiveItemProgressEvent(Arc, Arc.Items[Arc.Tag], 100, Abort);
if Abort then Arc.FOperationResult := E_EABORTED;
end;
end;
@ -633,14 +638,34 @@ end;
procedure TAbZipKitEx.AbArchiveItemProgressEvent(Sender: TObject;
Item: TAbArchiveItem; Progress: Byte; var Abort: Boolean);
var
ASize: Int64;
begin
try
if Assigned(FProcessDataProcW) then
begin
if Assigned(Item) then
Abort := (FProcessDataProcW(PWideChar(CeUtf8ToUtf16(Item.FileName)), -(Progress + 1000)) = 0)
else
Abort := (FProcessDataProcW(nil, -(Progress + 1000)) = 0);
if (Item = nil) then
Abort := (FProcessDataProcW(nil, -(Progress + 1000)) = 0)
else begin
if Item.UncompressedSize = 0 then
ASize:= -(Progress + 1000)
else begin
if FItem <> Item then
begin
FItem := Item;
FItemProgress := 0;
end;
if FItemProgress = Progress then
ASize := 0
else begin
ASize := Item.UncompressedSize;
ASize := (Int64(Progress) - Int64(FItemProgress)) * ASize div 100;
if ASize > High(Int32) then ASize := -(Progress + 1000);
FItemProgress := Progress;
end;
end;
Abort := (FProcessDataProcW(PWideChar(CeUtf8ToUtf16(Item.FileName)), ASize) = 0)
end;
end;
except
Abort := True;