fix emoji donwloadStream
This commit is contained in:
@@ -20,14 +20,17 @@ module.exports = async function (context) {
|
|||||||
const filename = `${result.name}.${result.extension}`
|
const filename = `${result.name}.${result.extension}`
|
||||||
const dest = `${context.config.target.filesPath}/custom_emoji/${filename}`
|
const dest = `${context.config.target.filesPath}/custom_emoji/${filename}`
|
||||||
|
|
||||||
|
try {
|
||||||
const srcFilename = Utils.srcPath(context.config.source.customEmojiPath, filename)
|
const srcFilename = Utils.srcPath(context.config.source.customEmojiPath, filename)
|
||||||
if (srcFilename) {
|
if (srcFilename) {
|
||||||
Utils.copyFile(srcFilename, dest)
|
Utils.copyFile(srcFilename, dest)
|
||||||
} else {
|
} else {
|
||||||
await Utils.downloadGridFSByName(context, fileCollection, filename, dest)
|
await Utils.downloadGridFSByName(context, fileCollection, filename, dest)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info(`... copied ${result.name}`)
|
log.info(`... copied ${result.name}`)
|
||||||
|
} catch (err) {
|
||||||
|
log.warn(`... skipping emoji "${result.name}": ${err.message}`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return context
|
return context
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -182,10 +182,12 @@ utils.downloadGridFSByName = async function (context, collection, filename, dest
|
|||||||
|
|
||||||
const bucket = context.rocketchat.gridFsBucket(collection.collectionName)
|
const bucket = context.rocketchat.gridFsBucket(collection.collectionName)
|
||||||
const destStream = fs.createWriteStream(dest)
|
const destStream = fs.createWriteStream(dest)
|
||||||
bucket.openDownloadStreamByName(filename).pipe(destStream)
|
const downloadStream = bucket.openDownloadStreamByName(filename)
|
||||||
|
downloadStream.pipe(destStream)
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
destStream.on('finish', resolve)
|
destStream.on('finish', resolve)
|
||||||
destStream.on('error', reject)
|
destStream.on('error', reject)
|
||||||
|
downloadStream.on('error', reject)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user