hg/stx-libbasic2: comparison ZipArchive.st

equal deleted inserted replaced

-:071c7186de7b
+:b6af52242a52
 [exBegin]
 |zip bytes|
 zip := ZipArchive oldFileNamed:'foo.zip'.
 bytes := zip extract:'bar'.
-zip closeFile.
+zip close.
 [exEnd]
 [exBegin]
 |zip bytes|
 zip := ZipArchive oldFileNamed:'source/stx/libbasic2.zip'.
 zip entries do:[:entry |
 Transcript showCR:entry
 ].
-zip closeFile.
+zip close.
 [exEnd]
 [exBegin]
 |zip bytes|
 zip := ZipArchive oldFileNamed:'source/stx/libbasic2.zip'.
 bytes := zip extract:'TwoByteStr.st'.
-zip closeFile.
+zip close.
 Transcript showCR:(bytes asString).
 [exEnd]
 compatibility write check with winzip (compressed with deflate)
 testDirectory := 'C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\'.
 testFileWr := 'crcTest_resume_compressed.zip'.
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 zipwr addFile:'crcTest_resume_compressed.txt' withContents: 'resume'.
-zipwr closeFile.
+zipwr close.
 [exEnd]
 compatibility read check with winzip (compressed with deflate)
 [exBegin]
 |ziprd testDirectory testFileRd contents|
 testFileRd := 'crcTest_resume_compressed.zip'.
 ziprd := ZipArchive oldFileNamed:(testDirectory, testFileRd).
 contents := ziprd extract: ziprd entries first.
 contents inspect.
-ziprd closeFile.
+ziprd close.
 [exEnd]
 compatibility write check with winzip (uncompressed)
 [exBegin]
 |zipwr testDirectory testFileWr|
 testDirectory := 'C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\'.
 testFileWr := 'crcTest_resume_uncompressed.zip'.
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 zipwr addFile:'crcTest_resume_uncompressed.txt'
 withContents:'resume'
 compressMethod:0
 asDirectory:false.
-zipwr closeFile.
+zipwr close.
 [exEnd]
 compatibility read check with winzip (uncompressed)
 [exBegin]
 |ziprd testDirectory testFileRd contents|
 testFileRd := 'crcTest_resume_uncompressed.zip'.
 ziprd := ZipArchive oldFileNamed:(testDirectory, testFileRd).
 contents := ziprd extract: ziprd entries first.
 contents inspect.
-ziprd closeFile.
+ziprd close.
 [exEnd]
 read an archive with files and/or directories, fetch the entries
 and create a new archive with the same content
 [exBegin]
 |ziprd zipwr entryDict testDirectory testFileRd testFileWr|
 testDirectory := 'C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\'.
 ziprd := ZipArchive oldFileNamed:(testDirectory, testFileRd).
 entryDict := Dictionary new.
 ziprd entries do: [:aFileName|
 entryDict at:aFileName put:(ziprd extract: aFileName) asString.
 ].
-ziprd closeFile.
+ziprd close.
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 entryDict keysAndValuesDo: [:key :value|
 (value size == 0) ifTrue: [
 zipwr addDirectory:key.
 ] ifFalse: [
 zipwr addFile:key withContents:value
 ].
 ].
-zipwr closeFile.
+zipwr close.
 [exEnd]
 [exBegin]
 |zipwr ziprd testDirectory testFileWr testFileRd zs|
 result inspect.
 rs close.
 ziprd close.
 [exEnd]
 read an archive with files and/or directories and/or zipArchives,
 fetch the entries (also from the include zip archives)
 and create a new archive
 [exBegin]
 |ziprd zipwr entryDict testDirectory testFileRd testFileWr zipRdSub1 zipRdSub2|
 testDirectory := 'C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\'.
 self halt.
 ] ifFalse: [
 entryDict at:aFileName2 put:(zipRdSub2 extract: aFileName2) asString.
 ].
 ].
-zipRdSub2 closeFile.
+zipRdSub2 close.
 ] ifFalse: [
 entryDict at:aFileName1 put:(zipRdSub1 extract: aFileName1) asString.
 ].
 ].
-zipRdSub1 closeFile.
+zipRdSub1 close.
 ] ifFalse: [
 entryDict at:aFileName put:(ziprd extract: aFileName) asString.
 ].
 ].
