@@ -14,7 +14,7 @@ var fs = require("graceful-fs")
14
14
inherits ( FileReader , Reader )
15
15
16
16
function FileReader ( props ) {
17
- // console.error(" FR create", props.path , props.size, new Error().stack)
17
+ // console.error(" FR create", props._path , props.size, new Error().stack)
18
18
var me = this
19
19
if ( ! ( me instanceof FileReader ) ) throw new Error (
20
20
"FileReader must be called as constructor." )
@@ -34,7 +34,7 @@ function FileReader (props) {
34
34
35
35
FileReader . prototype . _getStream = function ( ) {
36
36
var me = this
37
- , stream = me . _stream = fs . createReadStream ( me . path , me . props )
37
+ , stream = me . _stream = fs . createReadStream ( me . _path , me . props )
38
38
39
39
if ( me . props . blksize ) {
40
40
stream . bufferSize = me . props . blksize
@@ -55,7 +55,7 @@ FileReader.prototype._getStream = function () {
55
55
56
56
stream . on ( "end" , function ( ) {
57
57
if ( me . _paused || me . _buffer . length ) {
58
- // console.error("FR Buffering End", me.path )
58
+ // console.error("FR Buffering End", me._path )
59
59
me . _buffer . push ( EOF )
60
60
me . _read ( )
61
61
} else {
@@ -64,20 +64,18 @@ FileReader.prototype._getStream = function () {
64
64
65
65
if ( me . _bytesEmitted !== me . props . size ) {
66
66
me . error ( "Didn't get expected byte count\n" +
67
- "type: " + me . type + "\n" +
68
- "path: " + me . path + "\n" +
69
67
"expect: " + me . props . size + "\n" +
70
68
"actual: " + me . _bytesEmitted )
71
69
}
72
70
} )
73
71
74
72
stream . on ( "close" , function ( ) {
75
73
if ( me . _paused || me . _buffer . length ) {
76
- // console.error("FR Buffering Close", me.path )
74
+ // console.error("FR Buffering Close", me._path )
77
75
me . _buffer . push ( CLOSE )
78
76
me . _read ( )
79
77
} else {
80
- // console.error("FR close 1", me.path )
78
+ // console.error("FR close 1", me._path )
81
79
me . emit ( "close" )
82
80
}
83
81
} )
@@ -87,36 +85,36 @@ FileReader.prototype._getStream = function () {
87
85
88
86
FileReader . prototype . _read = function ( ) {
89
87
var me = this
90
- // console.error("FR _read", me.path )
88
+ // console.error("FR _read", me._path )
91
89
if ( me . _paused ) {
92
- // console.error("FR _read paused", me.path )
90
+ // console.error("FR _read paused", me._path )
93
91
return
94
92
}
95
93
96
94
if ( ! me . _stream ) {
97
- // console.error("FR _getStream calling", me.path )
95
+ // console.error("FR _getStream calling", me._path )
98
96
return me . _getStream ( )
99
97
}
100
98
101
99
// clear out the buffer, if there is one.
102
100
if ( me . _buffer . length ) {
103
- // console.error("FR _read has buffer", me._buffer.length, me.path )
101
+ // console.error("FR _read has buffer", me._buffer.length, me._path )
104
102
var buf = me . _buffer
105
103
for ( var i = 0 , l = buf . length ; i < l ; i ++ ) {
106
104
var c = buf [ i ]
107
105
if ( c === EOF ) {
108
- // console.error("FR Read emitting buffered end", me.path )
106
+ // console.error("FR Read emitting buffered end", me._path )
109
107
me . emit ( "end" )
110
108
} else if ( c === CLOSE ) {
111
- // console.error("FR Read emitting buffered close", me.path )
109
+ // console.error("FR Read emitting buffered close", me._path )
112
110
me . emit ( "close" )
113
111
} else {
114
- // console.error("FR Read emitting buffered data", me.path )
112
+ // console.error("FR Read emitting buffered data", me._path )
115
113
me . emit ( "data" , c )
116
114
}
117
115
118
116
if ( me . _paused ) {
119
- // console.error("FR Read Re-pausing at "+i, me.path )
117
+ // console.error("FR Read Re-pausing at "+i, me._path )
120
118
me . _buffer = buf . slice ( i )
121
119
return
122
120
}
@@ -129,7 +127,7 @@ FileReader.prototype._read = function () {
129
127
130
128
FileReader . prototype . pause = function ( who ) {
131
129
var me = this
132
- // console.error("FR Pause", me.path )
130
+ // console.error("FR Pause", me._path )
133
131
if ( me . _paused ) return
134
132
who = who || me
135
133
me . _paused = true
@@ -139,7 +137,7 @@ FileReader.prototype.pause = function (who) {
139
137
140
138
FileReader . prototype . resume = function ( who ) {
141
139
var me = this
142
- // console.error("FR Resume", me.path )
140
+ // console.error("FR Resume", me._path )
143
141
if ( ! me . _paused ) return
144
142
who = who || me
145
143
me . emit ( "resume" , who )
0 commit comments