Skip to content
Snippets Groups Projects
Commit 93e1ea37 authored by Jörg Sachse's avatar Jörg Sachse
Browse files

Merge branch 'sachse-master-patch-36622' into 'master'

fix: rename another one of the --mode's to match existing naming in prod

See merge request !5
parents 07beffc5 857ef7f8
No related branches found
No related tags found
1 merge request!5fix: rename another one of the --mode's to match existing naming in prod
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#hh watch-folder to invalid folder #hh watch-folder to invalid folder
#hh -s, --statistics #hh -s, --statistics
#hh print a statistic #hh print a statistic
#hh -m, --mode [auto, mediathek, fotothek, save, kitodo, digas] #hh -m, --mode [auto, mediathek, fotothek, save, ddz, digas]
#hh the mode 'auto' tries to check files based on file mime-types. #hh the mode 'auto' tries to check files based on file mime-types.
#hh The other modes are actual workflow names. #hh The other modes are actual workflow names.
#hh -d, --daemon #hh -d, --daemon
...@@ -89,14 +89,14 @@ validators[_______save_mkv__current]="/usr/bin/mediaconch -ft -p /etc/mediaconch ...@@ -89,14 +89,14 @@ validators[_______save_mkv__current]="/usr/bin/mediaconch -ft -p /etc/mediaconch
validators[_______save_mkv_upcoming]="/usr/bin/mediaconch -ft -p /etc/mediaconch/save_retrovideofilm_upcoming.xml FILE" validators[_______save_mkv_upcoming]="/usr/bin/mediaconch -ft -p /etc/mediaconch/save_retrovideofilm_upcoming.xml FILE"
validators[_______save_mka__current]="/usr/bin/mediaconch -ft -p /etc/mediaconch/save_retroaudio_current.xml FILE" validators[_______save_mka__current]="/usr/bin/mediaconch -ft -p /etc/mediaconch/save_retroaudio_current.xml FILE"
validators[_______save_mka_upcoming]="/usr/bin/mediaconch -ft -p /etc/mediaconch/save_retroaudio_current.xml FILE" validators[_______save_mka_upcoming]="/usr/bin/mediaconch -ft -p /etc/mediaconch/save_retroaudio_current.xml FILE"
validators[_____kitodo_tif__current]="/usr/bin/checkit_tiff_current /etc/checkit_tiff/retromono_current FILE" validators[________ddz_tif__current]="/usr/bin/checkit_tiff_current /etc/checkit_tiff/retromono_current FILE"
validators[_____kitodo_tif_upcoming]="/usr/bin/checkit_tiff_upcoming /etc/checkit_tiff/retromono_upcoming FILE" validators[________ddz_tif_upcoming]="/usr/bin/checkit_tiff_upcoming /etc/checkit_tiff/retromono_upcoming FILE"
validators[______digas_tif__current]="/usr/bin/checkit_tiff_current /etc/checkit_tiff/retrogeomono_current FILE" validators[______digas_tif__current]="/usr/bin/checkit_tiff_current /etc/checkit_tiff/retrogeomono_current FILE"
validators[______digas_tif_upcoming]="/usr/bin/checkit_tiff_upcoming /etc/checkit_tiff/retrogeomono_upcoming FILE" validators[______digas_tif_upcoming]="/usr/bin/checkit_tiff_upcoming /etc/checkit_tiff/retrogeomono_upcoming FILE"
validators[___fotothek_tif__current]="/usr/bin/checkit_tiff_current /etc/checkit_tiff/retrofoto_current FILE" validators[___fotothek_tif__current]="/usr/bin/checkit_tiff_current /etc/checkit_tiff/retrofoto_current FILE"
validators[___fotothek_tif_upcoming]="/usr/bin/checkit_tiff_upcoming /etc/checkit_tiff/retrofoto_upcoming FILE" validators[___fotothek_tif_upcoming]="/usr/bin/checkit_tiff_upcoming /etc/checkit_tiff/retrofoto_upcoming FILE"
validators[_____kitodo_icc__current]="/usr/local/bin/iccDumpProfile -v FILE" validators[________ddz_icc__current]="/usr/local/bin/iccDumpProfile -v FILE"
validators[_____kitodo_icc_upcoming]="/usr/local/bin/iccDumpProfile -v FILE" validators[________ddz_icc_upcoming]="/usr/local/bin/iccDumpProfile -v FILE"
set -o nounset # Treat unset variables as an error set -o nounset # Treat unset variables as an error
...@@ -269,9 +269,9 @@ get_cli_args() { ...@@ -269,9 +269,9 @@ get_cli_args() {
&& [ "$MODE" != "mediathek" ] \ && [ "$MODE" != "mediathek" ] \
&& [ "$MODE" != "fotothek" ] \ && [ "$MODE" != "fotothek" ] \
&& [ "$MODE" != "save" ] \ && [ "$MODE" != "save" ] \
&& [ "$MODE" != "kitodo" ] \ && [ "$MODE" != "ddz" ] \
&& [ "$MODE" != "digas" ]; then && [ "$MODE" != "digas" ]; then
error "param --mode must be 'auto', 'mediathek', 'fotothek', 'save', 'kitodo' or 'digas'!" error "param --mode must be 'auto', 'mediathek', 'fotothek', 'save', 'ddz' or 'digas'!"
exit 1 exit 1
fi fi
if [ "$WITH_PIPE" -eq 1 ]; then if [ "$WITH_PIPE" -eq 1 ]; then
...@@ -387,13 +387,13 @@ estimate_mode() { ...@@ -387,13 +387,13 @@ estimate_mode() {
debug "estimate_mode, using mimetype: $mimetype" debug "estimate_mode, using mimetype: $mimetype"
case ${mimetype} in case ${mimetype} in
"image/tiff") "image/tiff")
MODE="kitodo" MODE="ddz"
;; ;;
"video/x-matroska") "video/x-matroska")
MODE="save" MODE="save"
;; ;;
"application/vnd.iccprofile") "application/vnd.iccprofile")
MODE="kitodo" MODE="ddz"
;; ;;
*) *)
warn "workflow not detectable for mimetype $mimetype" warn "workflow not detectable for mimetype $mimetype"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment