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

FIX: Pack using hidden archivers

Browse source
This commit is contained in:
Alexander Koblov 2024-10-05 15:14:59 +03:00
commit 56611a51ca
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/filesources/multiarchive/umultiarchivefilesource.pas
View file

@ -107,9 +107,11 @@ type
class function CreateByArchiveSign(anArchiveFileSource: IFileSource;
anArchiveFileName: String): IMultiArchiveFileSource;
class function CreateByArchiveType(anArchiveFileSource: IFileSource;
anArchiveFileName, anArchiveType: String): IMultiArchiveFileSource;
anArchiveFileName, anArchiveType: String;
bIncludeHidden: Boolean = False): IMultiArchiveFileSource;
class function CreateByArchiveName(anArchiveFileSource: IFileSource;
anArchiveFileName: String): IMultiArchiveFileSource;
anArchiveFileName: String;
bIncludeHidden: Boolean = False): IMultiArchiveFileSource;
{en
Returns @true if there is an addon registered for the archive name.
}
@ -168,8 +170,8 @@ begin
end;
class function TMultiArchiveFileSource.CreateByArchiveType(
anArchiveFileSource: IFileSource;
anArchiveFileName, anArchiveType: String): IMultiArchiveFileSource;
anArchiveFileSource: IFileSource; anArchiveFileName, anArchiveType: String;
bIncludeHidden: Boolean): IMultiArchiveFileSource;
var
I: Integer;
aMultiArcItem: TMultiArcItem;
@ -181,7 +183,8 @@ begin
begin
aMultiArcItem:= gMultiArcList.Items[I];
if (aMultiArcItem.FEnabled) and not (mafHide in aMultiArcItem.FFlags) and MatchesMaskList(anArchiveType, aMultiArcItem.FExtension, ',') then
if (aMultiArcItem.FEnabled) and
((bIncludeHidden) or not (mafHide in aMultiArcItem.FFlags)) and MatchesMaskList(anArchiveType, aMultiArcItem.FExtension, ',') then
begin
Result := TMultiArchiveFileSource.Create(anArchiveFileSource,
anArchiveFileName,
@ -194,8 +197,8 @@ begin
end;
class function TMultiArchiveFileSource.CreateByArchiveName(
anArchiveFileSource: IFileSource;
anArchiveFileName: String): IMultiArchiveFileSource;
anArchiveFileSource: IFileSource; anArchiveFileName: String;
bIncludeHidden: Boolean): IMultiArchiveFileSource;
var
I: Integer;
aMultiArcItem: TMultiArcItem;
@ -207,7 +210,8 @@ begin
begin
aMultiArcItem:= gMultiArcList.Items[I];
if (aMultiArcItem.FEnabled) and not (mafHide in aMultiArcItem.FFlags) and aMultiArcItem.Matches(anArchiveFileName) then
if (aMultiArcItem.FEnabled) and
((bIncludeHidden) or not (mafHide in aMultiArcItem.FFlags)) and aMultiArcItem.Matches(anArchiveFileName) then
begin
Result := TMultiArchiveFileSource.Create(anArchiveFileSource,
anArchiveFileName,

2
src/filesources/uarchivefilesourceutil.pas
View file

@ -70,7 +70,7 @@ begin
else if (ArchiveType = EmptyStr) then
Result := TMultiArchiveFileSource.CreateByArchiveName(SourceFileSource, ArchiveFileName)
else
Result := TMultiArchiveFileSource.CreateByArchiveType(SourceFileSource, ArchiveFileName, ArchiveType);
Result := TMultiArchiveFileSource.CreateByArchiveType(SourceFileSource, ArchiveFileName, ArchiveType, IncludeHidden);
end;
end;
end;