removed duplicate templates
This commit is contained in:
bill bittner
parent
859654e6e4
commit
cda9efa800
17 changed files with 374 additions and 388 deletions
controllers
|
|
@ -1,105 +1,8 @@
|
|||
const lbryApi = require('../helpers/lbryApi.js');
|
||||
const db = require('../models');
|
||||
const logger = require('winston');
|
||||
const { serveFile, showFile, showFileLite } = require('../helpers/serveHelpers.js');
|
||||
const { postToStats, sendGoogleAnalytics } = require('../controllers/statsController.js');
|
||||
|
||||
const SERVE = 'SERVE';
|
||||
const SHOW = 'SHOW';
|
||||
const SHOWLITE = 'SHOWLITE';
|
||||
const DEFAULT_THUMBNAIL = 'https://spee.ch/assets/img/video_thumb_default.png';
|
||||
const NO_CHANNEL = 'NO_CHANNEL';
|
||||
const NO_CLAIM = 'NO_CLAIM';
|
||||
|
||||
function checkForLocalAssetByClaimId (claimId, name) {
|
||||
logger.debug(`checkForLocalAssetsByClaimId(${claimId}, ${name}`);
|
||||
return new Promise((resolve, reject) => {
|
||||
db.File
|
||||
.findOne({where: { name, claimId }})
|
||||
.then(result => {
|
||||
if (result) {
|
||||
resolve(result.dataValues);
|
||||
} else {
|
||||
resolve(null);
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function addGetResultsToFileRecord (fileInfo, getResult) {
|
||||
fileInfo.fileName = getResult.file_name;
|
||||
fileInfo.filePath = getResult.download_path;
|
||||
fileInfo.fileType = getResult.mime_type;
|
||||
return fileInfo;
|
||||
}
|
||||
|
||||
function createFileRecord ({ name, claimId, outpoint, height, address, nsfw }) {
|
||||
return {
|
||||
name,
|
||||
claimId,
|
||||
outpoint,
|
||||
height,
|
||||
address,
|
||||
fileName: '',
|
||||
filePath: '',
|
||||
fileType: '',
|
||||
nsfw,
|
||||
};
|
||||
}
|
||||
|
||||
function getAssetByLongClaimId (fullClaimId, name) {
|
||||
logger.debug('...getting asset by claim Id...');
|
||||
return new Promise((resolve, reject) => {
|
||||
// 1. check locally for claim
|
||||
checkForLocalAssetByClaimId(fullClaimId, name)
|
||||
.then(dataValues => {
|
||||
// if a result was found, return early with the result
|
||||
if (dataValues) {
|
||||
logger.debug('found a local file for this name and claimId');
|
||||
resolve(dataValues);
|
||||
return;
|
||||
}
|
||||
logger.debug('no local file found for this name and claimId');
|
||||
// 2. if no local claim, resolve and get the claim
|
||||
db.Claim
|
||||
.resolveClaim(name, fullClaimId)
|
||||
.then(resolveResult => {
|
||||
// if no result, return early (claim doesn't exist or isn't free)
|
||||
if (!resolveResult) {
|
||||
resolve(NO_CLAIM);
|
||||
return;
|
||||
}
|
||||
logger.debug('resolve result >> ', resolveResult.dataValues);
|
||||
let fileRecord = {};
|
||||
// get the claim
|
||||
lbryApi.getClaim(`${name}#${fullClaimId}`)
|
||||
.then(getResult => {
|
||||
logger.debug('getResult >>', getResult);
|
||||
fileRecord = createFileRecord(resolveResult);
|
||||
fileRecord = addGetResultsToFileRecord(fileRecord, getResult);
|
||||
// insert a record in the File table & Update Claim table
|
||||
return db.File.create(fileRecord);
|
||||
})
|
||||
.then(() => {
|
||||
logger.debug('File record successfully updated');
|
||||
resolve(fileRecord);
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function chooseThumbnail (claimInfo, defaultThumbnail) {
|
||||
if (!claimInfo.thumbnail || claimInfo.thumbnail.trim() === '') {
|
||||
|
|
@ -109,42 +12,38 @@ function chooseThumbnail (claimInfo, defaultThumbnail) {
|
|||
}
|
||||
|
||||
module.exports = {
|
||||
getAssetByClaim (claimName, claimId) {
|
||||
logger.debug(`getAssetByClaim(${claimName}, ${claimId})`);
|
||||
getClaimId (channelName, channelId, name, claimId) {
|
||||
if (channelName) {
|
||||
return module.exports.getClaimIdByChannel(channelName, channelId, name);
|
||||
} else {
|
||||
return module.exports.getClaimIdByClaim(name, claimId);
|
||||
}
|
||||
},
|
||||
getClaimIdByClaim (claimName, claimId) {
|
||||
logger.debug(`getClaimIdByClaim(${claimName}, ${claimId})`);
|
||||
return new Promise((resolve, reject) => {
|
||||
db.Claim.getLongClaimId(claimName, claimId) // 1. get the long claim id
|
||||
.then(result => { // 2. get the asset using the long claim id
|
||||
logger.debug('long claim id ===', result);
|
||||
if (result === NO_CLAIM) {
|
||||
logger.debug('resolving NO_CLAIM');
|
||||
resolve(NO_CLAIM);
|
||||
return;
|
||||
}
|
||||
resolve(getAssetByLongClaimId(result, claimName));
|
||||
db.Claim.getLongClaimId(claimName, claimId) // get the long claim id
|
||||
.then(result => {
|
||||
resolve(result); // resolves with NO_CLAIM or valid claim id
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
});
|
||||
});
|
||||
},
|
||||
getAssetByChannel (channelName, channelId, claimName) {
|
||||
logger.debug('getting asset by channel');
|
||||
getClaimIdByChannel (channelName, channelId, claimName) {
|
||||
logger.debug(`getClaimIdByChannel(${channelName}, ${channelId}, ${claimName})`);
|
||||
return new Promise((resolve, reject) => {
|
||||
db.Certificate.getLongChannelId(channelName, channelId) // 1. get the long channel id
|
||||
.then(result => { // 2. get the long claim Id
|
||||
.then(result => {
|
||||
if (result === NO_CHANNEL) {
|
||||
resolve(NO_CHANNEL);
|
||||
resolve(result); // resolves NO_CHANNEL
|
||||
return;
|
||||
}
|
||||
return db.Claim.getClaimIdByLongChannelId(result, claimName);
|
||||
return db.Claim.getClaimIdByLongChannelId(result, claimName); // 2. get the long claim id
|
||||
})
|
||||
.then(result => { // 3. get the asset using the long claim id
|
||||
logger.debug('asset claim id =', result);
|
||||
if (result === NO_CHANNEL || result === NO_CLAIM) {
|
||||
resolve(result);
|
||||
return;
|
||||
}
|
||||
resolve(getAssetByLongClaimId(result, claimName));
|
||||
.then(result => {
|
||||
resolve(result); // resolves with NO_CLAIM or valid claim id
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error);
|
||||
|
|
@ -172,7 +71,7 @@ module.exports = {
|
|||
})
|
||||
.then(result => { // 4. add extra data not available from Claim table
|
||||
if (result === NO_CHANNEL) {
|
||||
resolve(NO_CHANNEL);
|
||||
resolve(result);
|
||||
return;
|
||||
}
|
||||
if (result) {
|
||||
|
|
@ -197,57 +96,23 @@ module.exports = {
|
|||
});
|
||||
});
|
||||
},
|
||||
serveOrShowAsset (fileInfo, extension, method, headers, originalUrl, ip, res) {
|
||||
// add file extension to the file info
|
||||
if (extension === 'gifv') {
|
||||
fileInfo['fileExt'] = 'gifv';
|
||||
} else {
|
||||
fileInfo['fileExt'] = fileInfo.fileName.substring(fileInfo.fileName.lastIndexOf('.') + 1);
|
||||
}
|
||||
// add a record to the stats table
|
||||
postToStats(method, originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success');
|
||||
// serve or show
|
||||
switch (method) {
|
||||
case SERVE:
|
||||
serveFile(fileInfo, res);
|
||||
sendGoogleAnalytics(method, headers, ip, originalUrl);
|
||||
return fileInfo;
|
||||
case SHOWLITE:
|
||||
return db.Claim.resolveClaim(fileInfo.name, fileInfo.claimId)
|
||||
.then(claimRecord => {
|
||||
fileInfo['title'] = claimRecord.title;
|
||||
fileInfo['description'] = claimRecord.description;
|
||||
showFileLite(fileInfo, res);
|
||||
return fileInfo;
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error('throwing serverOrShowAsset SHOWLITE error...');
|
||||
throw error;
|
||||
});
|
||||
case SHOW:
|
||||
return db.Claim
|
||||
.getShortClaimIdFromLongClaimId(fileInfo.claimId, fileInfo.name)
|
||||
.then(shortId => {
|
||||
fileInfo['shortId'] = shortId;
|
||||
return db.Claim.resolveClaim(fileInfo.name, fileInfo.claimId);
|
||||
})
|
||||
.then(resolveResult => {
|
||||
logger.debug('resolve result >>', resolveResult.dataValues);
|
||||
fileInfo['thumbnail'] = chooseThumbnail(resolveResult, DEFAULT_THUMBNAIL);
|
||||
fileInfo['title'] = resolveResult.title;
|
||||
fileInfo['description'] = resolveResult.description;
|
||||
if (resolveResult.certificateId) { fileInfo['certificateId'] = resolveResult.certificateId };
|
||||
if (resolveResult.channelName) { fileInfo['channelName'] = resolveResult.channelName };
|
||||
showFile(fileInfo, res);
|
||||
return fileInfo;
|
||||
})
|
||||
.catch(error => {
|
||||
logger.error('throwing serverOrShowAsset SHOW error...');
|
||||
throw error;
|
||||
});
|
||||
default:
|
||||
logger.error('I did not recognize that method');
|
||||
break;
|
||||
}
|
||||
getLocalFileRecord (claimId, name) {
|
||||
return db.File.findOne({where: {claimId, name}})
|
||||
.then(file => {
|
||||
if (!file) {
|
||||
return null;
|
||||
}
|
||||
return file.dataValues;
|
||||
});
|
||||
},
|
||||
getClaimRecord (claimId, name) {
|
||||
return db.Claim.findOne({where: {claimId, name}})
|
||||
.then(claim => {
|
||||
if (!claim) {
|
||||
throw new Error('no record found in Claim table');
|
||||
}
|
||||
claim.dataValues.thumbnail = chooseThumbnail(claim.dataValues.thumbnail, DEFAULT_THUMBNAIL);
|
||||
return claim.dataValues;
|
||||
});
|
||||
},
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue