Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
@tamarahills
tamarahills committed Aug 23, 2018
1 parent 25db4a5 commit 61c134d
Showing 1 changed file with 52 additions and 114 deletions.
166 changes: 52 additions & 114 deletions command/CommandController.js
View file
Expand Up @@ -169,69 +169,64 @@ router.post('/articleservice', VerifyToken, async function(req, res) {
logger.info(`POST /articleservice: ${req.body.url} ${req.body.article_id}`);
logMetric('articleservice', req.body.url, req.get('User-Agent'));
res.setHeader('Content-Type', 'application/json');
let version = req.body.version;

if (version && version == '2') {
try {
let mobileMetadata;
if (req.body.article_id) {
// we have a pocket item. do we already have the audio file?
mobileMetadata = await audioHelper.getMobileFileMetadata(
req.body.article_id
);
logger.info('audioUrl: ' + mobileMetadata.fileUrl);
} else {
logger.info('error: missing article_id');
}
try {
let mobileMetadata;
if (req.body.article_id) {
// we have a pocket item. do we already have the audio file?
mobileMetadata = await audioHelper.getMobileFileMetadata(
req.body.article_id
);
logger.info('audioUrl: ' + mobileMetadata.fileUrl);
} else {
logger.info('error: missing article_id');
}

// if we didn't find it in the DB, create the audio file
if (!mobileMetadata || !mobileMetadata.fileUrl) {
logger.info('Did not find the audio URL in DB: ' + req.body.article_id);
// Create the body as a local file.
let article = await getPocketArticleTextFromUrl(req.body.url);
if (article) {
// Build the stitched file first
let articleFile = await createAudioFileFromText(`${article.article}`);
let introFile = await createAudioFileFromText(buildIntro(article));
let audioMetadata = await buildPocketAudio(introFile, articleFile);
logger.debug('Calling StoreMobileLocation: ' + audioMetadata.url);
await audioHelper.storeMobileLocation(
req.body.article_id,
audioMetadata.url,
audioMetadata.duration
);
let response = buildPocketResponse(audioMetadata);
// Send it back to the mobile as quick as possible.
logger.info('POST article resp: ' + JSON.stringify(response));
res.status(200).send(JSON.stringify(response));

// Upload the individual parts for use by Alexa later & cleanup.
let introUrl = await polly_tts.postProcessPart(introFile);
let articleUrl = await polly_tts.postProcessPart(articleFile);
await audioHelper.storeIntroLocation(
req.body.article_id,
introUrl,
false
);
await audioHelper.storeAudioFileLocation(
req.body.article_id,
articleUrl,
false
);
}
} else {
logger.debug('Found the file in the database');
let response = await buildPocketResponseFromMetadata(mobileMetadata);
// if we didn't find it in the DB, create the audio file
if (!mobileMetadata || !mobileMetadata.fileUrl) {
logger.info('Did not find the audio URL in DB: ' + req.body.article_id);
// Create the body as a local file.
let article = await getPocketArticleTextFromUrl(req.body.url);
if (article) {
// Build the stitched file first
let articleFile = await createAudioFileFromText(`${article.article}`);
let introFile = await createAudioFileFromText(buildIntro(article));
let audioMetadata = await buildPocketAudio(introFile, articleFile);
logger.debug('Calling StoreMobileLocation: ' + audioMetadata.url);
await audioHelper.storeMobileLocation(
req.body.article_id,
audioMetadata.url,
audioMetadata.duration
);
let response = buildPocketResponse(audioMetadata);
// Send it back to the mobile as quick as possible.
logger.info('POST article resp: ' + JSON.stringify(response));
res.status(200).send(JSON.stringify(response));

// Upload the individual parts for use by Alexa later & cleanup.
let introUrl = await polly_tts.postProcessPart(introFile);
let articleUrl = await polly_tts.postProcessPart(articleFile);
await audioHelper.storeIntroLocation(
req.body.article_id,
introUrl,
false
);
await audioHelper.storeAudioFileLocation(
req.body.article_id,
articleUrl,
false
);
}
} catch (reason) {
logger.error('Error in /articleservice ' + reason);
const errSpeech = `There was an error processing the article. ${reason}`;
res.status(404).send(JSON.stringify({ speech: errSpeech }));
} else {
logger.debug('Found the file in the database');
let response = await buildPocketResponseFromMetadata(mobileMetadata);
logger.info('POST article resp: ' + JSON.stringify(response));
res.status(200).send(JSON.stringify(response));
}
} else {
await v1ArticleService(req, res);
} catch (reason) {
logger.error('Error in /articleservice ' + reason);
const errSpeech = `There was an error processing the article. ${reason}`;
res.status(404).send(JSON.stringify({ speech: errSpeech }));
}
});

Expand Down Expand Up @@ -293,63 +288,6 @@ function logMetric(cmd, userid, agent) {
}
}

async function v1ArticleService(req, res) {
try {
let audioUrl;
if (req.body.article_id) {
// we have a pocket item. do we already have the audio file?
audioUrl = await audioHelper.getMobileFileLocation(
req.body.article_id,
false
);
logger.info('audioUrl: ' + audioUrl);
} else {
logger.info('error: missing article_id');
}
let result = {};
// if we didn't find it in the DB, create the audio file
if (!audioUrl) {
logger.info('Did not find the audio URL in DB: ' + req.body.article_id);
// Create the body as a local file.
let article = await getPocketArticleTextFromUrl(req.body.url);
if (article) {
// Build the stitched file first
let articleFile = await createAudioFileFromText(`${article.article}`);
let introFile = await createAudioFileFromText(buildIntro(article));
let audioUrl = await buildPocketAudio(introFile, articleFile);
logger.debug('Calling StoreMobileLocation: ' + audioUrl);
await audioHelper.storeMobileLocation(req.body.article_id, audioUrl);
result.url = audioUrl;
// Send it back to the mobile as quick as possible.
logger.info('POST article resp: ' + JSON.stringify(result));
res.status(200).send(JSON.stringify(result));

// Upload the individual parts for use by Alexa later & cleanup.
let introUrl = await polly_tts.postProcessPart(introFile);
let articleUrl = await polly_tts.postProcessPart(articleFile);
await audioHelper.storeIntroLocation(
req.body.article_id,
introUrl,
false
);
await audioHelper.storeAudioFileLocation(
req.body.article_id,
articleUrl,
false
);
}
} else {
result.url = audioUrl;
logger.info('POST article resp: ' + JSON.stringify(result));
res.status(200).send(JSON.stringify(result));
}
} catch (reason) {
logger.error('Error in /articleservice ' + reason);
const errSpeech = `There was an error processing the article. ${reason}`;
res.status(404).send(JSON.stringify({ speech: errSpeech }));
}
}

async function processArticleRequest(
req,
summaryOnly,
Expand Down

0 comments on commit 61c134d

Please sign in to comment.