-ziprd closeFile.
+ziprd close.
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 entryDict keysAndValuesDo: [:key :value|
 (value size == 0) ifTrue: [
 zipwr addDirectory:key.
 ] ifFalse: [
 zipwr addFile:key withContents:value
 ].
 ].
-zipwr closeFile.
+zipwr close.
 [exEnd]
 "
 !
 rdFileStream := ('C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\', rdStreamFile) asFilename readStream.
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 zipwr addFile:'crcTest_resume_compressed.txt' withContents: 'resume'.
 zipwr addFile:rdStreamFile fromStream: rdFileStream.
-zipwr closeFile.
+zipwr close.
 [exEnd]
 read from zip archive a entry into memory using selector
 extract:'crcTest_resume_compressed.txt'
 and store an uncompressed archive entry to disk using a writeStream
 wrFileStream := ('C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\', wrStreamFile) asFilename writeStream.
 (ziprd extract:'projects.zip' intoStream: wrFileStream) ifFalse: [
 self halt.
 ].
-ziprd closeFile.
+ziprd close.
 wrFileStream close.
 [exEnd]
 add (compressed) to new zip archive a real file contents from disk e.g. a pdf
 identified by a readStream
 using selector
 addFile:  fromStream:  compressMethod:
 [exBegin]
 |zipwr testDirectory testFileWr rdStreamFile rdFileStream|
 testDirectory := 'C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\'.
 testFileWr := 'streamtest_compressed.zip'.
 rdFileStream := ('C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\', rdStreamFile) asFilename readStream.
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 zipwr addFileCompressed:rdStreamFile fromStream: rdFileStream.
-zipwr closeFile.
+zipwr close.
 [exEnd]
 read from zip archive a compressed entry e.g. a pdf and store the contents
 to disk using a readStream
 using selector
 readStreamFor: rdStreamFile
 [exBegin]
 |ziprd testDirectory testFileRd wrStreamFile wrFileStream|
 testDirectory := 'C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\'.
 testFileRd := 'streamtest_compressed.zip'.
 wrFileStream := ('C:\Dokumente und Einstellungen\stefan\Eigene Dateien\tmp\', wrStreamFile) asFilename writeStream.
 (ziprd extract:'test.pdf' intoStream: wrFileStream) ifFalse: [
 self halt.
 ].
-ziprd closeFile.
+ziprd close.
 wrFileStream close.
 [exEnd]
 "
 !
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 zipwr addArchiveDirectory: 'attachments' fromOsDirectory: (testDirectory,zipDirectory).
-zipwr closeFile.
+zipwr close.
 [exEnd]
 read from zip archive all entries which are stored in an archive directory (uncompressed)
 and store all those entries in a directory on the file system
 restoreOsDirectory:  fromArchiveDirectory:
 testFileRd := 'zipDirectoryTest.zip'.
 zipDirectory := 'xxx'.
 ziprd := ZipArchive oldFileNamed:(testDirectory, testFileRd).
 ziprd restoreOsDirectory: (testDirectory,zipDirectory) fromArchiveDirectory: 'attachments'.
-ziprd closeFile.
+ziprd close.
 [exEnd]
 add to new zip archive recursive the contents of a directory (compressed)
 addArchiveDirectoryCompressed:  fromOsDirectory:
 zipwr := ZipArchive newFileNamed:(testDirectory, testFileWr).
 zipwr addArchiveDirectoryCompressed: 'attachments' fromOsDirectory: (testDirectory,zipDirectory).
-zipwr closeFile.
+zipwr close.
 [exEnd]
 read from zip archive all entries which are stored in an archive directory (compressed)
 and store all those entries in a directory on the file system
 restoreOsDirectory:  fromArchiveDirectory:
 testFileRd := 'zipDirectoryTestCompressed.zip'.
 zipDirectory := 'xxx-compressed'.
 ziprd := ZipArchive oldFileNamed:(testDirectory, testFileRd).
 ziprd restoreOsDirectory: (testDirectory,zipDirectory) fromArchiveDirectory: 'attachments'.
-ziprd closeFile.
+ziprd close.
 [exEnd]
 "
 !

changeset 4373	b6af52242a52
parent 4372	071c7186de7b
child 4374	57cd89038719