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

Merge pull request #137 from lbryio/resolve-all-free-claims

Browse source 
removed restrictions on what licenses are resolved
This commit is contained in:
Bill Bittner 2017-08-08 17:36:40 -07:00 committed by GitHub
commit 965ae1c360
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/serveController.js
View file

@ -2,7 +2,7 @@ const lbryApi = require('../helpers/lbryApi.js');
const db = require('../models'); const db = require('../models');
const logger = require('winston'); const logger = require('winston');
const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js'); const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js');
const isFreePublicClaim = require('../helpers/functions/isFreePublicClaim.js'); const isFreeClaim = require('../helpers/functions/isFreeClaim.js');
const serveHelpers = require('../helpers/serveHelpers.js'); const serveHelpers = require('../helpers/serveHelpers.js');
function checkForLocalAssetByClaimId (claimId, name) { function checkForLocalAssetByClaimId (claimId, name) {
@ -50,7 +50,7 @@ function getAssetByClaimId (fullClaimId, name) {
lbryApi.resolveUri(`${name}#${fullClaimId}`) lbryApi.resolveUri(`${name}#${fullClaimId}`)
.then(resolveResult => { .then(resolveResult => {
// if the claim is free and public, then get it // if the claim is free and public, then get it
if (resolveResult.claim && isFreePublicClaim(resolveResult.claim)) { if (resolveResult.claim && isFreeClaim(resolveResult.claim)) {
lbryApi.getClaim(`${name}#${fullClaimId}`) lbryApi.getClaim(`${name}#${fullClaimId}`)
.then(getResult => { .then(getResult => {
let fileInfo = formatGetResultsToFileInfo(getResult); let fileInfo = formatGetResultsToFileInfo(getResult);

4
helpers/functions/getAllFreePublicClaims.js
View file

@ -1,4 +1,4 @@
const isFreePublicClaim = require('./isFreePublicClaim.js'); const isFreeClaim = require('./isFreeClaim.js');
const lbryApi = require('../lbryApi.js'); const lbryApi = require('../lbryApi.js');
const logger = require('winston'); const logger = require('winston');
@ -11,7 +11,7 @@ function filterForFreePublicClaims (claimsListArray) {
if (!claim.value) { if (!claim.value) {
return false; return false;
} }
return isFreePublicClaim(claim); return isFreeClaim(claim);
}); });
return freePublicClaims; return freePublicClaims;
} }

11
helpers/functions/isFreeClaim.js Normal file
View file

@ -0,0 +1,11 @@
const logger = require('winston');
module.exports = ({ value }) => {
if (!value.stream.metadata.fee || value.stream.metadata.fee.amount === 0) {
logger.debug('isFreeClaim?', true);
return true;
} else {
logger.debug('isFreePublicClaim?', false);
return false;
}
};

12
helpers/functions/isFreePublicClaim.js
View file

@ -1,12 +0,0 @@
const logger = require('winston');
const licenses = ['Creative Commons', 'Public Domain', 'Creative Commons Attribution 4.0 International', 'Creative Commons Attribution-ShareAlike 4.0 International', 'Creative Commons Attribution-NoDerivatives 4.0 International', 'Creative Commons Attribution-NonCommercial 4.0 International', 'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International', 'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International'];
module.exports = ({ value }) => {
if ((licenses.includes(value.stream.metadata.license)) && (!value.stream.metadata.fee || value.stream.metadata.fee.amount === 0)) {
logger.debug('checking isFreePublicClaim...', true);
return true;
} else {
logger.debug('checking isFreePublicClaim...', false);
return false;
}
};