hg/stx-libbasic2: comparison ZipArchive.st

equal deleted inserted replaced

-:04b2ef9b1ef8
+:e5b9ccd39972
 !
 entries
 "return a collection of fileName entries"
-|names|
+^ zipMembersByName keys
+!
-names := OrderedCollection new.
+file
-self zipMembersDo:[:zipd |
+^ file
-names add:(zipd fileName)
-].
-^ names
 !
 fileSize
 file notNil ifTrue:[
 ^ file size
 !
 members
 "return a collection of members"
-|members|
+^ zipMembersByName values.
-members := OrderedCollection new.
-self zipMembersDo:[:zipd |
-members add:zipd
-].
-^ members
 !
 membersMatching:aFileMatchPattern
 "return a collection of members which match aFileMatchPattern"
-^ self members select:[:m | aFileMatchPattern match:m fileName]
+^ self zipMembersByName select:[:m | aFileMatchPattern match:m fileName]
 !
 name
 "return the (file-)name of this zipArchive"
 ^ archiveName
+!
+numberOfEntries
+"return the number of entries in the archive"
+^ zipMembersByName size
 !
 pathName
 "FileStream compatibility: answer the name of the underlying file - a String"
 endOfArchive   := anEndPosition.
 !
 size
 ^self fileSize
+!
+zipMembersByName
+^ zipMembersByName
 ! !
 !ZipArchive methodsFor:'error raising'!
 error:anErrorString
 ].
 archiveName := filename name.
 mode := readOrWriteMode.
+self openFile.
 mode ~~ #write ifTrue:[
 |mustCloseFile|
-mustCloseFile := true.
-self openFile.
 [
+mustCloseFile := true.
 self readDirectory.
 mustCloseFile := false.
 mode == #append ifTrue:[
-members := self entries collect:[:eachEntryName | self findMember:eachEntryName] thenSelect:[:eachEntry | eachEntry notNil].
+members := self zipMembersByName values.
 members isEmptyOrNil ifTrue:[^ self].
-maxStartPosition := (members collect:[:eachMember | eachMember fileStart]) max.
+maxStartPosition := members maxApplying:[:eachMember | self dataStartOf:eachMember].
-lastMember := members detect:[:eachMember | eachMember fileStart = maxStartPosition].
+lastMember := members detect:[:eachMember | eachMember dataStart = maxStartPosition].
-file position0Based:(startOfArchive + lastMember fileStart + lastMember compressedSize).
+file position0Based:(startOfArchive + lastMember dataStart + lastMember compressedSize).
 mode := #write.
 ].
 ] ensure:[
 mustCloseFile ifTrue:[self closeFile].
 ].
 ] ifFalse:[
-self openFile.
+zipMembersByName := Dictionary new.
 ].
 "Modified: / 31-08-2010 / 12:39:25 / sr"
 !
 readFrom:aPositionableStream
 <resource: #obsolete>
 "initialize the archive to read from aPositionableStream.
 Obsolete - backward compatibility."
+self obsoleteMethodWarning.
 ^ self readingFrom:aPositionableStream
 !
 readingFrom:aPositionableStream
 "initialize the archive to read from aPositionableStream"
 aPositionableStream isFileStream ifTrue:[
 archiveName := aPositionableStream pathName.
 ] ifFalse:[
 archiveName := 'internal stream'.
 ].
+zipMembersByName := Dictionary new.
 ! !
 !ZipArchive methodsFor:'private'!
 checkZipArchive:archiveFileName
 self addCentralZipDirectory
 ].
 file close.
 file := nil.
 ]
+!
+dataStartOf:zipEntry
+"fetch the absolute start address of the data of a given zipEntry.
+Note: extra field and extra field length may be different from that in
+the central directory entry. Sow e have to fetch the local header."
+|dataStart fileHeaderStart fileNameLength extraFieldLength|
+dataStart := zipEntry dataStart.
+dataStart notNil ifTrue:[
+^ dataStart.
+].
+fileHeaderStart := zipEntry relativeLocalHeaderOffset + startOfArchive.
+(fileHeaderStart + 30) > endOfArchive ifTrue: [
+^ ZipFileFormatErrorSignal raiseRequestErrorString:' - zipEntry end is out of the archive bounds'.
+].
+"Now read the fileHeader:
+0  local file header signature     4 bytes  (0x04034b50)
+4  version needed to extract       2 bytes
+6  general purpose bit flag        2 bytes
+8  compression method              2 bytes
+10 last mod file time              2 bytes
+12 last mod file date              2 bytes
+14 crc-32                          4 bytes
+18 compressed size                 4 bytes
+22 uncompressed size               4 bytes
+26 file name length (x)            2 bytes
+28 extra field length (y)          2 bytes
+fixd size total len:    30
+30 file name (variable size)
+30+x    extra field (variable size)
+30+x+y  data
+Note: extra field and extra field length may be different from that in
+the central directory entry!!
+"
+file position0Based:fileHeaderStart+26.
+fileNameLength := file nextUnsignedShortMSB:false.
+extraFieldLength := file nextUnsignedShortMSB:false.
+dataStart := fileHeaderStart + 30 + fileNameLength + extraFieldLength.
+(dataStart + (zipEntry compressedSize)) > endOfArchive ifTrue: [
+^ ZipFileFormatErrorSignal raiseRequestErrorString:' - zipEntry end is out of the archive bounds'.
+].
+zipEntry dataStart:dataStart.
+^ dataStart
 !
 openFile
 |fn|
 ].
 "Modified: / 19-11-2010 / 16:23:36 / cg"
 !
