projects
/
rip_dvd
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added libdvdcss2 install info to README
[rip_dvd/.git]
/
rip_dvd
diff --git
a/rip_dvd
b/rip_dvd
index 90a3c5ef0e653fb61c188b172d3c725f5807f970..af108dd424d5a7bca2c2474e6e255faf71ee7eec 100755
(executable)
--- a/
rip_dvd
+++ b/
rip_dvd
@@
-1157,7
+1157,7
@@
function make_dvd_mkv_image {
echo -e "\n Ripping: $makemkv --minlength=$min_length --decrypt --progress=-same $srctype:$srcname all $dstdir"
mkdir -p "$dstdir"
echo -e "\n Ripping: $makemkv --minlength=$min_length --decrypt --progress=-same $srctype:$srcname all $dstdir"
mkdir -p "$dstdir"
- $makemkv mkv --minlength=$min_length --decrypt --progress=-same $srctype:$srcname all $dstdir
+ $makemkv mkv --minlength=$min_length --decrypt --progress=-same $srctype:$srcname all $dstdir
2>&1 | tee -a "$ddrescuelog"
makemkv_retval=$?
if [ $makemkv_retval != 0 ]; then
makemkv_retval=$?
if [ $makemkv_retval != 0 ]; then
@@
-1165,8
+1165,13
@@
function make_dvd_mkv_image {
fi
# Move the created MKV file into place
fi
# Move the created MKV file into place
- echo -e "\n Moving $dstdir/*.mkv -> $dstmkv"
- mv "$dstdir"/*.mkv "$dstmkv"
+ dstfile=${dstmkv%.[^.]*}
+ typeset -i num=0
+ for i in `/bin/ls -1 "$dstdir"/*.mkv`; do
+ echo -e "\n Moving $i -> $dstfile.$num.mkv" | tee -a "$ddrescuelog"
+ mv "$i" "$dstfile.$num.mkv"
+ ((num = num + 1 ))
+ done
if [ $? != 0 ]; then
fatal_and_exit "-E- Unhandled mv error"
fi
if [ $? != 0 ]; then
fatal_and_exit "-E- Unhandled mv error"
fi
@@
-1175,7
+1180,7
@@
function make_dvd_mkv_image {
fi
# Concatenate the encode log to our main log file, greping out unwanted lines
fi
# Concatenate the encode log to our main log file, greping out unwanted lines
- cat
$encodelog
| grep -v "Current progress:" >> "$logfile"
+ cat
"$ddrescuelog"
| grep -v "Current progress:" >> "$logfile"
}
function make_dvd_mkv_image_from_folder {
}
function make_dvd_mkv_image_from_folder {
@@
-1842,12
+1847,16
@@
if [ $mirror_mode -eq 1 ]; then
if [[ "$ripper" == "makemkv" ]]; then
# use makemkv to make an MKV file of the disk
if [[ "$ripper" == "makemkv" ]]; then
# use makemkv to make an MKV file of the disk
- make_dvd_mkv_image "$dest/$dvdname.mkv" "disc" "$makemkv_disc_id"
+ make_dvd_mkv_image "$tmpdir/$dvdname.mkv" "disc" "$makemkv_disc_id"
+ echo " Moving $tmpdir/$dvdname.mkv -> $dest/$dvdname.mkv"
+ mv "$tmpdir/$dvdname.mkv" "$dest/$dvdname.mkv"
# add this video data to the mythtv DB
fill_mythvideo_metadata "$dest_filename"
else
# use ddrescue to make an ISO image of the disk
# add this video data to the mythtv DB
fill_mythvideo_metadata "$dest_filename"
else
# use ddrescue to make an ISO image of the disk
- make_dvd_iso_image "$dest/$dvdname.iso"
+ make_dvd_iso_image "$tmpdir/$dvdname.iso"
+ echo " Moving $tmpdir/$dvdname.mkv -> $dest/$dvdname.mkv"
+ mv "$tmpdir/$dvdname.iso" "$dest/$dvdname.iso"
# add this video data to the mythtv DB
fill_mythvideo_metadata "$dest_filename"
fi
# add this video data to the mythtv DB
fill_mythvideo_metadata "$dest_filename"
fi