Merge pull request #185 from mediamicroservices/makederiv

makederiv

finishpackage

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

ingestfile

@@ -491,16 +491,16 @@ else
     fi
 fi
 
-unset MAKEBROADCASTOPTS
-[ "${AUDIODECISION}" == "Only use left of the first audio track [for 21st Century]" -o "${AUDIODECISION}" == "left" ] && MAKEBROADCASTOPTS+=(-l)
-[ "${AUDIODECISION}" == "Only use right of the first audio track" ] && MAKEBROADCASTOPTS+=(-r)
-[ "${CROPDECISION}" == "Examine the video and auto-crop out black borders (slower)" ] && MAKEBROADCASTOPTS+=(-c)
+unset MAKEDERIVOPTS
+[ "${AUDIODECISION}" == "Only use left of the first audio track [for 21st Century]" -o "${AUDIODECISION}" == "left" ] && MAKEDERIVOPTS+=(-l)
+[ "${AUDIODECISION}" == "Only use right of the first audio track" ] && MAKEDERIVOPTS+=(-r)
+[ "${CROPDECISION}" == "Examine the video and auto-crop out black borders (slower)" ] && MAKEDERIVOPTS+=(-c)
 if [ ! -z "${FORMULA}" ] ; then
-    MAKEBROADCASTOPTS+=(-F "${FORMULA}")
+    MAKEDERIVOPTS+=(-F "${FORMULA}")
 fi
 #create slate version first and upload to omneon
 if [ "${SLATE_CHOICE}" = "Y" ] ; then
-    "${SCRIPTDIR}/makebroadcast" -s "${MAKEBROADCASTOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
+    "${SCRIPTDIR}/makederiv" -T broadcast -s "${MMAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
     if [ "${DELIVERYTOOMNEON}" == "Y" ] ; then
         _report -dt "STATUS Uploading ${OBJECTSDIR}/service/${MEDIAID%.*}_SLATE.mov to the OMNEON."
         "${SCRIPTDIR}/uploadomneon" "${OBJECTSDIR}/service/${MEDIAID%.*}_SLATE.mov"
@@ -510,7 +510,7 @@ if [ "${SLATE_CHOICE}" = "Y" ] ; then
 fi
 
 # make copy for broadcast
-"${SCRIPTDIR}/makebroadcast" "${MAKEBROADCASTOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
+"${SCRIPTDIR}/makederiv" -T broadcast "${MAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
 
 # upload broadcast copy
 if [ "${DELIVERYTOOMNEON}" == "Y" ] ; then
@@ -522,8 +522,8 @@ fi
 # make access copies
 if [ "${MAKEACCESSCOPIES}" == "Y" ] ; then
     _report -dt "STATUS Making access copies."
-    # makemp3
-    "${SCRIPTDIR}/makemp3" "${OUTDIR_INGESTFILE}/${MEDIAID}"
+    # make mp3
+    "${SCRIPTDIR}/makederiv" -T mp3 "${OUTDIR_INGESTFILE}/${MEDIAID}"
 
     # makeframes
     unset MAKEFRAMESOPTS
@@ -533,24 +533,24 @@ if [ "${MAKEACCESSCOPIES}" == "Y" ] ; then
     # make waveform
     "${SCRIPTDIR}/makewaveform" "${OUTDIR_INGESTFILE}/${MEDIAID}"
 
-    # makeyoutube
-    unset MAKEYOUTUBEOPTS
-    [ "${DELIVERACCESSCOPIES}" = "Y" ] && MAKEYOUTUBEOPTS=(-Y -d "${YOUTUBEDELIVER}")
-    "${SCRIPTDIR}/makeyoutube" "${MAKEYOUTUBEOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
+    # make copy for youtube
+    unset MAKEDERIVOPTS
+    [ "${DELIVERACCESSCOPIES}" = "Y" ] && MAKEDERIVOPTS=(-Y -d "${YOUTUBEDELIVER}")
+    "${SCRIPTDIR}/makederiv" -T youtube "${MAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
 
-    # makepodcast
+    # make podcast
     if [ $(echo "${MEDIAID}" | grep -E "${REGEX4PODCAST}") ] ; then
         _report -dt "${MEDIAID} qualifies for podcast creation."
-        unset MAKEPODCASTOPTS
-        [ "${DELIVERACCESSCOPIES}" == "Y" ] && MAKEPODCASTOPTS=(-d "${PODCASTDELIVER}")
-        "${SCRIPTDIR}/makepodcast" "${MAKEPODCASTOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
+        unset MAKEDERIVOPTS
+        [ "${DELIVERACCESSCOPIES}" == "Y" ] && MAKEDERIVOPTS=(-d "${PODCASTDELIVER}")
+        "${SCRIPTDIR}/makederiv" -T podcast "${MAKEDERIVOPTS[@]}" "${OUTDIR_INGESTFILE}/${MEDIAID}"
 
     else
         _report -dt "${MEDIAID} does NOT qualify for podcast creation, skipping."
-        _writeerrorlog "makepodcast" "${MEDIAID} did not qualify for podcast creation and was skipped."
+        _writeerrorlog "makederiv" -T podcast "${MEDIAID} did not qualify for podcast creation and was skipped."
     fi
-    # makedvd
-    "${SCRIPTDIR}/makedvd" "${OUTDIR_INGESTFILE}/${MEDIAID}"
+    # make dvd
+    "${SCRIPTDIR}/makederiv" -T dvd "${OUTDIR_INGESTFILE}/${MEDIAID}"
 fi
 
 # makemetadata