From 0ae692d9bda965343ccdd0e5d648af8c92f994a2 Mon Sep 17 00:00:00 2001
From: Andy Balaam <andybalaam@artificialworlds.net>
Date: Wed, 17 Dec 2008 14:06:43 +0000
Subject: [PATCH] Added more verbose error logging to flv conversion script,
 and ensured that the .ts gets moved to the old dir even if conversion fails.

---
 scripts/convert_ts_to_flv.sh | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/scripts/convert_ts_to_flv.sh b/scripts/convert_ts_to_flv.sh
index 8372162..1e14fba 100755
--- a/scripts/convert_ts_to_flv.sh
+++ b/scripts/convert_ts_to_flv.sh
@@ -24,23 +24,47 @@ if [ ! -f "$FLV_UP_FILENAME" -a \
 
     RETVAL=$?
 
+    echo 'mkdir -p "'$OLD_DIR'"'
+    mkdir -p "$OLD_DIR"
+    echo 'mv "'$TS_FILENAME'" "'$OLD_DIR'"'
+    mv "$TS_FILENAME" "$OLD_DIR"
+    echo 'mv returned ' $?
+
     if [[ $RETVAL != 0 ]]; then
     {
         echo '$ ffmpeg -re -r 25 -y -i "'$TS_FILENAME'" -b 900k -async 1000 -ar 44100 -s '$SIZE' -f flv -ar 22050 -acodec mp3 "'$FLV_FILENAME'"'
 
         cat ffmpeg_stderr.txt
 
-        echo "ffmpeg returned '"$RETVAL"'"
+        echo "Error: ffmpeg returned '"$RETVAL"'"
 
         exit 2
+    }; fi
+
+    rm ffmpeg_stderr.txt
+}
+else
+{
+    if [ -f "$FLV_FILENAME" ]; then
+    {
+        echo "Error: .flv filename already exists: " $FLV_FILENAME
+        exit 5
     }
-    else
+    elif [ -f "$FLV_UP_FILENAME" ]; then
     {
+        echo "unprocessed filename already exists.  Just converting it: " $FLV_UP_FILENAME
+
+        echo 'mkdir -p "'$OLD_DIR'"'
         mkdir -p "$OLD_DIR"
+        echo 'mv "'$TS_FILENAME'" "'$OLD_DIR'"'
         mv "$TS_FILENAME" "$OLD_DIR"
+        echo 'mv returned ' $?
+    }
+    else
+    {
+        echo "Error: did not convert but neither .flv nor unprocessed files exist."
+        exit 6
     }; fi
-
-    rm ffmpeg_stderr.txt
 }; fi
 
 
@@ -57,15 +81,20 @@ if [ -f $FLV_UP_FILENAME ]; then
         }
         else
         {
-            echo "flvtoolpp returned non-zero!"
+            echo "Error: flvtoolpp returned non-zero!"
             exit 3
         }; fi
     }
     else
     {
-        echo "$FLV_UP_FILENAME would clash with existing file $FLV_FILENAME!"
+        echo "Error: $FLV_UP_FILENAME would clash with existing file $FLV_FILENAME!"
         exit 4
     }; fi
+}
+else
+{
+    echo "Error: unprocessed file does not exist after ffmpeg."
+    exit 7
 }; fi
 
 
-- 
2.11.4.GIT