Merge pull request #505 from whipper-team/feature/issue-488-drive-auto-close

Allow configuring whether to auto close the drive's tray

man/whipper.rst

@@ -47,6 +47,10 @@ Options
 | **-e** | **--eject**  *never failure success always*
 |     When to eject disc (default: success)
 
+| **-c** | **--drive-auto-close**
+|     Whether to auto close the drive's tray before reading a CD
+|     (default: True)
+
 | **-R** | **--record**
 |     Record API requests for playback
 

whipper/command/cd.py

@@ -92,7 +92,8 @@ class _CD(BaseCommand):
         self.device = self.options.device
         logger.info('checking device %s', self.device)
 
-        utils.load_device(self.device)
+        if self.options.drive_auto_close is True:
+            utils.load_device(self.device)
         utils.unmount_device(self.device)
         # Exit and inform the user if there's no CD in the disk drive
         if drive.get_cdrom_drive_status(self.device):  # rc == 1 means no disc

whipper/command/main.py

@@ -118,7 +118,11 @@ class Whipper(BaseCommand):
                                  default="success",
                                  choices=('never', 'failure',
                                           'success', 'always'),
-                                 help="when to eject disc (default: success)")
+                                 help="when to eject disc (default: success)"),
+        self.parser.add_argument('-c', '--drive-auto-close', action="store",
+                                 dest="drive_auto_close", default=True,
+                                 help="whether to auto close the drive's "
+                                 "tray before reading a CD (default: True)")
 
     def handle_arguments(self):
         if self.options.help:

whipper/command/offset.py

@@ -80,7 +80,8 @@ CD in the AccurateRip database."""
         # if necessary, load and unmount
         logger.info('checking device %s', device)
 
-        utils.load_device(device)
+        if self.options.drive_auto_close is True:
+            utils.load_device(device)
         utils.unmount_device(device)
 
         # first get the Table Of Contents of the CD