CompressionStream.st
author Stefan Vogel <sv@exept.de>
Mon, 20 Feb 2017 10:41:32 +0100
changeset 4337 167d0c973942
parent 4311 55d6e8abb73b
child 4644 a55695d86845
permissions -rw-r--r--
#BUGFIX by stefan class: Promise changed: #initialize #value: #value:priority: Use EventSemaphore. Do not do double initialization.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     1
"
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     2
 COPYRIGHT (c) 2002 by eXept Software AG
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
     3
	      All Rights Reserved
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     4
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     5
 This software is furnished under a license and may be used
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     6
 only in accordance with the terms of that license and with the
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     8
 be provided or otherwise made available to, or used by, any
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
     9
 other person.  No title to or ownership of the software is
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    10
 hereby transferred.
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    11
"
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    12
"{ Package: 'stx:libbasic2' }"
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    13
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
    14
"{ NameSpace: Smalltalk }"
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
    15
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    16
Stream subclass:#CompressionStream
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
    17
	instanceVariableNames:'onStream hitEOF binary position readLimit mode inputBytes
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
    18
		outputBytes zstream suppressHeaderAndChecksum propagateClose'
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
    19
	classVariableNames:'BlockSize'
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
    20
	poolDictionaries:''
4258
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
    21
	category:'Streams-Compressed'
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    22
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    23
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    24
!CompressionStream class methodsFor:'documentation'!
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    25
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    26
copyright
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    27
"
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    28
 COPYRIGHT (c) 2002 by eXept Software AG
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
    29
	      All Rights Reserved
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    30
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    31
 This software is furnished under a license and may be used
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    32
 only in accordance with the terms of that license and with the
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    33
 inclusion of the above copyright notice.   This software may not
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    34
 be provided or otherwise made available to, or used by, any
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    35
 other person.  No title to or ownership of the software is
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    36
 hereby transferred.
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    37
"
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    38
!
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1208
diff changeset
    39
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    40
documentation
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    41
"
4258
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
    42
    Abstract superclass of streams that compress or decompress data
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    43
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    44
    [author:]
3182
9511845dede1 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 3099
diff changeset
    45
        Claus Atzkern
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    46
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    47
    [instance variables:]
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    48
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    49
    [class variables:]
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    50
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    51
    [see also:]
3182
9511845dede1 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 3099
diff changeset
    52
        ZipStream
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    53
"
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    54
! !
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
    55
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    56
!CompressionStream class methodsFor:'initialization'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    57
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    58
initialize
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    59
    BlockSize := 6.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    60
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    61
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    62
!CompressionStream class methodsFor:'instance creation'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    63
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    64
readOpenOn:aStream
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    65
    "open to read data from an compressed stream"
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
    66
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    67
    ^ self
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    68
        readOpenOn:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    69
        suppressHeaderAndChecksum:(self defaultSuppressHeaderAndChecksum)
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    70
!
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    71
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    72
readOpenOn:aStream suppressHeaderAndChecksum:aBoolean
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    73
    "open to read data from an compressed stream"
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    74
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    75
    ^ self basicNew
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    76
        openWithMode:#readonly
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    77
        on:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    78
        suppressHeaderAndChecksum:aBoolean
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    79
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    80
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
    81
