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

Short urls #89

Merged
bones7242 merged 6 commits from short-urls into master 2017-07-18 04:18:47 +02:00
Conversation 0 Commits 6 Files changed 12 +9 -10
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit af8242a3c6 - Show all commits

19
controllers/serveController.js
View file

@ -198,26 +198,25 @@ module.exports = {
uri = `${name}#${validClaimId}`;
return db.File.findOne({ where: { name, claimId: validClaimId } });
})
.then(({ dataValues }) => {
if (dataValues) { // 3. if a match is found locally, serve that claim
logger.debug('Result found in File table:', dataValues);
.then(result => {
// 3. if a match is found locally, serve that claim
if (result) {
logger.debug('Result found in File table:', result.dataValues);
// return the data for the file to be served
resolve(dataValues); // break out of the chain???
resolve(result.dataValues);
// update the file, as needed
updateFileIfNeeded(uri, name, claimId, dataValues.outpoint, dataValues.outpoint);
updateFileIfNeeded(uri, name, claimId, result.dataValues.outpoint, result.dataValues.outpoint);
// 3. if a match was not found use the daemon to retrieve the claim & return the db data once it is created
} else { // 4. resolve the Uri
} else {
logger.debug('No result found in File table,');
lbryApi
.resolveUri(uri)
.then(result => {
// check to make sure the result is a claim
if (!result.claim) {
if (!result.claim) { // check to make sure the result is a claim
logger.debug('resolve did not return a claim');
resolve(null);
}
// check to see if the claim is free & public
if (isFreePublicClaim(result.claim)) {
if (isFreePublicClaim(result.claim)) { // check to see if the claim is free & public
// get claim and serve
resolve(getClaimAndReturnResponse(uri, result.claim.address, result.claim.height));
} else {