hg/stx-libbasic2: comparison Archiver.st

equal deleted inserted replaced

-:61d8f450a232
+:f655110a107f
 "
 COPYRIGHT (c) 2003 by eXept Software AG
-	      All Rights Reserved
+All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 "{ Package: 'stx:libbasic2' }"
 Object subclass:#Archiver
 	instanceVariableNames:'process temporaryDirectory fileName outStream errorStream
 		synchron'
-	classVariableNames:''
+	classVariableNames:'MimeTypeMapping'
 	poolDictionaries:''
 	category:'System-Support-FileFormats'
 !
 Archiver subclass:#MultiFileArchive
 !Archiver class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 2003 by eXept Software AG
-	      All Rights Reserved
+All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 ! !
+!Archiver class methodsFor:'initialization'!
+initialize
+MimeTypeMapping := Dictionary withKeysAndValues:
+#(
+'application/x-tar-compressed'         CompressedTarArchive     "abstract - special handling"
+'application/x-tar-gzip-compressed'    TarGZipArchive
+'application/x-tar-bzip2-compressed'   TarBZ2Archive
+'application/x-tar'                    TarArchive
+'application/x-gzip-compressed'        GZipCompressed
+'application/x-zip-compressed'         ZipArchive
+'application/x-bzip2-compressed'       BZ2Compressed
+'application/x-squeak-archive'         ZipArchive
+'application/java-archive'             ZipArchive
+'application/x-ar-archive'             ArArchive
+'application/x-ar-library'             ArArchive
+'application/library'                  ArArchive
+"/       'application/x-rpm'                    RPMArchive
+"/       'application/x-rpm-archive'            RPMArchive
+"/       'application/x-redhat packet manager'  RPMArchive
+).
+! !
 !Archiver class methodsFor:'instance creation'!
-classForMimeType:aMimeType
-^ self classForMimeType:aMimeType fileName:nil
-"
-self classForMimeType:'application/x-tar'
-self classForMimeType:'application/x-foo'
-self classForMimeType:'application/x-squeak-archive'
-self classForMimeType:'application/java-archive'
-'foo.sar' asFilename mimeTypeFromName
-'foo.jar' asFilename mimeTypeFromName
-'foo.a' asFilename mimeTypeFromName
-"
-!
 classForMimeType:aMimeType fileName:aFileNameOrNil
 |className|
-aMimeType isNil ifTrue:[^ nil].
+className := MimeTypeMapping at:aMimeType ifAbsent:[^ nil].
-className := (
+className = #CompressedTarArchive ifTrue:[
-	    #(
+(aFileNameOrNil notNil and:[aFileNameOrNil suffix = 'bz2']) ifTrue:[
-		('application/x-tar-compressed'         CompressedTarArchive    )  "/ abstract - see below
+className := #TarBZ2Archive
-		('application/x-tar-gzip-compressed'    TarGZipArchive      )
+] ifFalse:[
-		('application/x-tar-bzip2-compressed'   TarBZ2Archive       )
+"this is the default"
-		('application/x-tar'                    TarArchive          )
+className := #TarGZipArchive
-		('application/x-gzip-compressed'        GZipCompressed      )
+]
-		('application/x-zip-compressed'         ZipArchive          )
-		('application/x-bzip2-compressed'       BZ2Compressed       )
-		('application/x-squeak-archive'         ZipArchive          )
-		('application/java-archive'             ZipArchive          )
-		('application/x-ar-archive'             ArArchive           )
-		('application/x-ar-library'             ArArchive           )
-		('application/library'                  ArArchive           )
-"/                ('application/x-rpm'                    RPMArchive          )
-"/                ('application/x-rpm-archive'            RPMArchive          )
-"/                ('application/x-redhat packet manager'  RPMArchive          )
-	    ) detect:[:entry | entry first = aMimeType] ifNone:#(nil nil)
-	) last.
-className isNil ifTrue:[^ nil].
-className = CompressedTarArchive ifTrue:[
-	aFileNameOrNil isNil ifTrue:[
-	    className := #TarGZipArchive
-	] ifFalse:[
-	    aFileNameOrNil suffix = 'bz2' ifTrue:[
-		className := #TarBZ2Archive
-	    ] ifFalse:[
-		className := #TarGZipArchive
-	    ]
-	].
 ].
 ^ self privateClassesAt:className.
 "
