Skip to content

Commit c501f85

Browse files
committed
Alias scripts
Alias scripts retain functionality but point to makederiv
1 parent c24d93a commit c501f85

10 files changed

+72
-1087
lines changed

finishpackage

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#finish package takes a directory input created by restructureforCompliance and creates derivative access copies, metadata documents, and a checksum file.
33
while [ "${*}" != "" ] ; do
44
INPUT="${1}"
5-
makelossless "${INPUT}" && makebroadcast "${INPUT}" && makeyoutube "${INPUT}" && makemetadata "${INPUT}" && checksumpackage "${INPUT}"
5+
makelossless "${INPUT}" && makederiv -T broadcast "${INPUT}" && makederiv -T youtube "${INPUT}" && makemetadata "${INPUT}" && checksumpackage "${INPUT}"
66
shift
77
done

ingestfile

+20-20
Original file line numberDiff line numberDiff line change
@@ -491,16 +491,16 @@ else
491491
fi
492492
fi
493493

494-
unset MAKEBROADCASTOPTS
495-
[ "${AUDIODECISION}" == "Only use left of the first audio track [for 21st Century]" -o "${AUDIODECISION}" == "left" ] && MAKEBROADCASTOPTS+=(-l)
496-
[ "${AUDIODECISION}" == "Only use right of the first audio track" ] && MAKEBROADCASTOPTS+=(-r)
497-
[ "${CROPDECISION}" == "Examine the video and auto-crop out black borders (slower)" ] && MAKEBROADCASTOPTS+=(-c)
494+
unset MAKEDERIVOPTS
495+
[ "${AUDIODECISION}" == "Only use left of the first audio track [for 21st Century]" -o "${AUDIODECISION}" == "left" ] && MAKEDERIVOPTS+=(-l)
496+
[ "${AUDIODECISION}" == "Only use right of the first audio track" ] && MAKEDERIVOPTS+=(-r)
497+
[ "${CROPDECISION}" == "Examine the video and auto-crop out black borders (slower)" ] && MAKEDERIVOPTS+=(-c)
498498
if [ ! -z "${FORMULA}" ] ; then
499-
MAKEBROADCASTOPTS+=(-F "${FORMULA}")
499+
MAKEDERIVOPTS+=(-F "${FORMULA}")
500500
fi
501501
#create slate version first and upload to omneon
502502
if [ "${SLATE_CHOICE}" = "Y" ] ; then
503-
"${SCRIPTDIR}/makebroadcast" -s "${MAKEBROADCASTOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
503+
"${SCRIPTDIR}/makederiv" -T broadcast -s "${MMAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
504504
if [ "${DELIVERYTOOMNEON}" == "Y" ] ; then
505505
_report -dt "STATUS Uploading ${OBJECTSDIR}/service/${MEDIAID%.*}_SLATE.mov to the OMNEON."
506506
"${SCRIPTDIR}/uploadomneon" "${OBJECTSDIR}/service/${MEDIAID%.*}_SLATE.mov"
@@ -510,7 +510,7 @@ if [ "${SLATE_CHOICE}" = "Y" ] ; then
510510
fi
511511

512512
# make copy for broadcast
513-
"${SCRIPTDIR}/makebroadcast" "${MAKEBROADCASTOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
513+
"${SCRIPTDIR}/makederiv" -T broadcast "${MAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
514514

515515
# upload broadcast copy
516516
if [ "${DELIVERYTOOMNEON}" == "Y" ] ; then
@@ -522,8 +522,8 @@ fi
522522
# make access copies
523523
if [ "${MAKEACCESSCOPIES}" == "Y" ] ; then
524524
_report -dt "STATUS Making access copies."
525-
# makemp3
526-
"${SCRIPTDIR}/makemp3" "${OUTDIR_INGESTFILE}/${MEDIAID}"
525+
# make mp3
526+
"${SCRIPTDIR}/makederiv" -T mp3 "${OUTDIR_INGESTFILE}/${MEDIAID}"
527527

528528
# makeframes
529529
unset MAKEFRAMESOPTS
@@ -533,24 +533,24 @@ if [ "${MAKEACCESSCOPIES}" == "Y" ] ; then
533533
# make waveform
534534
"${SCRIPTDIR}/makewaveform" "${OUTDIR_INGESTFILE}/${MEDIAID}"
535535

536-
# makeyoutube
537-
unset MAKEYOUTUBEOPTS
538-
[ "${DELIVERACCESSCOPIES}" = "Y" ] && MAKEYOUTUBEOPTS=(-Y -d "${YOUTUBEDELIVER}")
539-
"${SCRIPTDIR}/makeyoutube" "${MAKEYOUTUBEOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
536+
# make copy for youtube
537+
unset MAKEDERIVOPTS
538+
[ "${DELIVERACCESSCOPIES}" = "Y" ] && MAKEDERIVOPTS=(-Y -d "${YOUTUBEDELIVER}")
539+
"${SCRIPTDIR}/makederiv" -T youtube "${MAKEYOUTUBEOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
540540

541-
# makepodcast
541+
# make podcast
542542
if [ $(echo "${MEDIAID}" | grep -E "${REGEX4PODCAST}") ] ; then
543543
_report -dt "${MEDIAID} qualifies for podcast creation."
544-
unset MAKEPODCASTOPTS
545-
[ "${DELIVERACCESSCOPIES}" == "Y" ] && MAKEPODCASTOPTS=(-d "${PODCASTDELIVER}")
546-
"${SCRIPTDIR}/makepodcast" "${MAKEPODCASTOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
544+
unset MAKEDERIVOPTS
545+
[ "${DELIVERACCESSCOPIES}" == "Y" ] && MAKEDERIVOPTS=(-d "${PODCASTDELIVER}")
546+
"${SCRIPTDIR}/makederiv" -T podcast "${MAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
547547

548548
else
549549
_report -dt "${MEDIAID} does NOT qualify for podcast creation, skipping."
550-
_writeerrorlog "makepodcast" "${MEDIAID} did not qualify for podcast creation and was skipped."
550+
_writeerrorlog "makederiv" -T podcast "${MEDIAID} did not qualify for podcast creation and was skipped."
551551
fi
552-
# makedvd
553-
"${SCRIPTDIR}/makedvd" "${OUTDIR_INGESTFILE}/${MEDIAID}"
552+
# make dvd
553+
"${SCRIPTDIR}/makederiv" -T dvd "${OUTDIR_INGESTFILE}/${MEDIAID}"
554554
fi
555555

556556
# makemetadata

0 commit comments

Comments
 (0)