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: Open archive by content for MultiArchiveFileSource

Browse source
This commit is contained in:
Alexander Koblov 2010-04-25 09:31:39 +00:00
commit 75f8a108d0
3 changed files with 51 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/newdesign/uarchivefilesourceutil.pas
View file

@ -64,7 +64,7 @@ begin
if not Assigned(Result) then
begin
if ArchiveSign then
Result := TMultiArchiveFileSource.CreateByArchiveSign(SourceFileSource, ArchiveFileName)
else
Result := TMultiArchiveFileSource.CreateByArchiveType(SourceFileSource, ArchiveFileName, ArchiveType);
end;
@ -239,4 +239,4 @@ begin
end;
end.

32
src/newdesign/umultiarchivefilesource.pas
View file

@ -90,6 +90,8 @@ type
function CreateTestArchiveOperation(var theSourceFiles: TFiles): TFileSourceOperation; override;
class function CreateByArchiveSign(anArchiveFileSource: IFileSource;
anArchiveFileName: String): IMultiArchiveFileSource;
class function CreateByArchiveType(anArchiveFileSource: IFileSource;
anArchiveFileName, anArchiveType: String): IMultiArchiveFileSource;
class function CreateByArchiveName(anArchiveFileSource: IFileSource;
@ -117,6 +119,34 @@ uses
uMultiArchiveTestArchiveOperation
;
class function TMultiArchiveFileSource.CreateByArchiveSign(anArchiveFileSource: IFileSource;
anArchiveFileName: String): IMultiArchiveFileSource;
var
I: Integer;
aMultiArcItem: TMultiArcItem;
begin
Result := nil;
// Check if there is a registered addon for the archive file by content.
for I := 0 to gMultiArcList.Count - 1 do
begin
aMultiArcItem:= gMultiArcList.Items[I];
if (aMultiArcItem.FEnabled) and (aMultiArcItem.FID <> EmptyStr) then
begin
if aMultiArcItem.CanYouHandleThisFile(anArchiveFileName) then
begin
Result := TMultiArchiveFileSource.Create(anArchiveFileSource,
anArchiveFileName,
aMultiArcItem);
DebugLn('Found registered addon "' + aMultiArcItem.FDescription + '" for archive ' + anArchiveFileName);
Break;
end;
end;
end;
end;
class function TMultiArchiveFileSource.CreateByArchiveType(
anArchiveFileSource: IFileSource;
anArchiveFileName, anArchiveType: String): IMultiArchiveFileSource;
@ -493,4 +523,4 @@ begin
end;
end.

35
src/umultiarc.pas
View file

@ -88,6 +88,7 @@ type
TMultiArcItem = class
private
FSeekAfterSignPos: Boolean;
FSignature,
FSignaturePosition: AnsiString;
FSignatureList: TSignatureList;
@ -217,7 +218,7 @@ begin
FDescription:= TrimQuotes(IniFile.ReadString(Section, 'Description', EmptyStr));
FID:= TrimQuotes(IniFile.ReadString(Section, 'ID', EmptyStr));
FIDPos:= TrimQuotes(IniFile.ReadString(Section, 'IDPos', EmptyStr));
FIDSeekRange:= IniFile.ReadInteger(Section, 'IDSeekRange', 0);
FIDSeekRange:= IniFile.ReadInteger(Section, 'IDSeekRange', 1024 * 1024);
FExtension:= TrimQuotes(IniFile.ReadString(Section, 'Extension', EmptyStr));
FStart:= TrimQuotes(IniFile.ReadString(Section, 'Start', EmptyStr));
FEnd:= TrimQuotes(IniFile.ReadString(Section, 'End', EmptyStr));
@ -349,19 +350,19 @@ begin
if AValue = EmptyStr then Exit;
Value:= StringReplace(AValue, '0x', '$', [rfReplaceAll]);
repeat
New(SignaturePosition);
SignPos:= Copy2SymbDel(Value, ',');
try
while (SignPos <> EmptyStr) do
begin
SignaturePosition^.Value:= StrToInt(Copy2SymbDel(SignPos, ','));
SignaturePosition^.Sign:= not (SignaturePosition^.Value < 0);
SignaturePosition^.Value:= abs(SignaturePosition^.Value);
SignPos:= Trim(Copy2SymbDel(Value, ','));
if SignPos = '<SeekID>' then
FSeekAfterSignPos:= True
else
try
New(SignaturePosition);
SignaturePosition^.Value:= StrToInt(SignPos);
SignaturePosition^.Sign:= not (SignaturePosition^.Value < 0);
SignaturePosition^.Value:= abs(SignaturePosition^.Value);
FSignaturePositionList.Add(SignaturePosition);
except
Dispose(SignaturePosition);
end;
FSignaturePositionList.Add(SignaturePosition);
except
Dispose(SignaturePosition);
end;
until Value = EmptyStr;
end;
@ -399,8 +400,8 @@ begin
for J:= 0 to FSignatureList.Count - 1 do
dwMaxSignSize := Max(FSignatureList[J]^.Size, dwMaxSignSize);
{
if (SkipSfxPart) then
dwOffset := SfxOffset
if (FSkipSfxPart) then
dwOffset := FSfxOffset
}
lpBuffer:= GetMem(dwMaxSignSize);
if Assigned(lpBuffer) then
@ -427,12 +428,12 @@ begin
end;
finally
FreeMem(lpBuffer);
FileClose(hFile);
end; // if Assigned(lpBuffer)
FileClose(hFile);
end;
// Try raw seek id
if (Result = False) then // and SeekAfterIDPos then
if (Result = False) and FSeekAfterSignPos then
begin
FillByte(FileMapRec, SizeOf(FileMapRec), 0);
if MapFile(FileName, FileMapRec) then