-addMember
-"add a zipMember"
-|zmemb |
-self addMember:(zmemb := ZipMember new).
-^ zmemb.
-"Created: / 29.3.1998 / 18:22:25 / cg"
-"Modified: / 9.9.1998 / 20:33:32 / cg"
-!
 addMember:zmemb
 "add a zipMember"
 (firstEntry == nil) ifTrue:[
 firstEntry := zmemb
 ] ifFalse:[
 lastEntry next:zmemb.
 ].
 lastEntry := zmemb.
+(zipMembersByName includesKey:zmemb fileName) ifTrue:[
+"ignore duplicate entries for backward compatibility.
+Argh: expecco once added wrong duplicates to the end of ets files.
+The first entry is valid."
+Transcript showCR:'Duplicate entry in ZIP (ignored): ', zmemb fileName.
+] ifFalse:[
+zipMembersByName at:zmemb fileName put:zmemb.
+].
 ^ zmemb.
 "Modified: / 30.3.1998 / 17:13:20 / cg"
 "Created: / 9.9.1998 / 20:33:06 / cg"
 !
 !
 findMember:name
 "find a zipMember by name"
-"/    zipMembersByName isNil ifTrue:[
+^ zipMembersByName at:name ifAbsent:[].
-"/        zipMembersByName := Dictionary new.
-"/        self zipMembersDo:[:zipd |
-"/            zipMembersByName at:(zipd fileName) put:zipd.
-"/        ].
-"/    ].
-"/    ^ zipMembersByName at:name ifAbsent:nil.
-self zipMembersDo:[:zipd |
-(zipd fileName = name) ifTrue:[^ zipd].
-].
-^ nil
-"Modified: / 18-11-2010 / 20:23:35 / cg"
 !
 findMemberAllowForMissingTrailingSlash: name
 "find a zipMember by name. Allow for missing trailing slash for directories.
 This method is currently used by JavaVM"
 ^ self.
 ] do:[
 centralDirectory readFrom:file.
 "/ set file position to start of central directory
-(pos0 - (centralDirectory centralDirectorySize)) < startOfArchive ifTrue: [
+(pos0 - centralDirectory centralDirectoryStartOffset - centralDirectory centralDirectorySize) < startOfArchive ifTrue: [
 ^ ZipFileFormatErrorSignal raiseRequestErrorString:' - central directory start is out of the archive bounds'.
 ].
+startOfArchive := pos0 - centralDirectory centralDirectoryStartOffset - centralDirectory centralDirectorySize.
 file position0Based:(pos0 - (centralDirectory centralDirectorySize)).
+zipMembersByName := Dictionary new:centralDirectory centralDirectoryTotalNoOfEntries.
 "/ read central directory entries
 1 to:(centralDirectory centralDirectoryTotalNoOfEntries) do:[:i |
 |zipd filename_length centralFileHeaderSignature relative_offset_local_header
 posOfNextMember extra|
 ZipFileFormatErrorSignal raiseRequestErrorString:' - file format error - bad centralHeaderSignature in: ' ,
 (file isFileStream ifTrue:[file pathName] ifFalse:['inStream']).
 ^ self.
 ].
-zipd := ZipMember new.
+zipd := ZipMember new readCentralDirectoryEntryFrom:file.
-zipd readCentralDirectoryEntryFrom:file.
 self addMember:zipd.
 ].
 (file position + 6) > endOfArchive ifTrue: [
 "/ archive has no digital signature
 ! !
 !ZipArchive methodsFor:'queries'!
 isValidPath: anArchivePathName
-^ self members
+self zipMembersByName
-contains:[:aMember |
+keysDo:[:eachMemberName |
-|fn|
+((eachMemberName startsWith:anArchivePathName,'/')
+or:[eachMemberName = anArchivePathName]) ifTrue:[^ true]
-fn := aMember fileName.
-((fn startsWith:anArchivePathName,'/') or:[(fn = anArchivePathName)])
 ].
-"/ cg: wrong - what about (isValidPath:'foo'), if there is a file named 'foobar' ?!!
+^ false.
-"/    self members do: [:aMember|
-"/        (aMember fileName startsWith:anArchivePathName) ifTrue:[
-"/            ^ true
-"/        ].
-"/    ].
-"/    ^ false
 ! !
 !ZipArchive methodsFor:'reading'!
 extract:fileName
 ]
 ].
 !
 withPositionAndMemberFor:fileName do:aBlock
-|zmemb  |
+|zmemb dataStart|
 (file isNil or:[mode ~~ #read]) ifTrue:[
 ^ self error: 'ZipArchive not open for reading ...'.
 ].
 zmemb := self findMember:fileName.
 zmemb isNil ifTrue:[^ nil].
-(zmemb fileStart + startOfArchive) > endOfArchive ifTrue: [
-^ ZipFileFormatErrorSignal raiseRequestErrorString:' - zipEntry start is out of the archive bounds'.
+dataStart := self dataStartOf:zmemb.
-].
+aBlock value:zmemb value:dataStart.
-(zmemb fileStart + startOfArchive + (zmemb compressedSize)) > endOfArchive ifTrue: [
-^ ZipFileFormatErrorSignal raiseRequestErrorString:' - zipEntry end is out of the archive bounds'.
-].
-aBlock value:zmemb value:(zmemb fileStart + startOfArchive)
 "Created: / 21-11-2010 / 11:51:41 / cg"
 ! !
 !ZipArchive methodsFor:'reading - stream'!
 readStreamFor:nameOfFileInArchive
 "open a stream on archive contents identified by nameOfFileInArchive"
-|zipEntry|
+|zipEntry dataStart|
 (file isNil or:[mode ~~ #read]) ifTrue:[
 ^ OpenError raiseRequestWith:nameOfFileInArchive errorString:'ZipArchive not open for reading ...'.
 ].
 zipEntry := self findMember:nameOfFileInArchive.
 zipEntry isNil ifTrue:[
 ^ OpenError raiseRequestWith:nameOfFileInArchive errorString:'ZipArchive member does not exist: '.
 ].
-(zipEntry fileStart + startOfArchive) > endOfArchive ifTrue: [
+dataStart := self dataStartOf:zipEntry.
-^ ZipFileFormatErrorSignal raiseRequestErrorString:' - zipEntry start is out of the archive bounds'.
+file position0Based:dataStart.
-].
-(zipEntry fileStart + startOfArchive + (zipEntry compressedSize)) > endOfArchive ifTrue: [
-^ ZipFileFormatErrorSignal raiseRequestErrorString:' - zipEntry end is out of the archive bounds'.
-].
-file position0Based:(zipEntry fileStart + startOfArchive).
 ^ (ZipReadStream zipFileStream:file zipEntry:zipEntry)
 zipArchive:self.
 ! !
 addDirectory: aDirectoryName
 "do not create directories (isDirectory = true) - they are not compatible between operating systems"
 <resource: #obsolete>
+self obsoleteMethodWarning.
 ^ self addFile:aDirectoryName withContents:nil compressMethod:COMPRESSION_STORED asDirectory:true.
 "Modified: / 19-11-2010 / 15:38:59 / cg"
 !
 "/ if proceeded, write as uncompressed
 theCompressMethod := COMPRESSION_STORED
 ].
 zipEntry := ZipMember new default.
-self addMember:zipEntry.
 theZipFileName := self validZipFileNameFrom:aFileName.
 zipEntry fileName: theZipFileName.
 zipEntry fileNameLength: theZipFileName size.
 zipEntry uncompressedSize: 0.
 "/ crc32 is allways reqired (not as written in docu to be zero in case of uncompressed mode)
 zipEntry crc32:crc32.
 zipEntry uncompressedSize: unCompressedDataSize.
 zipEntry rewriteCrcAndSizeTo:file.
+self addMember:zipEntry.
 file setToEnd.
 "Modified: / 19-11-2010 / 15:39:32 / cg"
 !
 "/ if proceeded, write as uncompressed
 theCompressMethod := COMPRESSION_STORED
 ].
 zipEntry := ZipMember new default.
-self addMember:zipEntry.
 theZipFileName := self validZipFileNameFrom:aFileName.
 zipEntry fileName:theZipFileName.
 zipEntry fileNameLength:theZipFileName size.
 (self appendTrailingSlash and:[isDirectory]) ifTrue:[
 file setToEnd.
 zipEntry writeTo:file.
 theCompressedData notNil ifTrue:[
 file nextPutBytes:zipEntry compressedSize from:theCompressedData.
 ].
+self addMember:zipEntry.
 "Created: / 18-11-2010 / 19:31:10 / cg"
 "Modified: / 19-11-2010 / 17:47:01 / cg"
 "Modified: / 19-11-2012 / 12:04:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 writeStreamFor:nameOfFileInArchive compressMethod:theCompressMethodArg
 "create new entry in central directory"
 |zipEntry curTime curDate theZipFileName theCompressMethod|
-(file isNil or: [mode ~~ #write]) ifTrue: [
+(file isNil or:[mode ~~ #write]) ifTrue: [
 ^ self error: 'ZipArchive not open for writing ...'.
 ].
 theCompressMethod := theCompressMethodArg.
 "/ if proceeded, write as uncompressed
 theCompressMethod := COMPRESSION_STORED
 ].
 zipEntry := ZipMember new default.
-self addMember:zipEntry.
 theZipFileName := self validZipFileNameFrom:nameOfFileInArchive.
 zipEntry fileName: theZipFileName.
 zipEntry fileNameLength: theZipFileName size.
 zipEntry uncompressedSize: 0.
 "/ ensure that the file position is at the end
 file setToEnd.
 zipEntry writeTo:file.
+self addMember:zipEntry.
 ^ (ZipWriteStream zipFileStream:file zipEntry:zipEntry)
 zipArchive:self.
 "Modified: / 19-11-2010 / 15:38:54 / cg"
 "Created: / 09-04-1998 / 13:05:03 / cg"
 "Modified: / 21-01-2011 / 00:05:00 / cg"
 !
 dataStart
-"tell the file offset, where tha data of this zip entry starts"
+"tell the file offset, where the data of this zip entry starts"
-dataStart isNil ifTrue: [
-dataStart := relativeLocalHeaderOffset
-+ "C_SIZEOFLOCALHEADER" 30
-+ fileNameLength
-+ extraFieldLength.
-].
 ^ dataStart
 "Created: / 29.3.1998 / 18:28:40 / cg"
 !
 dataStart:something
 "Created: / 25-11-2011 / 17:59:47 / cg"
 ! !
 !ZipArchive::ZipMember methodsFor:'queries'!
-fileStart
-^ self dataStart
-"/ ^ relative_offset_local_header + ZipArchive LREC_SIZE + 4 + name size
-"Created: / 29.3.1998 / 19:10:57 / cg"
-!
 isDirectory
 ^
 ((externalFileAttributes ? 0) bitTest:EXTERNALFILEATTRIBUTES_ISDIRECTORY)
 or:[uncompressedSize == 0 and:[fileName last = $/]].
 generalPurposBitFlag := aStream nextUnsignedShortMSB:false.
 compressionMethod := aStream nextUnsignedShortMSB:false.
 lastModFileTime := aStream nextUnsignedShortMSB:false.
 lastModFileDate := aStream nextUnsignedShortMSB:false.
 crc32 := aStream nextUnsignedLongMSB: false.
-compressedSize := aStream nextLongMSB:false.
+compressedSize := aStream nextUnsignedLongMSB:false.
-uncompressedSize := aStream nextLongMSB:false.
+uncompressedSize := aStream nextUnsignedLongMSB:false.
 fileNameLength := aStream nextUnsignedShortMSB:false.
 extraFieldLength := aStream nextUnsignedShortMSB:false.
 fileCommentLength := aStream nextUnsignedShortMSB:false.
 diskNumberStart := aStream nextUnsignedShortMSB:false.
 internalFileAttributes := aStream nextUnsignedShortMSB:false.
-externalFileAttributes := aStream nextLongMSB:false.
+externalFileAttributes := aStream nextUnsignedLongMSB:false.
-relativeLocalHeaderOffset := aStream nextLongMSB:false.
+relativeLocalHeaderOffset := aStream nextUnsignedLongMSB:false.
 "/    (aStream position + fileNameLength) > endOfArchive ifTrue: [
 "/        ^ ZipArchive zipFileFormatErrorSignal raiseRequestErrorString:' - central directory entry out of archive bounds'.
 "/    ].
 fileName:= String new:fileNameLength.
 extraFieldLength ~~ 0 ifTrue: [
 "/        (aStream position + extraFieldLength) > endOfArchive ifTrue: [
 "/            ^ ZipArchive zipFileFormatErrorSignal raiseRequestErrorString:' - central directory entry out of archive bounds'.
 "/        ].
-extraField := String new:extraFieldLength.
+extraField := ByteArray new:extraFieldLength.
 aStream nextBytes:extraFieldLength into:extraField.
 ].
 fileCommentLength ~~ 0 ifTrue: [
 "/        (aStream position + fileCommentLength) > endOfArchive ifTrue: [
 ! !
 !ZipArchive class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.100 2012-12-05 14:38:32 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.101 2012-12-08 20:05:28 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.100 2012-12-05 14:38:32 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/ZipArchive.st,v 1.101 2012-12-08 20:05:28 stefan Exp $'
 ! !
 ZipArchive initialize!

changeset 2861	e5b9ccd39972
parent 2860	04b2ef9b1ef8
child 2893	08c695e14c86