writeOpenOn:aStream
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    82
    "open to write data compressed to stream"
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    83
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    84
    ^ self
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    85
        writeOpenOn:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    86
        suppressHeaderAndChecksum:(self defaultSuppressHeaderAndChecksum)
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    87
!
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    88
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    89
writeOpenOn:aStream suppressHeaderAndChecksum:aBoolean
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    90
    "open to write data compressed to stream"
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    91
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    92
    ^ self basicNew
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    93
        openWithMode:#writeonly
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    94
        on:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    95
        suppressHeaderAndChecksum:aBoolean
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    96
! !
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    97
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    98
!CompressionStream class methodsFor:'defaults'!
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
    99
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   100
defaultSuppressHeaderAndChecksum
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   101
    ^ true
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   102
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   103
4311
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   104
!CompressionStream class methodsFor:'queries'!
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   105
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   106
isAbstract
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   107
    "Return if this class is an abstract class.
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   108
     True is returned here for myself only; false for subclasses.
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   109
     Abstract subclasses must redefine this again."
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   110
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   111
    ^ self == CompressionStream.
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   112
! !
55d6e8abb73b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4265
diff changeset
   113
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   114
!CompressionStream methodsFor:'accessing'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   115
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   116
binary
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   117
    "switch to binary mode - default is text
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   118
    "
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   119
    binary := true.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   120
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   121
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   122
propagateClose
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   123
    ^ propagateClose
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   124
!
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   125
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   126
propagateClose:aBoolean
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   127
    "close the underlying stream if the zip stream is closed"
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   128
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   129
    propagateClose := aBoolean.
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   130
!
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   131
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   132
text
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   133
    "switch to text mode - default is text"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   134
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   135
    binary := false.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   136
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   137
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   138
!CompressionStream methodsFor:'error handling'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   139
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   140
errorNotOpen
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   141
    "report an error, that the stream has not been opened"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   142
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   143
    self zerror:'not open'.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   144
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   145
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   146
errorReadOnly
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   147
    "report an error, that the stream is a readOnly stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   148
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   149
    self zerror:'is readonly'
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   150
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   151
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   152
errorWriteOnly
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   153
    "report an error, that the stream is a writeOnly stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   154
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   155
    self zerror:'is writeonly'
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   156
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   157
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   158
invalidArgument
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   159
    "called if a method is invoked with invalid parameters"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   160
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   161
    self zerror:'invalid arguments'.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   162
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   163
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   164
zerror:anError
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   165
    |error|
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   166
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   167
    zstream isNil ifTrue:[
4262
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   168
        error := 'not open'.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   169
    ] ifFalse:[
4262
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   170
        anError isNumber ifTrue:[
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   171
                     anError ==  1 ifTrue:[ error := 'stream at end' ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   172
            ifFalse:[anError == -1 ifTrue:[ error := 'processing error: ', anError printString ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   173
            ifFalse:[anError == -2 ifTrue:[ error := 'processing error' ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   174
            ifFalse:[anError == -3 ifTrue:[ error := 'input data corrupted' ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   175
            ifFalse:[anError == -4 ifTrue:[ error := 'not enough memory' ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   176
            ifFalse:[anError == -5 ifTrue:[ error := 'not enough memory in the output stream' ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   177
            ifFalse:[anError == -6 ifTrue:[ error := 'version error' ]
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   178
            ifFalse:[
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   179
                    error := 'compressing error: ', anError printString
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   180
            ]]]]]]].
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   181
        ] ifFalse:[
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   182
            error := anError printString
a4efbb47dc1e #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 4258
diff changeset
   183
        ].
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   184
    ].
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   185
    StreamError raiseErrorString:(self class name , ': ', error).
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   186
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   187
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   188
!CompressionStream methodsFor:'finalization'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   189
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   190
executor
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   191
    "redefined to return a lightweight copy
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   192
     - all we need is the memory handle"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   193
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   194
    ^ self class basicNew finalizeCopy:zstream.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   195
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   196
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   197
finalize
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   198
    "the compressin-stream was garbage collected;
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   199
     close the underlying zip-stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   200
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   201
    self closeZStream.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   202
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   203
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   204
finalizeCopy:aZStream
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   205
    "used for finalization to close the underlying zip-stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   206
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   207
    zstream := aZStream.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   208
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   209
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   210
!CompressionStream methodsFor:'low level'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   211
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   212
z_nextAvailableInto:aCollection startingAt:offset maxCount:maxCount
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   213
    "read the next available bytes into a collection, a string or byteArray;
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   214
     returns the size read"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   215
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   216
    |start count avail|
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   217
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   218
    avail := readLimit - position.
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   219
    avail > 0 ifFalse:[^ 0].
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   220
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   221
    count := aCollection size - offset + 1.
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   222
    count < 0 ifTrue:[
2336
072bb2f98ec9 change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2293
diff changeset
   223
        self zerror:'invalid arguments'
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   224
    ].
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   225
    count == 0 ifTrue:[
2336
072bb2f98ec9 change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2293
diff changeset
   226
        ^ 0
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   227
    ].
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   228
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   229
    count := avail min:count.
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   230
    maxCount notNil ifTrue:[ count := count min:maxCount ].
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   231
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   232
    start := position.
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   233
    position := position + count.
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   234
2194
38a073a3261b suppress header & checksum configurable
ca
parents: 2192
diff changeset
   235
%{
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   236
    unsigned char * _dstPt;
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   237
    int             _count = __intVal( count );
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   238
    int             _offset = __intVal( offset );
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   239
    unsigned char * _srcPt;
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   240
    OBJ             _srcObj = __INST( outputBytes );
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   241
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   242
    if( __isBytes(aCollection) ) {
2336
072bb2f98ec9 change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2293
diff changeset
   243
        _dstPt = (unsigned char *) (__byteArrayVal(aCollection));
072bb2f98ec9 change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2293
diff changeset
   244
    } else if (__isStringLike(aCollection)) {
072bb2f98ec9 change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2293
diff changeset
   245
        _dstPt = (unsigned char *) (__stringVal( aCollection));
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   246
    } else {
2336
072bb2f98ec9 change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2293
diff changeset
   247
        goto error;
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   248
    }
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   249
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   250
    _dstPt  = _dstPt + _offset - 1;
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   251
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   252
    _srcPt  = (unsigned char *) __externalBytesAddress( _srcObj );
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   253
    _srcPt += __intVal( start );
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   254
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   255
    memcpy(_dstPt, _srcPt, _count);
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   256
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   257
    RETURN(__MKSMALLINT(_count));
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   258
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   259
error: ;
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   260
%}.
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   261
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   262
    ^ self zerror:'invalid argument'
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   263
!
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   264
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   265
zclose
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   266
    "low level close of the zip stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   267
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   268
    ^ self subclassResponsibility
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   269
!
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   270
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   271
zdeflate
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   272
    "low level - deflate
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   273
     returns false if the deflate operation is finished otherwise true"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   274
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   275
    ^ self subclassResponsibility
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   276
!
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   277
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   278
zdeflateInit
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   279
    "low level - deflateInit
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   280
     initialize the deflate mode, write header"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   281
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   282
    ^ self subclassResponsibility
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   283
!
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   284
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   285
zget_avail_out
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   286
    "low level - get the number of available out bytes"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   287
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   288
    ^ self subclassResponsibility
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   289
!
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   290
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   291
zinflate
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   292
    "low level - inflate
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   293
     returns nil if at uncompress is finished, or the number of
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   294
     available bytes in the output-buffer"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   295
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   296
    ^ self subclassResponsibility
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   297
!
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   298
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   299
zinflateInit
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   300
    "low level - inflateInit
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   301
     initialize the inflate mode, read and check header"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   302
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   303
    ^ self subclassResponsibility
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   304
!
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   305
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   306
zopen
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   307
    "low level - opens the zip stream
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   308
     create the resources"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   309
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   310
    ^ self subclassResponsibility
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   311
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   312
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   313
zset_avail_in:count
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   314
    "set the 'avail_in' and compute the crc"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   315
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   316
    ^ self subclassResponsibility
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   317
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   318
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   319
!CompressionStream methodsFor:'private'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   320
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   321
closeZStream
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   322
    "close the zip-stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   323
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   324
    onStream := mode := nil.
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   325
    hitEOF   := true.
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   326
2467
edadd52a08dd code cleanup
Claus Gittinger <cg@exept.de>
parents: 2336
diff changeset
   327
    zstream notNil ifTrue:[
edadd52a08dd code cleanup
Claus Gittinger <cg@exept.de>
parents: 2336
diff changeset
   328
        self unregisterForFinalization.
edadd52a08dd code cleanup
Claus Gittinger <cg@exept.de>
parents: 2336
diff changeset
   329
        self zclose.
edadd52a08dd code cleanup
Claus Gittinger <cg@exept.de>
parents: 2336
diff changeset
   330
        zstream := nil.
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   331
    ].
2467
edadd52a08dd code cleanup
Claus Gittinger <cg@exept.de>
parents: 2336
diff changeset
   332
edadd52a08dd code cleanup
Claus Gittinger <cg@exept.de>
parents: 2336
diff changeset
   333
    "Modified: / 08-08-2010 / 14:40:41 / cg"
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   334
!
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   335
1081
40e1129995f5 *** empty log message ***
ca
parents: 1080
diff changeset
   336
contentsSpecies
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   337
    "return the kind of object to be returned by sub-collection builders"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   338
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   339
    binary ifTrue:[^ ByteArray].
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   340
    ^ String
1081
40e1129995f5 *** empty log message ***
ca
parents: 1080
diff changeset
   341
!
40e1129995f5 *** empty log message ***
ca
parents: 1080
diff changeset
   342
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   343
fillBuffer
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   344
    "Fill the inputBytes buffer.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   345
     returns true if data is available for reading;
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   346
     false if the stream is at end.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   347
     Updates the readLimit and position."
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   348
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   349
    hitEOF ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   350
        ^ false.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   351
    ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   352
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   353
    position >= readLimit ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   354
        [(readLimit := self zinflate) == 0] whileTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   355
            |n|
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   356
3293
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   357
            [
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   358
                n := onStream nextAvailableBytes:(inputBytes size) into:inputBytes startingAt:1.
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   359
                n == 0 ifTrue:[
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   360
                    onStream atEnd ifTrue:[
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   361
                        hitEOF := true.
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   362
                        ^ false.
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   363
                    ] ifFalse:[
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   364
                        "must be a socket or pipe"
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   365
                        onStream readWait.
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   366
                    ].
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   367
                ].
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   368
                n == 0
772bcf3f973c class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3292
diff changeset
   369
            ] whileTrue.
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   370
            self zset_avail_in:n.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   371
        ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   372
        readLimit isNil ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   373
            hitEOF := true.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   374
            ^ false
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   375
        ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   376
        position := 0.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   377
    ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   378
    ^ true
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   379
!
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   380
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   381
onStreamPutBytes:count from:data
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   382
    "write compressed data to the (output) stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   383
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   384
    onStream nextPutBytes:count from:data startingAt:1
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   385
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   386
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   387
!CompressionStream methodsFor:'queries'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   388
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   389
atEnd
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   390
    "return true if the end of the compressed input stream has been reached"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   391
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   392
    ^ self fillBuffer not
1062
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   393
!
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   394
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   395
isBinary
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   396
    "return true, if the stream is in binary (as opposed to text-) mode.
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   397
     The default when created is false"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   398
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   399
    ^ binary
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   400
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   401
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   402
isHeaderAndChecksumSuppressed
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   403
    "answer true if the checksum and header are suppressed;
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   404
    the default is true (backward compatibility)"
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   405
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   406
    suppressHeaderAndChecksum isNil ifTrue:[
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   407
        ^ self class defaultSuppressHeaderAndChecksum
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   408
    ].
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   409
    ^ suppressHeaderAndChecksum
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   410
!
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   411
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   412
isOpen
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   413
    "return true, if this stream is open"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   414
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   415
    ^ onStream notNil
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   416
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   417
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   418
isReadable
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   419
    "return true, if this stream can be read from"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   420
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   421
    ^ mode == #readonly
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   422
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   423
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   424
isWritable
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   425
    "return true, if this stream can be written to"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   426
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   427
    ^ mode == #writeonly
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   428
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   429
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   430
!CompressionStream methodsFor:'reading'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   431
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   432
contents
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   433
    "return the entire contents of and close the stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   434
1081
40e1129995f5 *** empty log message ***
ca
parents: 1080
diff changeset
   435
    |species stream bfsize buffer count|
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   436
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   437
    mode ~~ #readonly ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   438
        self errorWriteOnly
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   439
    ].
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   440
    species := self contentsSpecies.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   441
    self fillBuffer ifFalse:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   442
        "at end"
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   443
        ^ species new.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   444
    ].
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   445
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   446
    bfsize := outputBytes size.
1081
40e1129995f5 *** empty log message ***
ca
parents: 1080
diff changeset
   447
    buffer  := species new:bfsize.
1428
c9f7ec7d0c84 testcases extracted into spearate class
Claus Gittinger <cg@exept.de>
parents: 1308
diff changeset
   448
    stream  := WriteStream on:(species new:bfsize).
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   449
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   450
    [
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   451
        count := self z_nextAvailableInto:buffer startingAt:1 maxCount:nil.
1079
b6e148cf5df4 *** empty log message ***
ca
parents: 1062
diff changeset
   452
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   453
        count == bfsize ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   454
            stream nextPutAll:buffer.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   455
        ] ifFalse:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   456
            count > 0 ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   457
                stream nextPutAll:buffer startingAt:1 to:count.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   458
            ]
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   459
        ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   460
        self fillBuffer
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   461
    ] whileTrue.
1062
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   462
    self close.
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   463
    ^ stream contents
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   464
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   465
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   466
next
4265
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   467
    "return the next element,
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   468
     as character (text mode) or byte (binary mode). 
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   469
     Possibly raises ReadPastEnd error, if there are no more elements"
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   470
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   471
    |byte|
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   472
3099
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   473
    (byte := self nextByte) isNil ifTrue:[
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   474
        "there is no more element; the stream is at end"
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   475
        ^ nil
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   476
    ].
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   477
    binary ifTrue:[^ byte ].
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   478
    ^ Character value:byte
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   479
!
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   480
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   481
next:n
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   482
    "return the next count elements of the stream as a collection.
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   483
     Redefined to return a String or ByteArray and for optimization"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   484
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   485
    |data count species|
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   486
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   487
    mode ~~ #readonly ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   488
        self errorWriteOnly
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   489
    ].
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   490
    species := self contentsSpecies.
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   491
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   492
    hitEOF ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   493
        "This normally raises an error. If you proceed, you get what has been collected (nothing)."
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   494
        self pastEndRead.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   495
        ^ species new
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   496
    ].
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   497
    data := species new:n.
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   498
    count := self next:n into:data startingAt:1.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   499
    count = n ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   500
        ^ data.
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   501
    ].
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   502
    "This normally raises an error. If you proceed, you get what has been collected."
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   503
    self pastEndRead.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   504
    ^ data copyFrom:1 to:count.
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   505
!
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   506
2191
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   507
next:n into:aBuffer startingAt:startIndex
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   508
    "read the next n elements of the stream into aBuffer.
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   509
     Return the number of bytes read."
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   510
2192
Claus Gittinger <cg@exept.de>
parents: 2191
diff changeset
   511
    |count remaining offset|
