[squeak-dev] The Trunk: Compression-ul.28.mcz

commits at source.squeak.org commits at source.squeak.org
Sat Jun 18 08:49:02 UTC 2011


Levente Uzonyi uploaded a new version of Compression to project The Trunk:
http://source.squeak.org/trunk/Compression-ul.28.mcz

==================== Summary ====================

Name: Compression-ul.28
Author: ul
Time: 17 June 2011, 4:31:39.289 pm
UUID: 3403bc37-42ca-9e4f-800d-d3f5fdd78e87
Ancestors: Compression-laza.27

- Use #displayProgressFrom:to:during: instead of #displayProgressAt:from:to:during:.

=============== Diff against Compression-laza.27 ===============

Item was changed:
  ----- Method: GZipReadStream class>>saveContents: (in category 'fileIn/Out') -----
  saveContents: fullFileName
  	"Save the contents of a gzipped file"
  	| zipped buffer unzipped newName |
  	newName := fullFileName copyUpToLast: FileDirectory extensionDelimiter.
  	unzipped := FileStream newFileNamed: newName.
  	unzipped binary.
  	zipped := GZipReadStream on: (FileStream readOnlyFileNamed: fullFileName).
  	buffer := ByteArray new: 50000.
  	'Extracting ' , fullFileName
+ 		displayProgressFrom: 0
- 		displayProgressAt: Sensor cursorPoint
- 		from: 0
  		to: zipped sourceStream size
  		during: 
  			[:bar | 
  			[zipped atEnd]
  				whileFalse: 
  					[bar value: zipped sourceStream position.
  					unzipped nextPutAll: (zipped nextInto: buffer)].
  			zipped close.
  			unzipped close].
  	^ newName!

Item was changed:
  ----- Method: StandardFileStream>>compressFile (in category '*Compression') -----
  compressFile
  	"Write a new file that has the data in me compressed in GZip format."
  	| zipped buffer |
  
  	self readOnly; binary.
  	zipped := self directory newFileNamed: (self name, FileDirectory dot, 'gz').
  	zipped binary; setFileTypeToObject.
  		"Type and Creator not to be text, so can be enclosed in an email"
  	zipped := GZipWriteStream on: zipped.
  	buffer := ByteArray new: 50000.
+ 	'Compressing ', self fullName 
+ 		displayProgressFrom: 0 to: self size
- 	'Compressing ', self fullName displayProgressAt: Sensor cursorPoint
- 		from: 0 to: self size
  		during: [:bar |
  			[self atEnd] whileFalse: [
  				bar value: self position.
  				zipped nextPutAll: (self nextInto: buffer)].
  			zipped close.
  			self close].
  	^zipped!

Item was changed:
  ----- Method: ZipWriteStream class>>compressAndDecompress:using:stats: (in category 'regression test') -----
  compressAndDecompress: aFile using: tempName stats: stats
  	| fileSize tempFile result |
  	aFile == nil ifTrue:[^nil].
  	fileSize := aFile size.
  	(fileSize < 1"00000" "or:[fileSize > 1000000]") ifTrue:[aFile close. ^nil].
  	Transcript cr; show:'Testing ', aFile name,' ... '.
  	tempFile := StandardFileStream new open: tempName forWrite: true.
+ 	'Compressing ', aFile name,'...' 
+ 		displayProgressFrom: 1 to: aFile size during:[:bar|
- 	'Compressing ', aFile name,'...' displayProgressAt: Sensor cursorPoint
- 		from: 1 to: aFile size during:[:bar|
  			result := self regressionCompress: aFile into: tempFile notifiying: bar stats: stats].
  	result ifTrue:[
+ 		'Validating ', aFile name,'...'
+ 			displayProgressFrom: 0 to: aFile size during:[:bar|
- 		'Validating ', aFile name,'...' displayProgressAt: Sensor cursorPoint
- 			from: 0 to: aFile size during:[:bar|
  				result := self regressionDecompress: aFile from: tempFile notifying: bar stats: stats]].
  	aFile close.
  	tempFile close.
  	FileDirectory default deleteFileNamed: tempName ifAbsent:[].
  	result ~~ false ifTrue:[
  		Transcript show:' ok (', (result * 100 truncateTo: 0.01) printString,')'].
  	^result!




More information about the Squeak-dev mailing list