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

hoisted variables

Browse source
This commit is contained in:
bill bittner 2018-07-18 16:23:58 -07:00
parent 792fd0ab06
commit 9df3d68cf0
2 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
server/controllers/assets/serveByClaim/index.js
View file

@ -20,30 +20,26 @@ const serveByClaim = (req, res) => {
const { headers, ip, originalUrl, params } = req;
try {
// return early if channel request
const { isChannel } = lbryUri.parseIdentifier(params.claim);
let isChannel, hasFileExtension, claimName;
({ isChannel } = lbryUri.parseIdentifier(params.claim));
if (isChannel) {
logger.info('channel request:', { headers, ip, originalUrl, params });
logger.debug('channel request:', { headers, ip, originalUrl, params });
return handleShowRender(req, res);
}
// decide if this is a show request
const { hasFileExtension } = lbryUri.parseModifier(params.claim);
({ hasFileExtension } = lbryUri.parseModifier(params.claim));
if (determineRequestType(hasFileExtension, headers) === SHOW) {
logger.info('show request:', { headers, ip, originalUrl, params });
logger.debug('show request:', { headers, ip, originalUrl, params });
return handleShowRender(req, res);
}
// parse the claim
const { claimName } = lbryUri.parseClaim(params.claim);
// send google analytics
sendGAServeEvent(headers, ip, originalUrl);
// get the claim Id and then serve the asset
logger.info('serve request:', { headers, ip, originalUrl, params });
({ claimName } = lbryUri.parseClaim(params.claim));
logger.debug('serve request:', { headers, ip, originalUrl, params });
getClaimIdAndServeAsset(null, null, claimName, null, originalUrl, ip, res);
sendGAServeEvent(headers, ip, originalUrl);
} catch (error) {
return res.status(400).json({success: false, message: error.message});
}

21
server/controllers/assets/serveByIdentifierAndClaim/index.js
View file

@ -21,29 +21,26 @@ const serverByIdentifierAndClaim = (req, res) => {
const { headers, ip, originalUrl, params } = req;
try {
// decide if this is a show request
const { hasFileExtension } = lbryUri.parseModifier(params.claim);
let hasFileExtension, claimName, isChannel, channelName, channelClaimId, claimId;
({ hasFileExtension } = lbryUri.parseModifier(params.claim));
if (determineRequestType(hasFileExtension, headers) === SHOW) {
logger.info('show request:', { headers, ip, originalUrl, params });
logger.debug('show request:', { headers, ip, originalUrl, params });
return handleShowRender(req, res);
}
// parse the indentifier and claim
let { claimName } = lbryUri.parseClaim(params.claim);
let { isChannel, channelName, channelClaimId, claimId } = lbryUri.parseIdentifier(params.identifier);
({ claimName } = lbryUri.parseClaim(params.claim));
({ isChannel, channelName, channelClaimId, claimId } = lbryUri.parseIdentifier(params.identifier));
// for backwards compatability, flip claim name and claim id if necessary
if (!isChannel) {
[claimId, claimName] = flipClaimNameAndId(claimId, claimName);
}
// send google analytics
sendGAServeEvent(headers, ip, originalUrl);
// get the claim Id and then serve the asset
logger.info('serve request:', { headers, ip, originalUrl, params });
logger.debug('serve request:', { headers, ip, originalUrl, params });
getClaimIdAndServeAsset(channelName, channelClaimId, claimName, claimId, originalUrl, ip, res);
sendGAServeEvent(headers, ip, originalUrl);
} catch (error) {
return res.status(400).json({success: false, message: error.message});
}