-self classForMimeType:'application/x-tar'
+self classForMimeType:nil fileName:nil
-self classForMimeType:'application/x-foo'
+self classForMimeType:'application/x-tar-compressed' fileName:nil
-self classForMimeType:'application/x-squeak-archive'
+self classForMimeType:'application/x-tar' fileName:nil
-self classForMimeType:'application/java-archive'
+self classForMimeType:'application/x-foo' fileName:nil
-'foo.sar' asFilename mimeTypeFromName
+self classForMimeType:'application/x-squeak-archive' fileName:nil
-'foo.jar' asFilename mimeTypeFromName
+self classForMimeType:'application/java-archive' fileName:nil
-'foo.a' asFilename mimeTypeFromName
+'foo.sar' asFilename mimeTypeFromName
+'foo.jar' asFilename mimeTypeFromName
+'foo.a' asFilename mimeTypeFromName
 "
 !
 newFor:aFilename
-|fn mimeType archiverClass|
+|fn archiverClass|
 fn := aFilename asFilename.
-mimeType := fn mimeTypeFromName.
+archiverClass := self classForMimeType:fn mimeTypeFromName fileName:fn.
-archiverClass := self classForMimeType:mimeType fileName:fn.
 archiverClass isNil ifTrue:[^ nil].
-^ archiverClass with:aFilename
+^ archiverClass with:fn
 !
 with:aFilename
+^ self new fileName:aFilename.
-| instance |
-instance := self new.
-instance fileName:aFilename.
-^ instance
 ! !
 !Archiver class methodsFor:'classAccess'!
 arArchive
 stringWithQuotedFileBaseNames:aColOfFiles
 aColOfFiles isNil ifTrue:[^ ''].
 ^ String
