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

added async await for dimension processing

Browse source
This commit is contained in:
bill bittner 2018-07-26 18:40:46 -07:00
parent 6da08a5f47
commit aa1784417e
2 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/controllers/api/claim/publish/publish.js
View file

@ -37,16 +37,18 @@ const publish = (publishParams, fileName, fileType) => {
logger.debug(`certificateId: ${certificateId}`);
})
.then(() => {
return Promise.all([
createFileRecordDataAfterPublish(fileName, fileType, publishParams, publishResults),
createClaimRecordDataAfterPublish(certificateId, channelName, fileName, fileType, publishParams, publishResults),
]);
})
.then(([fileRecord, claimRecord]) => {
// upsert the records
const {name, claim_id: claimId} = publishParams;
// create the File record
const fileRecord = createFileRecordDataAfterPublish(fileName, fileType, publishParams, publishResults);
// create the Claim record
const claimRecord = createClaimRecordDataAfterPublish(certificateId, channelName, fileName, fileType, publishParams, publishResults);
const upsertCriteria = {
name,
claimId,
};
// upsert the records
return Promise.all([
db.upsert(db.File, fileRecord, upsertCriteria, 'File'),
db.upsert(db.Claim, claimRecord, upsertCriteria, 'Claim'),

30
server/models/utils/createFileRecordData.js
View file

@ -1,7 +1,8 @@
const logger = require('winston');
const sizeOf = require('image-size');
const sizeOfImage = require('image-size');
const sizeOfVideo = require('get-video-dimensions');
const getFileDimensions = (fileType, filePath) => {
async function getFileDimensions (fileType, filePath) {
let height = 0;
let width = 0;
switch (fileType) {
@ -10,12 +11,16 @@ const getFileDimensions = (fileType, filePath) => {
case 'image/png':
case 'image/gif':
logger.debug('creating File data for an image');
const dimensions = sizeOf(filePath);
height = dimensions.height;
width = dimensions.width;
const imageDimensions = sizeOfImage(filePath);
height = imageDimensions.height;
width = imageDimensions.width;
break;
case 'video/mp4':
logger.debug('creating File data for a video');
const videoDimensions = await sizeOfVideo(filePath);
logger.debug('video dimensions', videoDimensions);
height = videoDimensions.height;
width = videoDimensions.width;
break;
default:
logger.error('unable to create File data for unspported file type:', fileType);
@ -25,9 +30,9 @@ const getFileDimensions = (fileType, filePath) => {
height,
width,
};
};
}
const createFileRecordDataAfterGet = (resolveResult, getResult) => {
async function createFileRecordDataAfterGet (resolveResult, getResult) {
const {
name,
claimId,
@ -43,7 +48,7 @@ const createFileRecordDataAfterGet = (resolveResult, getResult) => {
const {
height: fileHeight,
width: fileWidth,
} = getFileDimensions(fileType, filePath);
} = await getFileDimensions(fileType, filePath);
return {
name,
@ -57,7 +62,7 @@ const createFileRecordDataAfterGet = (resolveResult, getResult) => {
};
};
const createFileRecordDataAfterPublish = (fileName, fileType, publishParams, publishResults) => {
async function createFileRecordDataAfterPublish (fileName, fileType, publishParams, publishResults) {
const {
name,
file_path: filePath,
@ -69,7 +74,10 @@ const createFileRecordDataAfterPublish = (fileName, fileType, publishParams, pub
nout,
} = publishResults;
const { height: fileHeight, width: fileWidth } = getFileDimensions(fileType, filePath);
const {
height: fileHeight,
width: fileWidth,
} = await getFileDimensions(fileType, filePath);
return {
name,
@ -81,7 +89,7 @@ const createFileRecordDataAfterPublish = (fileName, fileType, publishParams, pub
filePath,
fileType,
};
};
}
module.exports = {
createFileRecordDataAfterGet,