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: MultiArc - When ExtractWithoutPath is not supported unpack file by file into a tempdir. (#1850)

Browse source
This commit is contained in:
j2969719 2024-09-25 11:44:15 +03:00 • committed by GitHub
commit 9a290fd289
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/filesources/multiarchive/umultiarchivecopyoutoperation.pas
View file

@ -214,6 +214,11 @@ begin
CreateDirs(FFullFilesTreeToExtract, TargetPath, SourcePath, CreatedPaths);
sCommandLine:= MultiArcItem.FExtract;
end;
if not FExtractWithoutPath then
begin
sTempDir:= GetTempName(TargetPath);
mbCreateDir(sTempDir);
end;
// Get maximum acceptable command errorlevel
FErrorLevel:= ExtractErrorLevel(sCommandLine);
if Pos('%F', sCommandLine) <> 0 then // extract file by file
@ -237,8 +242,6 @@ begin
if (DoFileExists(aFile, TargetFileName) <> fsoofeOverwrite) then
Continue;
// Get target directory
sTempDir:= ExtractFileDirEx(TargetFileName);
UpdateProgress(aFile.FullPath, TargetFileName, 0);
@ -255,10 +258,17 @@ begin
OnReadLn(sReadyCommand);
// Set target directory as archiver current directory
FExProcess.Process.CurrentDirectory:= sTempDir;
if FExtractWithoutPath then
FExProcess.Process.CurrentDirectory:= TargetPath
else
FExProcess.Process.CurrentDirectory:= sTempDir;
FExProcess.SetCmdLine(sReadyCommand);
FExProcess.Execute;
if not FExtractWithoutPath then
mbRenameFile(sTempDir + PathDelim + aFile.FullPath, TargetFileName);
UpdateProgress(aFile.FullPath, TargetFileName, aFile.Size);
// Check for errors.
CheckForErrors(aFile.FullPath, TargetFileName, FExProcess.ExitStatus);
@ -267,14 +277,6 @@ begin
end
else // extract whole file list
begin
sTempDir:= TargetPath; // directory where files will be unpacked
// if extract from not root directory and with path
if (SourceFiles.Path <> PathDelim) and (FExtractWithoutPath = False) then
begin
sTempDir:= GetTempName(TargetPath);
mbCreateDir(sTempDir);
end;
// Check existence of target files
FilesToExtract:= TFiles.Create(FFullFilesTreeToExtract.Path);
for I:= 0 to FFullFilesTreeToExtract.Count - 1 do
@ -317,7 +319,11 @@ begin
OnReadLn(sReadyCommand);
// Set target directory as archiver current directory
FExProcess.Process.CurrentDirectory:= sTempDir;
if (SourceFiles.Path = PathDelim) or FExtractWithoutPath then
FExProcess.Process.CurrentDirectory:= TargetPath
else
FExProcess.Process.CurrentDirectory:= sTempDir;
FExProcess.SetCmdLine(sReadyCommand);
FExProcess.Execute;
@ -340,11 +346,14 @@ begin
UpdateProgress(aFile.FullPath, TargetFileName, aFile.Size);
end
end;
DelTree(sTempDir);
end;
end;
if (FExtractWithoutPath = False) then SetDirsAttributes(CreatedPaths);
if not FExtractWithoutPath then
begin
SetDirsAttributes(CreatedPaths);
DelTree(sTempDir);
end;
finally
FreeAndNil(CreatedPaths);