-	streamContents:[:str |
+streamContents:[:str |
-	    aColOfFiles do:[:fn |
+aColOfFiles do:[:fn |
-		str nextPutAll:' "'.
+str nextPutAll:' "'.
-		str nextPutAll:(fn asFilename baseName).
+str nextPutAll:(fn asFilename baseName).
-		str nextPutAll:'"'.
+str nextPutAll:'"'.
-	    ].
+].
-	]
+]
 ! !
 !Archiver class methodsFor:'commandOutputReader'!
 commandOutputParser
 temporaryDirectory
 "return the value of the instance variable 'temporaryDirectory' (automatically generated)"
 temporaryDirectory isNil ifTrue:[
-	temporaryDirectory := Filename newTemporary.
+temporaryDirectory := Filename newTemporary.
-	temporaryDirectory makeDirectory.
+temporaryDirectory makeDirectory.
 ].
 ^ temporaryDirectory
 ! !
 !Archiver methodsFor:'actions'!
 |cmd dir|
 self fileName isNil ifTrue:[ ^ self].
 dir := self fileName directory.
 cmd := self getCommandToListFiles:aColOfFiles.
 self executeCommand:cmd directory:dir
 !
 removeFilesFromArchive:aColOfFiles
 self subclassResponsibility.
 removeTemporaryDirectory
 | tmp |
 temporaryDirectory notNil ifTrue:[
-	tmp := self temporaryDirectory.
+tmp := self temporaryDirectory.
-	(FileDirectory directoryNamed:(tmp directory)) removeDirectory:tmp baseName.
+(FileDirectory directoryNamed:(tmp directory)) removeDirectory:tmp baseName.
-	temporaryDirectory := nil.
+temporaryDirectory := nil.
 ].
 !
 stopProcess
 process notNil ifTrue:[
-	process terminateWithAllSubprocesses.
+process terminateWithAllSubprocesses.
-	process waitUntilTerminated.
+process waitUntilTerminated.
 ].
 ! !
 !Archiver methodsFor:'command execution'!
 executeCommand:cmd directory:aDirectory
 synchron isNil ifTrue:[synchron := true].
 synchron ifTrue:[
-	 OperatingSystem
+OperatingSystem
-	    executeCommand:cmd
+executeCommand:cmd
-	    inputFrom:nil
+inputFrom:nil
-	    outputTo:outStream
+outputTo:outStream
-	    errorTo:errorStream
+errorTo:errorStream
-	    inDirectory:aDirectory
+inDirectory:aDirectory
-	    lineWise:true
+lineWise:true
-	    onError:[:status| false].
+onError:[:status| false].
 ] ifFalse:[
-	process := Process for:[
+process := Process for:[
-		[
+[
-		     OperatingSystem
+OperatingSystem
-			executeCommand:cmd
+executeCommand:cmd
-			inputFrom:nil
+inputFrom:nil
-			outputTo:outStream
+outputTo:outStream
-			errorTo:errorStream
+errorTo:errorStream
-			inDirectory:aDirectory
+inDirectory:aDirectory
-			lineWise:true
+lineWise:true
-			onError:[:status| false].
+onError:[:status| false].
-		] ensure:[
+] ensure:[
-		    process := nil.
+process := nil.
-		].
+].
-	] priority:(Processor systemBackgroundPriority).
+] priority:(Processor systemBackgroundPriority).
-	process name:('Archiver command: ', cmd).
+process name:('Archiver command: ', cmd).
-	process resume.
+process resume.
 ]
 !
 isValidOutputLine:line
 "return true, if line contains a valid list-files output line"
 !Archiver methodsFor:'command strings'!
 addDoubleQuotedFilenames:collectionOfFilenames toStream:aStream
 collectionOfFilenames notNil ifTrue:[
-	collectionOfFilenames do:[:el |
+collectionOfFilenames do:[:el |
-	    aStream nextPutAll:' "'.
+aStream nextPutAll:' "'.
-	    aStream nextPutAll:(el asString).
+aStream nextPutAll:(el asString).
-	    aStream nextPutAll:'"'
+aStream nextPutAll:'"'
-	].
+].
 ].
 ! !
 !Archiver methodsFor:'initialization & release'!
 "/ copy archiv to tempDir
 archivFile copyTo:archivInTemp.
 "/ keep a save copy
 archivFile renameTo:(archivFile withSuffix:'sav').
 [
-	"/ copy files to be added to tempDir
+"/ copy files to be added to tempDir
-	colOfFiles do:[:file |
+colOfFiles do:[:file |
-	    file recursiveCopyTo:(tempDir construct:(file asFilename baseName))
+file recursiveCopyTo:(tempDir construct:(file asFilename baseName))
-	].
+].
-	"/ addFiles to the tar archive
+"/ addFiles to the tar archive
-	cmd := self getCommandToAdd:colOfFiles toArchive:archivInTemp.
+cmd := self getCommandToAdd:colOfFiles toArchive:archivInTemp.
-	self executeCommand:cmd directory:tempDir.
+self executeCommand:cmd directory:tempDir.
-	"/ copy tar archiv back
+"/ copy tar archiv back
-	archivInTemp copyTo:archivFile.
+archivInTemp copyTo:archivFile.
 ] ensure:[
-	"/ cg: remove the tempFile
+"/ cg: remove the tempFile
-	archivInTemp remove.
+archivInTemp remove.
-	"/ cg: remove copied files
+"/ cg: remove copied files
-	colOfFiles do:[:file |
+colOfFiles do:[:file |
-	    (tempDir construct:(file asFilename baseName)) remove.
+(tempDir construct:(file asFilename baseName)) remove.
-	].
+].
 ].
 !
 extractFiles:aColOfFilesOrNil to:aDirectory
 |execDir cmd|
 execDir := self fileName directory.
 tempDir := self temporaryDirectory.
 self extractFiles:aColOfFiles to:tempDir.
 aColOfFiles do:[ : aFileString |
-	tempFile := self temporaryDirectory construct:aFileString.
+tempFile := self temporaryDirectory construct:aFileString.
-	targetFile := aDirectory construct:(aFileString asFilename baseName).
+targetFile := aDirectory construct:(aFileString asFilename baseName).
-	targetFile exists ifTrue:[
+targetFile exists ifTrue:[
-	    targetFile recursiveRemove.
+targetFile recursiveRemove.
-	].
+].
-	tempFile exists ifTrue:[
+tempFile exists ifTrue:[
-	    tempFile recursiveCopyTo:targetFile.
+tempFile recursiveCopyTo:targetFile.
-	].
+].
 ].
 !
 removeFilesFromArchive:aColOfFiles
 |cmd|
 cmd := self getCommandToRemoveFiles:aColOfFiles.
 self executeCommand:cmd directory:(self fileName directory).
 ! !
 !Archiver::MultiFileArchive methodsFor:'command strings'!
 getCommandToAdd:colOfFiles toArchive:archivIn
 parseLine:line forItemClass:itemClass
 |words archiverColumns item index key|
 (firstLineRead not and:[archiver class hasTitleLine]) ifTrue:[
-	firstLineRead := true.
+firstLineRead := true.
-	^ nil.
+^ nil.
 ].
 (archiver isValidOutputLine:line) ifFalse:[
-	^ nil.
+^ nil.
 ].
 words := line asCollectionOfWords.
 archiverColumns := archiver columns.
 item := itemClass new.
 index := 1.
 archiverColumns do:[:colDescr |
-	| itemWordCount itemStream itemFieldSelector itemWriter |
+| itemWordCount itemStream itemFieldSelector itemWriter |
-	itemWordCount := colDescr second.
+itemWordCount := colDescr second.
-	itemFieldSelector := colDescr first.
+itemFieldSelector := colDescr first.
-	itemFieldSelector notNil ifTrue:[
+itemFieldSelector notNil ifTrue:[
-	    itemWriter := (itemFieldSelector , ':') asSymbol.
+itemWriter := (itemFieldSelector , ':') asSymbol.
-	].
+].
-	itemStream := WriteStream on:''.
+itemStream := WriteStream on:''.
-	itemWordCount == #rest ifTrue:[
+itemWordCount == #rest ifTrue:[
-	    words from:index do:[:w|
+words from:index do:[:w|
-		itemStream nextPutAll:w.
+itemStream nextPutAll:w.
-		itemStream space.
+itemStream space.
-	    ].
+].
-	] ifFalse:[
+] ifFalse:[
-	    words from:index to:(index + itemWordCount - 1) do:[:w|
+words from:index to:(index + itemWordCount - 1) do:[:w|
-		itemStream nextPutAll:w.
+itemStream nextPutAll:w.
-		itemStream space.
+itemStream space.
-	    ].
+].
-	    index := index + itemWordCount.
+index := index + itemWordCount.
-	].
+].
-	itemWriter notNil ifTrue:[
+itemWriter notNil ifTrue:[
-	    item perform:itemWriter with:(itemStream contents withoutSeparators).
+item perform:itemWriter with:(itemStream contents withoutSeparators).
-	].
+].
-	itemStream close.
+itemStream close.
 ].
 ((archiverColumns collect:[:el| el first]) includes:#permissions) ifTrue:[
-	(item permissions startsWith:$d) ifTrue:[
+(item permissions startsWith:$d) ifTrue:[
-	    key := #directory.
+key := #directory.
-	    item isDirectory:true.
+item isDirectory:true.
-	] ifFalse:[
+] ifFalse:[
-	    key := MIMETypes mimeTypeForFilename:(item fileName asFilename baseName).
+key := MIMETypes mimeTypeForFilename:(item fileName asFilename baseName).
-	    item isDirectory:false.
+item isDirectory:false.
-	].
+].
 ] ifFalse:[
-	key := MIMETypes mimeTypeForFilename:(item fileName asFilename baseName).
+key := MIMETypes mimeTypeForFilename:(item fileName asFilename baseName).
 ].
 item icon:(FileBrowser iconForKeyMatching:key).
 ^ item
 ! !
 compressFile:aFile to:newFile
 | cmd directory|
 directory := newFile directory.
 (directory exists) ifFalse:[
-	DialogBox warn:'cannot compress to non-existing directory ', directory asString.
+DialogBox warn:'cannot compress to non-existing directory ', directory asString.
 ].
 (directory isDirectory) ifFalse:[
-	DialogBox warn:'cannot compress to non-directory ', directory asString.
+DialogBox warn:'cannot compress to non-directory ', directory asString.
 ].
 cmd := self getCommandToCompress:aFile asNew:newFile.
 self executeCommand:cmd directory:directory.
 newFile exists ifTrue:[
-	self fileName:newFile.
+self fileName:newFile.
 ].
 !
 extractFiles:aColOfFilesOrNil to:aDirectory
 self uncompressTo:aDirectory
 uncompressTo:aDirectory
 | cmd file newFile|
 (aDirectory exists) ifFalse:[
-	DialogBox warn:'cannot uncompress to non-existing directory ', aDirectory asString.
+DialogBox warn:'cannot uncompress to non-existing directory ', aDirectory asString.
-	^ self
+^ self
 ].
 (aDirectory isDirectory) ifFalse:[
-	DialogBox warn:'cannot uncompress to file ', aDirectory asString.
+DialogBox warn:'cannot uncompress to file ', aDirectory asString.
-	^ self
+^ self
 ].
 file := newFile := self fileName.
 (file directory pathName = aDirectory pathName) ifFalse:[
-	newFile := aDirectory construct:(file baseName).
+newFile := aDirectory construct:(file baseName).
-	file copyTo:newFile.
+file copyTo:newFile.
 ].
 cmd := self getCommandToUncompress:newFile.
 self executeCommand:cmd directory:aDirectory.
 ! !
 !Archiver::CompressedFile methodsFor:'columns'!
 columns
 ! !
 !Archiver::CompressedFile methodsFor:'command strings'!
 getCommandToCompress:aFile asNew:newFile
 ^ '%1 -c %2 > %3'
