Remove unnecessary Bluebird-isms.
This commit is contained in:
parent
0eb949ba39
commit
8ab2ca3f24
@ -1,4 +1,3 @@
|
|||||||
import Bluebird from 'bluebird'
|
|
||||||
import Collection, {ModelAlreadyExists} from '../collection'
|
import Collection, {ModelAlreadyExists} from '../collection'
|
||||||
import difference from 'lodash.difference'
|
import difference from 'lodash.difference'
|
||||||
import filter from 'lodash.filter'
|
import filter from 'lodash.filter'
|
||||||
@ -55,7 +54,7 @@ export default class Redis extends Collection {
|
|||||||
const {redis} = this
|
const {redis} = this
|
||||||
|
|
||||||
const models = []
|
const models = []
|
||||||
return Bluebird.map(ids, id => {
|
return Promise.all(mapToArray(ids, id => {
|
||||||
return redis.hgetallAsync(prefix + id).then(model => {
|
return redis.hgetallAsync(prefix + id).then(model => {
|
||||||
// If empty, consider it a no match.
|
// If empty, consider it a no match.
|
||||||
if (isEmpty(model)) {
|
if (isEmpty(model)) {
|
||||||
@ -67,7 +66,7 @@ export default class Redis extends Collection {
|
|||||||
|
|
||||||
models.push(model)
|
models.push(model)
|
||||||
})
|
})
|
||||||
}).return(models)
|
})).then(() => models)
|
||||||
}
|
}
|
||||||
|
|
||||||
_add (models, {replace = false} = {}) {
|
_add (models, {replace = false} = {}) {
|
||||||
@ -76,7 +75,7 @@ export default class Redis extends Collection {
|
|||||||
|
|
||||||
const {indexes, prefix, redis, idPrefix = ''} = this
|
const {indexes, prefix, redis, idPrefix = ''} = this
|
||||||
|
|
||||||
return Bluebird.map(models, async function (model) {
|
return Promise.all(mapToArray(models, async model => {
|
||||||
// Generate a new identifier if necessary.
|
// Generate a new identifier if necessary.
|
||||||
if (model.id === undefined) {
|
if (model.id === undefined) {
|
||||||
model.id = idPrefix + String(await redis.incrAsync(prefix + '_id'))
|
model.id = idPrefix + String(await redis.incrAsync(prefix + '_id'))
|
||||||
@ -119,7 +118,7 @@ export default class Redis extends Collection {
|
|||||||
await Promise.all(promises)
|
await Promise.all(promises)
|
||||||
|
|
||||||
return model
|
return model
|
||||||
})
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
_get (properties) {
|
_get (properties) {
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
// import XoView from 'xo-collection/view'
|
// import XoView from 'xo-collection/view'
|
||||||
import assign from 'lodash.assign'
|
import assign from 'lodash.assign'
|
||||||
import Bluebird from 'bluebird'
|
|
||||||
import createJsonSchemaValidator from 'is-my-json-valid'
|
import createJsonSchemaValidator from 'is-my-json-valid'
|
||||||
import endsWith from 'lodash.endswith'
|
import endsWith from 'lodash.endswith'
|
||||||
import escapeStringRegexp from 'escape-string-regexp'
|
import escapeStringRegexp from 'escape-string-regexp'
|
||||||
@ -791,7 +790,7 @@ export default class Xo extends EventEmitter {
|
|||||||
const oldBackup = backups.shift()
|
const oldBackup = backups.shift()
|
||||||
promises.push(fs.unlink(`${path}/${oldBackup}`))
|
promises.push(fs.unlink(`${path}/${oldBackup}`))
|
||||||
}
|
}
|
||||||
await Bluebird.all(promises)
|
await Promise.all(promises)
|
||||||
|
|
||||||
return backupFullPath
|
return backupFullPath
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user