From c2383614f384adb0c131f27adac642cae7bf19fb Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Wed, 19 Jun 2024 00:44:51 -0700
Subject: [PATCH] default cron script

---
 docker/root/custom-cont-init.d/defaults-gui | 21 +++++++++------------
 docker/root/defaults/config.yaml            | 17 -----------------
 docker/root/defaults/cron_script            |  2 ++
 docker/testing/docker-compose.yml           |  1 -
 src/ytdl_sub/__init__.py                    |  4 ++--
 5 files changed, 13 insertions(+), 32 deletions(-)
 create mode 100644 docker/root/defaults/cron_script

diff --git a/docker/root/custom-cont-init.d/defaults-gui b/docker/root/custom-cont-init.d/defaults-gui
index 38cece86..e7ded513 100644
--- a/docker/root/custom-cont-init.d/defaults-gui
+++ b/docker/root/custom-cont-init.d/defaults-gui
@@ -7,6 +7,9 @@ fi
 
 echo "Checking ytdl-sub-gui defaults..."
 
+# clear the cron logs on start, always
+echo > /config/ytdl-sub-configs/cron_logs.txt
+
 # copy config
 [[ ! -e /config/ytdl-sub-configs/config.yaml ]] && \
     mkdir -p /config/ytdl-sub-configs && \
@@ -17,23 +20,17 @@ echo "Checking ytdl-sub-gui defaults..."
 [[ ! -d /config/ytdl-sub-configs/examples ]] && \
     mkdir -p /config/ytdl-sub-configs/examples && \
     cp /defaults/examples/* /config/ytdl-sub-configs/examples
+[[ ! -d /config/ytdl-sub-configs/cron_script ]] && \
+    mkdir -p /config/ytdl-sub-configs && \
+    cp /defaults/cron_script /config/ytdl-sub-configs/cron_script
 
-if [ "$CRON_ENABLE" = true ] ; then
-
-  # set cron schedule if not set
-  if [ -z "${CRON_SCHEDULE}" ]  ; then
-    CRON_SCHEDULE="0 */6 * * *"
-  fi
-
+if [ -n "$CRON_SCHEDULE" ] ; then
   # put it into the crontab file
   echo "# min hour day month weekday command" > /config/crontabs/abc
   echo " ${CRON_SCHEDULE} /config/ytdl-sub-configs/cron_script | tee -a /config/ytdl-sub-configs/cron_logs.txt" >> /config/crontabs/abc
 
-  # clear the cron logs on start, always
-  echo > /config/ytdl-sub-configs/cron_logs.txt
-
   # restart cron
-  /etc/init.d/cron restart
+  /etc/init.d/cron reload
 
   # check cron
   crontab -u abc -l
@@ -43,7 +40,7 @@ if [ "$CRON_ENABLE" = true ] ; then
     echo "Cron schedule is successfully set to ${CRON_SCHEDULE}"
     if [ "$CRON_RUN_ON_START" = true ] ; then
       # Run cron script on start
-      /config/ytdl-sub-configs/cron_script | tee -a /config/ytdl-sub-configs/cron_logs.txt &
+      su - abc -c "/config/ytdl-sub-configs/cron_script | tee -a /config/ytdl-sub-configs/cron_logs.txt" &
     fi
   else
     echo "Cron schedule is invalid, disabling"
diff --git a/docker/root/defaults/config.yaml b/docker/root/defaults/config.yaml
index 9a55063e..9383d08c 100644
--- a/docker/root/defaults/config.yaml
+++ b/docker/root/defaults/config.yaml
@@ -1,19 +1,2 @@
-# Bare-bones config. Here are some useful links to get started:
-#   Walk-through Guide:  https://ytdl-sub.readthedocs.io/en/latest/guides/index.html
-#   Config Examples:     https://github.com/jmbannon/ytdl-sub/tree/master/examples
-#   Prebuilt Presets:    https://ytdl-sub.readthedocs.io/en/latest/presets.html
-#   Config Reference:    https://ytdl-sub.readthedocs.io/en/latest/config_reference/index.html
-#
-# The subscriptions in `subscriptions.yaml` uses prebuilt presets which do not require
-# any additions to this config. They can be downloaded using the command:
-#
-#   ytdl-sub --config config.yaml sub subscriptions.yaml
-#
-# Or dry-ran with:
-#
-#   ytdl-sub --dry-run --config config.yaml sub subscriptions.yaml
-#
-# See the documentation above on how to build your own custom presets.
-#
 configuration:
   working_directory: ".ytdl-sub-working-directory"
diff --git a/docker/root/defaults/cron_script b/docker/root/defaults/cron_script
new file mode 100644
index 00000000..d61d4b05
--- /dev/null
+++ b/docker/root/defaults/cron_script
@@ -0,0 +1,2 @@
+echo "Running cron_script"
+ytdl-sub --log-level info --config config.yaml sub subscriptions.yaml
diff --git a/docker/testing/docker-compose.yml b/docker/testing/docker-compose.yml
index c61ce947..ba171da8 100644
--- a/docker/testing/docker-compose.yml
+++ b/docker/testing/docker-compose.yml
@@ -6,7 +6,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=America/Los_Angeles
-      - CRON_ENABLE=True
       - CRON_SCHEDULE=* * * * */1
       - CRON_RUN_ON_START=True
     volumes:
diff --git a/src/ytdl_sub/__init__.py b/src/ytdl_sub/__init__.py
index d5b6ba3a..070a0d60 100644
--- a/src/ytdl_sub/__init__.py
+++ b/src/ytdl_sub/__init__.py
@@ -1,2 +1,2 @@
-__pypi_version__ = "2024.06.18"
-__local_version__ = "2024.06.18+f7305ebf"
+__pypi_version__ = "2024.06.19.post1"
+__local_version__ = "2024.06.19+94db90f1"