-	bindWith:self class compressCommand
+bindWith:self class compressCommand
-	with:aFile asString
+with:aFile asString
-	with:newFile asString
+with:newFile asString
 !
 getCommandToListFiles:dummyArg
 ^ 'gzip -l "' , self fileName baseName , '"'
 !
 getCommandToUncompress:aFileName
 ^ '%1 %2'
-	bindWith:self class uncompressCommand
+bindWith:self class uncompressCommand
-	with:aFileName baseName
+with:aFileName baseName
 ! !
 !Archiver::BZ2Compressed class methodsFor:'command strings'!
 compressCommand
 ! !
 !Archiver::BZ2Compressed methodsFor:'columns'!
 columns
 ^ #(
-	 #(#fileName        1)
+#(#fileName        1)
 )
 !
 isValidOutputLine:line
 ^ true
 ! !
 compressor uncompressTo:tempDir.
 suffix := self fileName suffix.
 file := self fileName withoutSuffix.
 tarFilename := file baseName.
 file suffix ~= 'tar' ifTrue:[
-	tarFilename := tarFilename , '.tar'
+tarFilename := tarFilename , '.tar'
 ].
 tarFile := self temporaryDirectory construct:tarFilename.
 tarArchiver := Archiver::TarArchive with:tarFile.
 ! !
 columns
 "/ columns in stream order
 "/  colums id/readSelector          words to read
 ^ #( "/ #(#method          1)
-	 "/ #(#crc             1)
+"/ #(#crc             1)
-	 "/ #(#dateAndTime     3)
+"/ #(#dateAndTime     3)
-	 #(#compressSize    1)
+#(#compressSize    1)
-	 #(#size            1)
+#(#size            1)
-	 #(#ratio           1)
+#(#ratio           1)
-	 #(#fileName        #rest)
+#(#fileName        #rest)
 )
 !
 isValidOutputLine:line
 ^ line endsWith:self fileName withoutSuffix baseName.
 ! !
 !Archiver::ArArchive methodsFor:'columns'!
 columns
 "/  colums id/readSelector words to read
 ^ #(
-	 #(#permissions     1)
+#(#permissions     1)
-	 #(#ownerGroup      1)
+#(#ownerGroup      1)
-	 #(#size            1)
+#(#size            1)
-	 #(#monthName       1)
+#(#monthName       1)
-	 #(#dayString       1)
+#(#dayString       1)
-	 #(#timeString      1)
+#(#timeString      1)
-	 #(#yearString      1)
+#(#yearString      1)
-	 #(#fileName        #rest)
+#(#fileName        #rest)
 )
 !
 isValidOutputLine:line
 ('[-r][-w][-x]' match:(line copyTo:3)) ifTrue:[^ true].
 ^ false.
 ! !
 !Archiver::ArArchive methodsFor:'command strings'!
 getCommandToExtractFiles:sel intoDirectory:dir
 |stream|
 stream := WriteStream on:''.
 "/ 'x'  arArchivUnpackOption
 stream nextPutAll:('(cd %3 ; %1 x "%2" '
-		    bindWith:self class arCommand
+bindWith:self class arCommand
-		    with:self fileName asString string
+with:self fileName asString string
-		    with:dir asString string).
+with:dir asString string).
 sel notNil ifTrue:[
-	sel do:[:el |
+sel do:[:el |
-	    stream nextPutAll:' "'.
+stream nextPutAll:' "'.
-	    stream nextPutAll:(el asString).
+stream nextPutAll:(el asString).
-	    stream nextPutAll:'"'
+stream nextPutAll:'"'
-	].
+].
 ].
 stream nextPutAll:')'.
 ^ stream contents.
 !
 getCommandToListFiles:aColOfFiles
 |stream|
 stream := WriteStream on:''.
 "/ 't'  arArchivListContentsOption
 "/ 'v'  arArchivVerboseOption
 stream nextPutAll:('%1 tv "%2"'
-		    bindWith:self class arCommand
+bindWith:self class arCommand
-		    with:self fileName baseName).
+with:self fileName baseName).
 stream nextPutAll:(self class stringWithQuotedFileBaseNames:aColOfFiles).
 ^ stream contents.
 ! !
 !Archiver::TarArchive methodsFor:'columns'!
 columns
 "/  colums id/readSelector words to read
 ^ #( #(#permissions     1)
