8000 Improve code. · masteramuk/examples@cf0a497 · GitHub
[go: up one dir, main page]
Skip to content

Commit cf0a497

Browse files
petersirkapetersirka
committed
Improve code.
1 parent c951017 commit cf0a497

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

‎download-file-database-nosql/controllers/default.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function static_image(req, res) {
3131
db.binary.read(id, function(err, stream, header) {
3232

3333
if (err) {
34-
res.throw404(req, res);
34+
res.throw404();
3535
return;
3636
}
3737

@@ -45,6 +45,6 @@ function static_image(req, res) {
4545
});
4646

4747
// or
48-
// self.stream('image/png', stream);
48+
// res.stream('image/png', stream);
4949
});
5050
}

‎download-file-progress/controllers/default.js

Lines changed: 19 additions & 20 deletions
4792
Original file line numberDiff line numberDiff line c 8000 hange
@@ -3,47 +3,46 @@ var progress = {};
33

44
exports.install = function() {
55
F.route('/', view_homepage);
6-
F.route('/', json_percentage, ['xhr']);
7-
F.route('/download/', file_download);
6+
F.route('/', json_percentage, ['xhr']);
7+
F.route('/download/', file_download);
88
};
99

1010
/**
1111
* Homepage
1212
*/
1313
function view_homepage() {
14-
var self = this;
15-
self.view('homepage');
14+
var self = this;
15+
self.view('homepage');
1616
}
1717

1818
/**
1919
* Get download percentage
2020
*/
2121
function json_percentage() {
22-
var self = this;
23-
var id = (self.req.headers['user-agent'] + self.ip).hash();
24-
self.json({ percentage: progress[id] || 0 });
22+
var self = this;
23+
var id = (self.req.headers['user-agent'] + self.ip).hash();
24+
self.json({ percentage: progress[id] || 0 });
2525
}
2626

2727
/**
2828
* Download larger file
2929
*/
3030
function file_download() {
3131

32-
var self = this;
33-
var filename = F.path.public('file.zip');
34-
var stream = fs.createReadStream(filename);
32+
var self = this;
33+
var filename = F.path.public('file.zip');
34+
var stream = fs.createReadStream(filename);
3535

36-
var size = fs.statSync(filename).size;
37-
var current = 0;
38-
var percentage = 0;
39-
var id = (self.req.headers['user-agent'] + self.ip).hash();
36+
var size = fs.statSync(filename).size;
37+
var current = 0;
38+
var id = (self.req.headers['user-agent'] + self.ip).hash();
4039

41-
progress[id] = 0;
40+
progress[id] = 0;
4241

43-
stream.on('data', function(buffer) {
44-
current += buffer.length;
45-
progress[id] = Math.floor((current / size) * 100);
46-
});
42+
stream.on('data', function(buffer) {
43+
current += buffer.length;
44+
progress[id] = Math.floor((current / size) * 100);
45+
});
4746

48-
self.stream(U.getContentType('zip'), stream, 'file.zip');
47+
self.stream(U.getContentType('zip'), stream, 'file.zip');
4948
}

0 commit comments

Comments
 (0)
0