Fixed default threads option (from 8 to 2 since 2 is faster than 8)

[rip_dvd/.git] / rip_dvd

diff --git a/rip_dvd b/rip_dvd
index 8aefb824bf530497618f1772683def6971879574..6ab57cac29e026d87cd25c2dac70212a7d073749 100755 (executable)
--- a/rip_dvd
+++ b/rip_dvd
@@ -250,7 +250,7 @@ else
 
     # check to see if dvdname is a full path to an ISO file
     # if it is, set dvdname and isofile appropriately
-    file "$dvdname" | grep -q "ISO"
+    file "$dvdname" | grep -q -e "ISO" -e "UDF"
     if [ $? == 0 ]; then
       # It is a valid ISO file, now strip the extension off our dvdname
       isofile="$dvdname"
@@ -343,6 +343,7 @@ fatal_and_exit() {
   if [[ -n "$mailto" ]]; then
     echo -e "$msg" | mailx -s "dvd rip of $dvdname FAILED" "$mailto"
   fi
+  keep_intermediate_files=1
   exit 1
 }
 
@@ -756,7 +757,8 @@ function get_crop_from_iso {
   CROPCHECK=`echo "$CROP" | awk -F ':' '{ print $1 }'`
   echo "   Final crop value of $CROP with cropcheck value of $CROPCHECK" >> "$logfile"
   if [ -z "$CROP" ]; then
-    fatal_and_exit "-E- Unable to extract CROP value from iso: $isofile"
+    echo "-W- Unable to extract CROP value from iso: $isofile" | tee -a "$logfile"
+    return
   fi
   if [ $CROPCHECK -lt 0 ]; then 
     CROP=""
@@ -780,7 +782,8 @@ function get_crop_from_vob {
   CROPCHECK=`echo "$CROP" | awk -F ':' '{ print $1 }'`
   echo "   Final crop value of $CROP with cropcheck value of $CROPCHECK" >> "$logfile"
   if [ -z "$CROP" ]; then
-    fatal_and_exit "-E- Unable to extract CROP value from iso: $isofile"
+    echo "-W- Unable to extract CROP value from iso: $isofile" | tee -a "$logfile"
+    return
   fi
   if [ $CROPCHECK -lt 0 ]; then 
     CROP=""