From 5be24bcc8d6c4e8dd126e57baf4c83675b9756c5 Mon Sep 17 00:00:00 2001
From: Donald Burr <dburr@borg-cube.com>
Date: Sat, 21 Feb 2015 14:54:02 -0800
Subject: [PATCH] Merge flac and mp3 functions into the main audio script

---
 acatcher/convert_audio.sh | 18 ++++++++----------
 acatcher/make_flac.sh     | 16 ----------------
 acatcher/make_mp3.sh      | 16 ----------------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100755 acatcher/make_flac.sh
 delete mode 100755 acatcher/make_mp3.sh

diff --git a/acatcher/convert_audio.sh b/acatcher/convert_audio.sh
index 2e9a063..6600ea5 100755
--- a/acatcher/convert_audio.sh
+++ b/acatcher/convert_audio.sh
@@ -20,7 +20,6 @@ for DIR in *; do
   fi
   cd "$DIR"
   echo "working in $DIR"
-  cd ..
   for INFILE in *.raw; do
     echo "working on $INFILE"
     FIX="`echo $INFILE | sed -e 's/^\[.*\] //g'`"
@@ -29,28 +28,27 @@ for DIR in *; do
     echo "...converting to intermediate format $TEMP_OUTFILE"
     #sox -r 44100 -e unsigned -b 8 -c 1 <RAW_FILE> <TARGET_FILE>
     sox -r 22050 -e signed -b 16 -L -c 1 "$INFILE" "$TEMP_OUTFILE"
-    echo "...converting it to FLAC"
-    if [ -f "$FLAC_DIR/$BASENAME.flac" -o "$MP3_DIR/$BASENAME.mp3" ] ; then
+    if [ -f "$FLAC_DIR/$DIR/$BASENAME.flac" -o -f "$MP3_DIR/$DIR/$BASENAME.mp3" ] ; then
       FUDGE="$RANDOM"
-      FLAC_FILE="$FLAC_DIR/$BASENAME-$FUDGE.flac"
-      MP3_FILE="$FLAC_DIR/$BASENAME-$FUDGE.mp3"
+      FLAC_FILE="$FLAC_DIR/$DIR/$BASENAME-$FUDGE.flac"
+      MP3_FILE="$MP3_DIR/$DIR/$BASENAME-$FUDGE.mp3"
     else
-      FLAC_FILE="$FLAC_DIR/$BASENAME.flac"
-      MP3_FILE="$FLAC_DIR/$BASENAME.mp3"
+      FLAC_FILE="$FLAC_DIR/$DIR/$BASENAME.flac"
+      MP3_FILE="$MP3_DIR/$DIR/$BASENAME.mp3"
     fi
     if [ ! -f "$FLAC_FILE" ]; then
       echo "...converting it to FLAC: $FLAC_FILE"
-      flac -8 "$TEMP_OUTFILE" "$FLAC_FILE" 
+      flac -s -8 "$TEMP_OUTFILE" -o "$FLAC_FILE" 
     else
       echo "...already converted"
     fi
     if [ ! -f "$MP3_FILE" ]; then
       echo "...converting it to MP3: $MP3_FILE"
-      lame --preset studio "$TEMP_OUTFILE" "$MP3_FILE"
+      lame --quiet --preset studio "$TEMP_OUTFILE" "$MP3_FILE"
     else
       echo "...already converted"
     fi
-    rm -f "$TEMP_OUTFILE"
+    #rm -f "$TEMP_OUTFILE"
   done
   cd ..
 done
diff --git a/acatcher/make_flac.sh b/acatcher/make_flac.sh
deleted file mode 100755
index fcea6f8..0000000
--- a/acatcher/make_flac.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-if [ ! -z "$FLAC_LEVEL" ]; then
-  LEVEL="-$FLAC_LEVEL"
-else
-  LEVEL="-8"
-fi
-
-if [ ! -z "$1" ]; then
-  FLACNAME="`basename \"$1\" .wav`.flac"
-  flac $LEVEL "$1" "$FLACNAME"
-else
-  for F in *.wav; do
-    FLACNAME="`basename \"$F\" .wav`.flac"
-    flac $LEVEL "$F" "$FLACNAME"
-  done
-fi
diff --git a/acatcher/make_mp3.sh b/acatcher/make_mp3.sh
deleted file mode 100755
index d02208c..0000000
--- a/acatcher/make_mp3.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-if [ ! -z "$LAME_PRESET" ]; then
-  PRESET="$LAME_PRESET"
-else
-  PRESET="studio"
-fi
-
-if [ ! -z "$1" ]; then
-  MP3NAME="`basename \"$1\" .wav`.mp3"
-  lame --preset $PRESET "$1" "$MP3NAME"
-else
-  for F in *.wav; do
-    MP3NAME="`basename \"$F\" .wav`.mp3"
-    lame --preset $PRESET "$F" "$MP3NAME"
-  done
-fi