-	 #(#ownerGroup      1)
+#(#ownerGroup      1)
-	 #(#size            1)
+#(#size            1)
-	 #(#dateAndTime     2)
+#(#dateAndTime     2)
-	 #(#fileName        #rest)
+#(#fileName        #rest)
 )
 !
 isValidOutputLine:line
 ('[-d][-r][-w][-x]' match:(line copyTo:4)) ifTrue:[^ true].
 ^ false.
 stream := WriteStream on:''.
 "/ 'r'  TarArchivAddOption
 "/ 'f'  TarArchivFileOption
 stream nextPutAll:('%1 rf "%2"'
-		    bindWith:self class tarCommand
+bindWith:self class tarCommand
-		    with:archiveFile asString string).
+with:archiveFile asString string).
 stream nextPutAll:(self class stringWithQuotedFileBaseNames:aColOfFiles).
 ^ stream contents
 !
 getCommandToExtractFiles:sel intoDirectory:dir
 |stream|
 stream := WriteStream on:''.
 "/ 'x'  TarArchivUnpackOption
 "/ 'f'  TarArchivFileOption
 "/ 'C'  TarArchivUnpackInDirectoryOption
 stream nextPutAll:('%1 -xf "%2" -C %3'
-		    bindWith:self class tarCommand
+bindWith:self class tarCommand
-		    with:self fileName asString string
+with:self fileName asString string
-		    with:dir asString).
+with:dir asString).
 sel notNil ifTrue:[
-	sel do:[:el |
+sel do:[:el |
-	    stream nextPutAll:' "'.
+stream nextPutAll:' "'.
-	    stream nextPutAll:(el asString).
+stream nextPutAll:(el asString).
-	    stream nextPutAll:'"'
+stream nextPutAll:'"'
-	].
+].
 ].
 ^ stream contents.
 !
 getCommandToListFiles:aColOfFiles
 |stream|
 stream := WriteStream on:''.
 "/ 't'  TarArchivListContentsOption
 "/ 'v'  TarArchivVerboseOption
 "/ 'f'  TarArchivFileOption
 stream nextPutAll:('%1 -tvf "%2"'
-		    bindWith:self class tarCommand
+bindWith:self class tarCommand
-		    with:self fileName baseName).
+with:self fileName baseName).
 stream nextPutAll:(self class stringWithQuotedFileBaseNames:aColOfFiles).
 ^ stream contents.
 !
 getCommandToRemoveFiles:sel
 |stream filename|
 filename := self fileName.
 filename exists ifFalse:[^ nil].
 stream := WriteStream on:''.
 "/ 'f'  TarArchivFileOption
 stream nextPutAll:('%1 --delete -f "%2"'
-		    bindWith:self class tarCommand
+bindWith:self class tarCommand
-		    with:self fileName baseName).
+with:self fileName baseName).
 stream nextPutAll:(self class stringWithQuotedFileBaseNames:sel).
 ^ stream contents
 ! !
 !Archiver::ZipArchive methodsFor:'columns'!
 columns
 "/  colums id/readSelector    words to read
 ^ #( (#permissions     1)
