From: Alan J. Pippin <alan@pippins.net>
Date: Tue, 31 Jan 2012 04:08:56 +0000 (-0700)
Subject: Fixed up menu to have both MKV and ISO choices.
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%22%22.%24thumbnail.%22/%7Bdelete%7D?a=commitdiff_plain;h=93bd8f31e40d1693f27907e388428ef1e4315b98;p=rip_dvd%2F.git

Fixed up menu to have both MKV and ISO choices.
Made disk rip go to tmpdir first, then move into final position.
---

diff --git a/README b/README
index 235eb88..f2f3320 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ DEPENDENCIES
 The following packages need to be installed on your system:
 
 Package Dependencies (apt-get install these for example):
-lsdvd dvdauthor gddrescue dvdbackup tovid mencoder mplayer genisoimage libdvdcss2
+lsdvd dvdauthor gddrescue dvdbackup tovid mencoder mplayer genisoimage libdvdcss2 gpac ogmtools
 
 NOTE:  In Ubuntu, depending on your version, replace libdvdcss2 with what you find on this page.
   https://help.ubuntu.com/community/RestrictedFormats/PlayingDVDs
diff --git a/rip_dvd b/rip_dvd
index 90a3c5e..74290c0 100755
--- a/rip_dvd
+++ b/rip_dvd
@@ -1842,12 +1842,14 @@ if [ $mirror_mode -eq 1 ]; then
 
   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"
+      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
-      make_dvd_iso_image "$dest/$dvdname.iso"
+      make_dvd_iso_image "$tmpdir/$dvdname.iso"
+      mv "$tmpdir/$dvdname.iso" "$dest/$dvdname.iso"
       # add this video data to the mythtv DB
       fill_mythvideo_metadata "$dest_filename"
   fi
diff --git a/rip_dvd_menu.xml b/rip_dvd_menu.xml
index 255bd05..ed79a51 100644
--- a/rip_dvd_menu.xml
+++ b/rip_dvd_menu.xml
@@ -2,68 +2,62 @@
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Netflix DVD (FULL)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap netflix -m -r makemkv</action>
+      <text>Rip Netflix DVD (FULL MKV)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap netflix -m -R makemkv</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Netflix DVD (MP4)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap netflix -b 2000 -z -r makemkv -p mp4hq</action>
+      <text>Rip Netflix DVD (FULL ISO)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap netflix -m -R ddrescue</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Kid's DVD (MP4)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap childrens -b 2000 -z -r makemkv -p mp4hq</action>
+      <text>Rip Netflix DVD (MKV->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap netflix -b 2000 -z -R makemkv -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Kid's DVD (VOB)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap childrens -v</action>
+      <text>Rip Netflix DVD (ISO->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap netflix -b 2000 -z -R ddrescue -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Our DVD (MP4)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap collection -b 2000 -z -r makemkv -p mp4hq</action>
+      <text>Rip Kid's DVD (MKV->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap childrens -b 2000 -z -R makemkv -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Our DVD  (VOB)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap collection -v</action>
+      <text>Rip Kid's DVD (ISO->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap childrens -b 2000 -z -R ddrescue -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Church DVD (MP4)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap church -b 2000 -z -r makemkv -p mp4hq</action>
+      <text>Rip Our DVD (MKV->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap collection -b 2000 -z -R makemkv -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Church DVD  (VOB)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap church -v</action>
+      <text>Rip Our DVD (ISO->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap collection -b 2000 -z -R ddrescue -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Our DVD  (FOLDER)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap collection -f</action>
+      <text>Rip Church DVD (MKV->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap church -b 2000 -z -R makemkv -p mp4hq</action>
    </button>
 
    <button>
       <type>DVD_RIP</type>
-      <text>Rip Kid's DVD (FOLDER)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap childrens -f</action>
-   </button>
-
-   <button>
-      <type>DVD_RIP</type>
-      <text>Rip Church DVD (FOLDER)</text>
-      <action>EXEC /myth/video/bin/rip_dvd.wrap church -f</action>
+      <text>Rip Church DVD (ISO->MP4)</text>
+      <action>EXEC /myth/video/bin/rip_dvd.wrap church -b 2000 -z -R ddrescue -p mp4hq</action>
    </button>
 
 </mythmenu>