2191
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   512
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   513
    mode ~~ #readonly ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   514
        self errorWriteOnly
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   515
    ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   516
    self fillBuffer ifFalse:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   517
        self pastEndRead isNil ifTrue:[^ 0].
2191
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   518
    ].
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   519
    offset := startIndex.
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   520
    remaining := n.
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   521
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   522
    [
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   523
        count  := self z_nextAvailableInto:aBuffer startingAt:offset maxCount:remaining.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   524
        offset := count + offset.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   525
        remaining := remaining - count.
3292
904ccaf98691 class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3284
diff changeset
   526
        remaining ~~ 0 and:[self fillBuffer]
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   527
    ] whileTrue.
2191
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   528
    ^ n - remaining
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   529
!
7cb40c5e5511 +next:into:startingAt:
Claus Gittinger <cg@exept.de>
parents: 2190
diff changeset
   530
3099
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   531
nextByte
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   532
    "return the next element, a byte 
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   533
     raise an error, if there are no more elements"
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   534
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   535
    mode ~~ #readonly ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   536
        self errorWriteOnly
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   537
    ].
4265
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   538
    position >= readLimit ifTrue:[
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   539
        self fillBuffer ifFalse:[
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   540
            "there is no more element; the stream is at end"
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   541
            ^ self pastEndRead.
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   542
        ].
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   543
    ].    
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   544
    position := position + 1.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   545
    ^ outputBytes at:position.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   546
