improve naming, add podcasts, adapt to cron container v0.2.0

Author: madebyTimo

Dockerfile

@@ -3,12 +3,11 @@ FROM madebytimo/cron
 RUN install-autonomous.sh install Basics FFmpeg Fileorganizer Java Scripts YtDlp \
     && rm -rf /var/lib/apt/lists/*
 
-RUN mv /entrypoint.sh /entrypoint-cron.sh
 COPY files/downloader.sh files/entrypoint.sh /usr/local/bin/
 
 ENV DOWNLOADER_CRON="30 20 * * *"
 ENV DOWNLOADER_LIST=""
 ENV POST_EXECUTION_COMMAND=""
 
 ENTRYPOINT [ "entrypoint.sh" ]
-CMD [ "sleep", "infinity" ]
+CMD [ "run-cron.sh" ]

Readme.md

@@ -17,7 +17,7 @@ It downloads all new files from the given urls at the given cron schedule.
     - The time to run the downloader. The default is `30 20 * * *`
 - `DOWNLOADER_LIST`
     - List of urls to download. One per line. No spaces in url allowed.
-        List is in the format `[[movie|music|musicvideo|series]] URL ((NOTE))`.
+        List is in the format `[[movie|music|musicvideo|podcast|series]] URL ((NOTE))`.
 - `POST_EXECUTION_COMMAND`
     - Command to run when the downloads are finished and new files are downloaded.
 

Version.txt

@@ -1 +1 @@
-v0.2.0
+v0.3.0

docker-compose-dev.yaml

@@ -14,11 +14,16 @@ services:
                 music https://www.youtube.com/watch?v=HJpDlGvY6YE
                 musicvideo https://www.youtube.com/watch?v=HJpDlGvY6YE
                 news https://www.youtube.com/watch?v=HJpDlGvY6YE
+                podcast https://www.youtube.com/watch?v=HJpDlGvY6YE
                 series https://www.youtube.com/watch?v=HJpDlGvY6YE
                 xyz https://www.youtube.com/watch?v=HJpDlGvY6YE
             - POST_EXECUTION_COMMAND=echo 'Here is post execution command.'
             # - DOWNLOADER_CRON=* * * * *
+        read_only: true
         tmpfs:
+            - /media/cron
             - /media/workdir
+            - /run
+            - /tmp:exec
         volumes:
             - "./data-local:/media/downloader"

files/downloader.sh

@@ -1,27 +1,34 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 CONFIG_DIR="/media/downloader/config"
 FAIL_DIR="/media/downloader/fail"
-LOCK_FILE="/run/lock/$(basename "$0").lock"
+LOCK_FILE="/dev/shm/$(basename "$0").lock"
 NEW_DOWNLOAD=false
 OUTPUT_DIR="/media/downloader/output"
 WORKDIR="/media/workdir"
 
 # Aquire lock
 if [ -e "$LOCK_FILE" ]; then
-    echo "Error: $(basename "$0") is already running. Exiting."
-    exit 1
+    echo "Error: Already running." >&2
+    exit 11
 fi
 touch "$LOCK_FILE"
 
+function cleanup {
+    rm "$LOCK_FILE"
+}
+trap cleanup EXIT
+
 echo "Start downloader"
 
 mapfile -t DOWNLOADER_ITEMS_FILE </media/downloader/downloader-list.txt
 mapfile -t DOWNLOADER_ITEMS_ENVIRONMENT_VARIABLE \
     </media/downloader/downloader-list-from-environment-variable.txt
 DOWNLOADER_ITEMS=("${DOWNLOADER_ITEMS_ENVIRONMENT_VARIABLE[@]}" "${DOWNLOADER_ITEMS_FILE[@]}")
 
+AUDIO_DEFAULT_ARGUMENTS=(--extract-audio --audio-format "opus" --format "bestaudio/best" \
+    --format-sort "acodec:opus,acodec:mp3,acodec:aac" )
 VIDEO_DEFAULT_ARGUMENTS=(--format "bestvideo[language=?deu]+(bestaudio[language~=?'deu?'],\
 bestaudio[language~=?'deu?'][format_note*=Audiodeskription],bestaudio[language~='eng?'])/best" \
     --format-sort "res,vcodec:av01,acodec:opus,vcodec:vp9,vcodec:h264" \
@@ -44,11 +51,12 @@ for ITEM in "${DOWNLOADER_ITEMS[@]}"; do
     YT_DLP_ARGUMENTS=()
     if [[ "$TYPE" == movie ]]; then
         YT_DLP_ARGUMENTS=("${VIDEO_DEFAULT_ARGUMENTS[@]}" --output \
-        "${WORKDIR}/%(title)s (%(release_date>%Y,upload_date>%Y)s) [%(language).2s].%(ext)s")
+        "${WORKDIR}/%(title)s (%(release_date>%Y,upload_date>%Y)s)\
+%(format_note& - {}|)s [%(language).2s].%(ext)s")
     elif [[ "$TYPE" == music ]]; then
         RUN_FILENAME_SANITIZE=true
         RUN_FILEORGANIZER=true
-        YT_DLP_ARGUMENTS=(--extract-audio --audio-format "opus" \
+        YT_DLP_ARGUMENTS=("${AUDIO_DEFAULT_ARGUMENTS[@]}" \
         --postprocessor-args "ThumbnailsConvertor+ffmpeg_o:-c:v \
         mjpeg -vf crop=\"'if(gt(ih,iw),iw,ih)':'if(gt(iw,ih),ih,iw)'\"" \
         --output "${WORKDIR}/%(creator).80s - %(title)s.%(ext)s")
@@ -60,11 +68,15 @@ for ITEM in "${DOWNLOADER_ITEMS[@]}"; do
         YT_DLP_ARGUMENTS=("${VIDEO_DEFAULT_ARGUMENTS[@]}" --output \
         "${WORKDIR}/%(release_date>%Y.%m.%d,upload_date>%Y.%m.%d)s \
 %(playlist_title,channel)s - %(title)s \\[%(language).2s\\].%(ext)s")
+    elif [[ "$TYPE" == podcast ]]; then
+        YT_DLP_ARGUMENTS=("${AUDIO_DEFAULT_ARGUMENTS[@]}" --output \
+        "${WORKDIR}/%(release_date>%Y.%m.%d,upload_date>%Y.%m.%d)s \
+%(series,playlist_title,channel)s%(title& - {}|)s [%(language).2s].%(ext)s")
     elif [[ "$TYPE" == series ]]; then
         YT_DLP_ARGUMENTS=("${VIDEO_DEFAULT_ARGUMENTS[@]}" --output \
-        "${WORKDIR}/%(series,playlist_title)s S%(season_number|XX)02dE\
-%(episode_number,playlist_index|XX)02d%(title& |)s%(title|)s (%(release_date>%Y,upload_date>%Y)s) [\
-%(language).2s].%(ext)s")
+        "${WORKDIR}/%(series,playlist_title,channel)s S%(season_number|XX)02d\
+E%(episode_number,playlist_index|XX)02d%(title& {}|)s (%(release_date>%Y,upload_date>%Y)s)\
+%(format_note& - {}|)s [%(language).2s].%(ext)s")
     else
         echo "Type \"${TYPE}\" not supported."
         continue
@@ -122,10 +134,7 @@ tok.*)\)//gi" \
     done
 done
 
-POST_EXECUTION_COMMAND="$(cat /tmp/post-execution-command)"
+POST_EXECUTION_COMMAND="$(cat /dev/shm/downloader-post-execution-command)"
 if [[ "$NEW_DOWNLOAD" == true ]] && [[ -n "$POST_EXECUTION_COMMAND" ]]; then
     eval "$POST_EXECUTION_COMMAND"
 fi
-
-# Release lock
-rm "$LOCK_FILE"

files/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
-DOWNLOAD_TYPES=(movie music musicvideo news series)
+DOWNLOAD_TYPES=(movie music musicvideo news podcast series)
 
 mkdir --parents /media/downloader/fail
 mkdir --parents /media/workdir
@@ -10,12 +10,10 @@ for DOWNLOAD_TYPE in "${DOWNLOAD_TYPES[@]}"; do
     mkdir --parents "/media/downloader/config/$DOWNLOAD_TYPE"
 done
 
-rm -f /run/lock/downloader.sh.lock
-
 echo "$DOWNLOADER_LIST" > /media/downloader/downloader-list-from-environment-variable.txt
 chmod a-w /media/downloader/downloader-list-from-environment-variable.txt
 
-echo "${POST_EXECUTION_COMMAND}" > /tmp/post-execution-command
+echo "${POST_EXECUTION_COMMAND}" > /dev/shm/downloader-post-execution-command
 
 echo "$DOWNLOADER_CRON root bash --login -c 'downloader.sh > /proc/1/fd/1 2>&1'" \
     > /media/cron/downloader
@@ -26,4 +24,4 @@ if [[ ! -e /media/downloader/downloader-list.txt ]]; then
     > /media/downloader/downloader-list.txt
 fi
 
-exec /entrypoint-cron.sh "$@"
+"$@"