LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

switched resolve and update functions

Browse source
This commit is contained in:
bill bittner 2017-06-22 10:28:34 -07:00
parent 232591fdb3
commit 88d217cb2c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
controllers/serveController.js
View file

@ -84,7 +84,7 @@ function getClaimAndHandleResponse (uri, height, resolve, reject) {
nsfw : metadata.stream.metadata.nsfw,
})
.then(result => {
logger.debug('successfully created mysql record', result);
logger.debug('successfully created mysql record');
})
.catch(error => {
logger.error('sequelize create error', error);
@ -113,14 +113,14 @@ module.exports = {
const height = freePublicClaimList[0].height;
// 2. check to see if the file is available locally
db.File
.findOne({ where: { name: name, claimId: claimId } }) // note: destructure for es6?
.findOne({ where: { name, claimId } })
.then(claim => {
// 3. if a matching claim_id is found locally, serve it
if (claim) {
// trigger update if needed
updateFileIfNeeded(uri, name, claimId, claim.dataValues.outpoint, claim.dataValues.height);
// serve the file
resolve(claim.dataValues);
// trigger update if needed
updateFileIfNeeded(uri, name, claimId, claim.dataValues.outpoint, claim.dataValues.height);
// 3. otherwise use daemon to retrieve it
} else {
// get the claim and serve it
@ -138,19 +138,19 @@ module.exports = {
});
return deferred;
},
getClaimByClaimId (claimName, claimId) {
getClaimByClaimId (name, claimId) {
const deferred = new Promise((resolve, reject) => {
const uri = `${claimName}#${claimId}`;
const uri = `${name}#${claimId}`;
// 1. check locally for the claim
db.File
.findOne({ where: { name: claimName, claimId: claimId } }) // note: destructure?
.findOne({ where: { name, claimId } })
.then(claim => {
// 2. if a match is found locally, serve it
if (claim) {
// trigger an update if needed
updateFileIfNeeded(uri, claimName, claimId, claim.dataValues.outpoint, claim.dataValues.outpoint);
// serve the file
resolve(claim.dataValues);
// trigger an update if needed
updateFileIfNeeded(uri, name, claimId, claim.dataValues.outpoint, claim.dataValues.outpoint);
// 2. otherwise use daemon to retrieve it
} else {
// 3. resolve the Uri