X-Git-Url: https://code.delx.au/transcoding/blobdiff_plain/1ccf4d163d1897e76c5536d1c334f664d813a91f..b0c2d4418346c184c767022c5d7eb3573c83f621:/rip-dvd

diff --git a/rip-dvd b/rip-dvd
index 118b1f2..35032ff 100755
--- a/rip-dvd
+++ b/rip-dvd
@@ -10,16 +10,17 @@ fi
 
 # Calculate the name for ripping
 base="$1"
-last="$(find . -maxdepth 1 -type d -name "${base}*" | sort -n | tail -n 1)"
+last="$(find . -maxdepth 1 -type f -name "${base}*.iso" | sort -n | tail -n 1)"
 if [ -n "$2" ]; then
     num="$2"
 elif [ -z "$last" ]; then
     num="1"
 else
     num="${last##./${base}}"
+    num="${num%%.iso}"
     num="$(($num + 1))"
 fi
-next="${base}${num}"
+output="${base}${num}.iso"
 
 
 # Sometimes the cached keys are wrong, since it only takes a few seconds to
@@ -32,7 +33,7 @@ identify-disc --dvd-device "$DVD_DEVICE"
 
 echo
 echo
-echo "Will rip to '$next'"
+echo "Will rip to '$output'"
 for i in $(seq 3 -1 1); do
     echo "    $i..."
     sleep 1
@@ -41,10 +42,8 @@ done
 
 # Rip to ISO skipping bad sectors then decrypt to VIDEO_TS directory
 set -x
-rm -rf "${next}" "${next}.iso"
-ddrescue -n -b 2048 "$DVD_DEVICE" "${next}.iso"
-dvdbackup -n "$next" -M -i "${next}.iso" || true
-identify-disc --dvd-device "$next"
-rm "${next}.iso"
+rm -f "$output"
+ddrescue -n -b 2048 "$DVD_DEVICE" "$output"
+identify-disc --dvd-device "$output"
 eject "$DVD_DEVICE"