mir/node-telegram-bot-api
2
0
Fork 0
mirror of https://github.com/yagop/node-telegram-bot-api synced 2025-08-29 05:17:41 +00:00
Code Issues Releases Wiki Activity

Chain promise on getFileLink and return a new one. Call reject on error

Browse Source
This commit is contained in:
Yago 2015-09-26 20:28:04 +02:00
parent 04412cc7bf
commit 2247d248c8
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/telegram.js
View File

@ -449,23 +449,20 @@ TelegramBot.prototype.getFileLink = function(fileId) {
*/ */
TelegramBot.prototype.downloadFile = function(fileId, downloadDir) { TelegramBot.prototype.downloadFile = function(fileId, downloadDir) {
var bot = this; return this.getFileLink(fileId).then(function (fileURI) {
var fileName = fileURI.slice(fileURI.lastIndexOf('/') + 1);
// TODO: Ensure fileName doesn't contains slashes
var filePath = downloadDir + '/' + fileName;
return new Promise(function (resolve, reject) {
request({uri: fileURI})
.pipe(fs.createWriteStream(filePath))
.on('error', reject)
.on('close', function() {
resolve(filePath);
});
});
});
return new Promise(function(resolve, reject) {
bot.getFileLink(fileId).then(function(fileURI) {
// Apparently, this is not the safest method to get the file name,
// but I am pretty sure that Telegram will not include slashes when generating names
var fileName = fileURI.slice(fileURI.lastIndexOf('/') + 1);
var filePath = downloadDir + '/' + fileName;
request({uri: fileURI})
.pipe(fs.createWriteStream(filePath))
.on('close', function() {
resolve(filePath);
});
});
});
} }
module.exports = TelegramBot; module.exports = TelegramBot;