-	 (#version         2)
+(#version         2)
-	 (#size            1)
+(#size            1)
-	 (#type            1)
+(#type            1)
-	 (#ratio           1)
+(#ratio           1)
-	 (nil              1)
+(nil              1)
-	 (#dateAndTime     2)
+(#dateAndTime     2)
-	 (#fileName        #rest)
+(#fileName        #rest)
 )
 !
 isValidOutputLine:line
 ('[-d][-r][-w][-x]' match:(line copyTo:4)) ifTrue:[^ true].
 ^ false.
 |stream|
 archiveFile exists ifFalse:[^ nil].
 stream := WriteStream on:''.
 stream nextPutAll:('%1 -r "%2"'
-		    bindWith:self class zipCommand
+bindWith:self class zipCommand
-		    with:archiveFile asString string).
+with:archiveFile asString string).
 self
-	addDoubleQuotedFilenames:(aColOfFiles collect:[:each | each asFilename baseName])
+addDoubleQuotedFilenames:(aColOfFiles collect:[:each | each asFilename baseName])
-	toStream:stream.
+toStream:stream.
 ^ stream contents
 !
 getCommandToExtractFiles:aColOfFiles intoDirectory:dir
 stream := WriteStream on:''.
 "/ -o   UnzipOverwriteExistingFilesOption
 "/ -d   UnzipExtDirectoryOption
 stream nextPutAll:('%1 -o -d "%2" "%3"'
-		    bindWith:self class unzipCommand
+bindWith:self class unzipCommand
-		    with:dir asString string
+with:dir asString string
-		    with:self fileName asString).
+with:self fileName asString).
 self addDoubleQuotedFilenames:aColOfFiles toStream:stream.
 ^ stream contents.
 !
 getCommandToListFiles:aColOfFiles
 |stream|
 stream := WriteStream on:''.
 "/  -Z      ZipInfoOption
 "/  -h     ZipHeaderOption
 "/  -t      ZipTotalOption
 stream nextPutAll:('%1 -Z -m -h "%2"'
-			bindWith:self class unzipCommand
+bindWith:self class unzipCommand
-			with:self fileName asString string).
+with:self fileName asString string).
 aColOfFiles notNil ifTrue:[       self halt.
-	self
+self
-	    addDoubleQuotedFilenames:(aColOfFiles collect:[:each | each asFilename baseName])
+addDoubleQuotedFilenames:(aColOfFiles collect:[:each | each asFilename baseName])
-	    toStream:stream.
+toStream:stream.
 ].
 ^ stream contents.
 !
 getCommandToRemoveFiles:aColOfFiles
 |stream|
 stream := WriteStream on:''.
 stream nextPutAll:('%1 -d "%2"'
-			bindWith:self class zipCommand
+bindWith:self class zipCommand
-			with:self fileName asString string).
+with:self fileName asString string).
 self addDoubleQuotedFilenames:aColOfFiles toStream:stream.
 ^ stream contents.
 ! !
 !Archiver class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/Archiver.st,v 1.26 2006-02-01 11:05:09 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/Archiver.st,v 1.27 2006-02-01 12:27:39 stefan Exp $'
 ! !
+Archiver initialize!

changeset 1591	f655110a107f
parent 1590	61d8f450a232
child 1783	c7c8d7faccc0