!
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   547
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   548
nextByteOrNil
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   549
    "return the next element, a byte 
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   550
     return nil, if there are no more elements"
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   551
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   552
    mode ~~ #readonly ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   553
        self errorWriteOnly
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   554
    ].
4265
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   555
    position >= readLimit ifTrue:[
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   556
        self fillBuffer ifFalse:[
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   557
            "there is no more element; the stream is at end"
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   558
            ^ nil.
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   559
        ].
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   560
    ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   561
    position := position + 1.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   562
    ^ outputBytes at:position.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   563
!
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   564
3316
7d8e613eb9da class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3293
diff changeset
   565
nextBytes:numBytes into:aByteCollection startingAt:initialIndex
7d8e613eb9da class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3293
diff changeset
   566
    "can do it faster here than in super class"
7d8e613eb9da class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3293
diff changeset
   567
7d8e613eb9da class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3293
diff changeset
   568
    ^ self next:numBytes into:aByteCollection startingAt:initialIndex.
7d8e613eb9da class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3293
diff changeset
   569
!
7d8e613eb9da class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3293
diff changeset
   570
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   571
nextOrNil
4265
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   572
    "return the next element, 
cbd62f582ae7 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4262
diff changeset
   573
     as character (text mode) or byte (binary mode). 
3099
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   574
     return nil, if there are no more elements"
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   575
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   576
    |byte|
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   577
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   578
    (byte := self nextByteOrNil) isNil ifTrue:[
3099
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   579
        "there is no more element; the stream is at end"
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   580
        ^ nil
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   581
    ].
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   582
    binary ifTrue:[^ byte].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   583
    ^ Character value:byte
3099
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   584
!
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   585
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   586
skip:count
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   587
    "skip count objects, return the receiver
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   588
     redefined for optimization"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   589
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   590
    |n avail|
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   591
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   592
    mode ~~ #readonly ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   593
        self errorWriteOnly
1083
5a0ae155f400 *** empty log message ***
ca
parents: 1082
diff changeset
   594
    ].
