Skip to content

Commit

Permalink
Merge pull request #645 from rfcx/fix-error-null-message
Browse files Browse the repository at this point in the history
Add return and remove log
  • Loading branch information
Tooseriuz authored Aug 21, 2024
2 parents 6a79431 + f024d08 commit 6f3888e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions noncore/views/v1/models/guardian-audio.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ exports.models = {
// auto-generate the asset filepath if it's not stored in the url column
const segment = await StreamSegment.findOne({ where: { stream_id: dbRow.Guardian.stream_id, start: dbRow.measured_at } })
if (!segment) {
res.status(404).json({ msg: 'Recording not found' })
return res.status(404).json({ msg: 'Recording not found' })
}
const dateTimeString = dbRow.measured_at.toISOString().substr(0, 19).replace(/:/g, '-')
const audioPath = `/${dateTimeString.substr(0, 4)}/${dateTimeString.substr(5, 2)}/${dateTimeString.substr(8, 2)}/${dbRow.Guardian.stream_id}/${segment.id}.${dbRow.Format.file_extension}`
const audioStorageUrl = (dbRow.url == null)
? 's3://' + process.env.INGEST_BUCKET + audioPath
: dbRow.url
console.info(audioStorageUrl)

audioUtils.cacheSourceAudio(audioStorageUrl)
.then(function ({ sourceFilePath }) {
if ((dbRow.Format.file_extension === outputFileExtension) &&
Expand Down Expand Up @@ -93,7 +93,7 @@ exports.models = {
// auto-generate the asset filepath if it's not stored in the url column
const segment = await StreamSegment.findOne({ where: { stream_id: dbRow.Guardian.stream_id, start: dbRow.measured_at } })
if (!segment) {
res.status(404).json({ msg: 'Recording not found' })
return res.status(404).json({ msg: 'Recording not found' })
}
const dateTimeString = dbRow.measured_at.toISOString().substr(0, 19).replace(/:/g, '-')
const audioPath = `/${dateTimeString.substr(0, 4)}/${dateTimeString.substr(5, 2)}/${dateTimeString.substr(8, 2)}/${dbRow.Guardian.stream_id}/${segment.id}.${dbRow.Format.file_extension}`
Expand Down

0 comments on commit 6f3888e

Please sign in to comment.