timelapse/install.sh

@@ -11,7 +11,7 @@ fi
 # Configuration variables
 # Install directory
 INSTALL_DIR="/usr/local/bin"
-FILE_LIST=("tl-capture" "tl-control")
+FILE_LIST=("tl-capture" "tl-clean" "tl-control")
 
 # Copy the executable files
 for file in ${FILE_LIST[@]}; do

timelapse/tl-capture

@@ -1,15 +1,13 @@
 #!/bin/bash
-
 # Customizable variables
-# Paths
-IMG_DIR="/tmp/TL"
-NAS_MOUNT_DIR="/mnt/media"
-SYNC_DES_PATH="/TL/synced"
-# Command variables
-RESOLUTION="1920x1080"
+# Device
 DEVICE="/dev/video0"
-FRAMES="1"
-SKIPS="5"
+# Temporary output directory
+TO_SYNC_DIR="/tmp/TL/to-sync"
+SYNCED_DIR="/tmp/TL/synced"
+# NAS Info
+NAS_MOUNT_DIR="/mnt/media"
+NAS_SYNC_DIR="/TL/synced"
 
 # Pre-script configurations
 # Generate the date for the filename
@@ -18,24 +16,43 @@ DATE=$(date +"%Y-%m-%d_%H-%M")
 FILENAME="TL-$DATE.jpg"
 
 # Functions
-# Capture an image and save it locally
-capture() {
-    # Capture an image for the timelapse and save it to /tmp/TL-YYYY-MM-DD_HH-MM.jpg
-    echo "Capturing image and saving it to $IMG_DIR/$FILENAME"
-    fswebcam -r "$RESOLUTION" -d "#DEVICE" "$IMG_DIR/$FILENAME" -F 1 -S 5
-}
-# Sync images from local to a remote mounted storage device
-sync() {
-    echo "Syncing $IMG_DIR to $SYNC_DES_PATH..."
-    rsync -av --progress --remove-source-files "$IMG_DIR/" "$NAS_MOUNT_DIR$SYNC_DES_PATH/" $1
+
+setup_dirs() {
+    # Check if To-Sync Directory exists and create it if not
+    if [[ ! -d $TO_SYNC_DIR ]]; then
+        echo "To-Sync directory doesn't exist, creating it now..."
+        mkdir -p $TO_SYNC_DIR
         if [[ $? -eq 0 ]]; then
-        echo "Success"
+            echo "Success!"
         else
-        echo "Unable to complete sync. Exiting"
+            echo "Unable to create directory, exiting!"
             exit 1
         fi
+    fi
+
+    # Check of Synced Directory exists and create it if not
+    if [[ ! -d $SYNCED_DIR ]]; then
+        echo "Synced directory doesn't exist, creating it now..."
+        mkdir -p $SYNCED_DIR
+        if [[ $? -eq 0 ]]; then
+            echo "Success!"
+        else
+            echo "Unable to create directory, exiting!"
+            exit 1
+        fi
+    fi
 }
 
-# Actually run everything
+capture() {
+    # Capture an image for the timelapse and save it to /tmp/TL-YYYY-MM-DD_HH-MM.jpg
+    fswebcam -r 1920x1080 -d /dev/video0 $TO_SYNC_DIR/$FILENAME.jpg -F 1 -S 5
+}
+
+sync() {
+    local src="$TO_SYNC_DIR/"
+    # Sync TL images from Pi to NAS
+    rsync -avz 
+}
+
+setup_dirs
 capture
-sync

timelapse/tl-clean

@@ -0,0 +1,3 @@
+#!/bin/bash
+SYNCED_DIR="/tmp/TL/synced"
+rm "$SYNCED_DIR/".*

timelapse/tl-control

@@ -4,14 +4,15 @@
 # Configuration Variables
 INSTALL_DIR="/usr/local/bin"
 FILE_LIST=("tl-capture" "tl-clean" "tl-control")
-IMG_DIR="/tmp/TL"
-SYNC_DES_PATH="/mnt/media/TL/to-process"
 # Cron
 CRON_DIR="/etc/cron.d"
 CRON_FILE="$CRON_DIR/timelapse"
-CRON_FREQUENCY="" # Set by prompt
+CRON_FREQUENCY="*/15 * * * *" # Every 15 minutes
 CRON_LOG_PATH="/var/log/${FILE_LIST[0]}.log"
-CRON_JOB="root $INSTALL_DIR/${FILE_LIST[0]} >> $CRON_LOG_PATH 2>&1"
+CRON_JOB="$CRON_FREQUENCY root $INSTALL_DIR/${FILE_LIST[0]} >> $CRON_LOG_PATH 2>&1"
+# Paths
+SYNC_SRC_PATH="/tmp/TL/to-sync"
+SYNC_DES_PATH="/mnt/media/TL/to-process"
 
 # Check for root/sudo
 if [ "$EUID" -ne 0 ]; then
@@ -25,25 +26,6 @@ fi
 
 # Start Time Lapse
 start_tl() {
-    # Check if image directory exists and create if not
-    if [[ ! -d $IMG_DIR ]]; then
-        echo "Image directory doesn't exist, creating it now..."
-        mkdir -p $IMG_DIR
-        if [[ $? -eq 0 ]]; then
-            echo "Success!"
-        else
-            echo "Unable to create directory, exiting!"
-            exit 1
-        fi
-    fi
-    read -p "Image interval in minutes (1-59): " interval
-    # Make sure the interval is valid 1-59
-    if [[ "$interval" =~ ^[1-9]$|^[1-5][0-9]$ ]]; then
-        CRON_FREQUENCY="*/$interval * * * *"
-    else
-        echo "Invalid interval!"
-        return 1
-    fi
     echo "Creating cron file: $CRON_FILE"
     touch "$CRON_FILE"
     if [[ $? -eq 0 ]]; then
@@ -55,7 +37,7 @@ start_tl() {
     echo -e "Writing job to file: $CRON_FILE\n$CRON_JOB"
     cat <<EOF > $CRON_FILE
 # Take an image every 15 minutes and save it for a time lapse
-$CRON_FREQUENCY $CRON_JOB
+$CRON_JOB
 EOF
     if [[ $? -eq 0 ]]; then
         echo "Success"
@@ -79,8 +61,8 @@ stop_tl() {
 
 # NAS Sync
 sync_nas() {
-    echo "Syncing $IMG_DIR to $SYNC_DES_PATH..."
-    rsync -av --progress --remove-source-files "$IMG_DIR" "$SYNC_DES_PATH" $1
+    echo "Syncing $SYNC_SRC_PATH to $SYNC_DES_PATH..."
+    rsync -av --progress --remove-source-files "$SYNC_SRC_PATH" "$SYNC_DES_PATH" $1
     if [[ $? -eq 0 ]]; then
         echo "Success"
     else