5a0ae155f400 *** empty log message ***
ca
parents: 1082
diff changeset
   595
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   596
    n := count.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   597
    n <= 0 ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   598
        n ~~ 0 ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   599
            "don't know how to unread ..."
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   600
            PositionError raiseRequest
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   601
        ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   602
        ^ self
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   603
    ].
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   604
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   605
    [self fillBuffer] whileTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   606
        avail := readLimit - position.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   607
        avail >= n ifTrue:[
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   608
            position := position + n.
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   609
            ^ self
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   610
        ].
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   611
        position := readLimit := 0. "/ reset input
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   612
        n := n - avail.
1082
3086d4d4f0b9 *** empty log message ***
ca
parents: 1081
diff changeset
   613
    ].
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   614
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   615
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   616
!CompressionStream methodsFor:'startup & release'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   617
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   618
close
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   619
    "close the zip-stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   620
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   621
    hitEOF := true.
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   622
    zstream notNil ifTrue:[
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   623
        self flush.
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   624
        self closeZStream.
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   625
    ].
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   626
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   627
    (propagateClose and:[onStream notNil]) ifTrue:[
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   628
        onStream close.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   629
    ].
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   630
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   631
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   632
openWithMode:aMode on:aStream
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   633
    "open the zip-stream on a stream
2005
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   634
     can be reimplemented to do some additional stuff (e.g. gzip header) like
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   635
     in the ZipStream
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   636
    "
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   637
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   638
    ^ self
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   639
        openWithMode:aMode
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   640
        on:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   641
        suppressHeaderAndChecksum:(self class defaultSuppressHeaderAndChecksum)
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   642
!
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   643
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   644
openWithMode:aMode on:aStream suppressHeaderAndChecksum:aBoolean
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   645
    "open the zip-stream on a stream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   646
     can be reimplemented to do some additional stuff (e.g. gzip header) like
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   647
     in the ZipStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   648
    "
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   649
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   650
    ^ self
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   651
        streamOpenWithMode:aMode
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   652
        on:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   653
        suppressHeaderAndChecksum:aBoolean
2005
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   654
!
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   655
4258
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   656
setInputStream:aStream
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   657
    "change the input stream (i.e. continue reading from aStream).
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   658
     Useful if the input arrives in chunks, and we have to continue decompressing
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   659
     from the next chunk (passing a readStream on the next chunk here)."
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   660
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   661
    mode ~~ #readonly ifTrue:[
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   662
        self errorWriteOnly
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   663
    ].
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   664
    onStream := aStream.
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   665
!
e74b86a138c2 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 4205
diff changeset
   666
2005
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   667
streamOpenWithMode:aMode on:aStream
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   668
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   669
    ^ self
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   670
        streamOpenWithMode:aMode
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   671
        on:aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   672
        suppressHeaderAndChecksum:(self class defaultSuppressHeaderAndChecksum)
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   673
!
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   674
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   675
streamOpenWithMode:aMode on:aStream suppressHeaderAndChecksum:aBoolean
2005
a6ef1083aa32 add streamOpenWithMode:on: method to allow to redefine the
ab
parents: 1829
diff changeset
   676
    "open the compression stream on a stream
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   677
         #readonly    uncompress the data derived from the read-stream,  aStream
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   678
         #writeonly   compress   the data and write to the write-stream, aStream
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1059
diff changeset
   679
    "
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   680
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   681
    aStream isNil ifTrue:[
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   682
        ^ self errorNotOpen
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   683
    ].
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   684
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   685
    propagateClose := false.
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   686
    onStream    := aStream.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   687
    mode        := aMode.
1829
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   688
    outputBytes := ExternalBytes unprotectedNew:16384.
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   689
    inputBytes  := ExternalBytes unprotectedNew:16384.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   690
    readLimit   := position := 0.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   691
    binary      := false.
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   692
    suppressHeaderAndChecksum := aBoolean.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   693
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   694
    self zopen.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   695
    self registerForFinalization.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   696
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   697
    hitEOF := false.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   698
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   699
    aMode == #readonly ifTrue:[
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   700
        self zinflateInit.
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   701
    ] ifFalse:[
2195
9864349ff9d3 suppressHeaderAndChecksum is configurable
ca
parents: 2194
diff changeset
   702
        self zdeflateInit
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   703
    ].
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   704
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   705
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   706
!CompressionStream methodsFor:'writing'!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   707
1062
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   708
contents:contents
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   709
    "write the entire contents to and close the stream"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   710
3284
0fb781a3260d class: CompressionStream
Stefan Vogel <sv@exept.de>
parents: 3182
diff changeset
   711
    self nextPutAll:contents.
1062
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   712
    self close.
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   713
!
211b3cb6d628 *** empty log message ***
ca
parents: 1061
diff changeset
   714
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   715
flush
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   716
    "flush the input and output buffer"
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   717
1829
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   718
    |continue availOut|
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   719
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   720
    self isWritable ifFalse:[^ self].
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   721
    self zset_avail_in:position.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   722
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   723
    position := 0.
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   724
1829
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   725
    [   continue := self zdeflate.
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   726
	availOut := self zget_avail_out.
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   727
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   728
	availOut > 0 ifTrue:[
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   729
	    self onStreamPutBytes:availOut from:outputBytes
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2005
diff changeset
   730
	].
1829
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   731
1827
b635239b983c bugfix in flush
ca
parents: 1782
diff changeset
   732
    ] doWhile:[ continue == true ].
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   733
!
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   734
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   735
nextPut:aByteOrCharacter
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   736
    "write the argument, aByteOrCharacter"
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   737
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   738
    position == inputBytes size ifTrue:[self flush].
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   739
    position := position + 1.
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   740
    inputBytes at:position put:aByteOrCharacter asInteger.
1829
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   741
!
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   742
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   743
nextPutAll:aCollection
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   744
    |limit|
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   745
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   746
    limit := inputBytes size.
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   747
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   748
    aCollection do:[:aByteOrCharacter|
2293
5f9512256977 changed: #nextPutAll:
Claus Gittinger <cg@exept.de>
parents: 2195
diff changeset
   749
        position == limit ifTrue:[self flush].
5f9512256977 changed: #nextPutAll:
Claus Gittinger <cg@exept.de>
parents: 2195
diff changeset
   750
        position := position + 1.
5f9512256977 changed: #nextPutAll:
Claus Gittinger <cg@exept.de>
parents: 2195
diff changeset
   751
        inputBytes at:position put:aByteOrCharacter asInteger.
1829
4dd5f9f30878 atEnd fixed
ca
parents: 1827
diff changeset
   752
    ].
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   753
! !
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   754
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   755
!CompressionStream class methodsFor:'documentation'!
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   756
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1083
diff changeset
   757
version
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   758
    ^ '$Header$'
2293
5f9512256977 changed: #nextPutAll:
Claus Gittinger <cg@exept.de>
parents: 2195
diff changeset
   759
!
5f9512256977 changed: #nextPutAll:
Claus Gittinger <cg@exept.de>
parents: 2195
diff changeset
   760
5f9512256977 changed: #nextPutAll:
Claus Gittinger <cg@exept.de>
parents: 2195
diff changeset
   761
version_CVS
4205
126f38d59bbe #FEATURE by stefan
Stefan Vogel <sv@exept.de>
parents: 3316
diff changeset
   762
    ^ '$Header$'
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   763
! !
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   764
3099
6ec8d8a4dae4 class: CompressionStream
Claus Gittinger <cg@exept.de>
parents: 2467
diff changeset
   765
1059
b47e4eff5543 *** empty log message ***
ca
parents:
diff changeset
   766
CompressionStream initialize!