Merge pull request #505 from whipper-team/feature/issue-488-drive-aut…

…o-close Allow configuring whether to auto close the drive's tray
whipper-team · Sep 23, 2020 · 84cc824 · 84cc824
2 parents 21185f4 + 8a1c0fa
commit 84cc824
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/man/whipper.rst b/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
 

diff --git a/whipper/command/cd.py b/whipper/command/cd.py
@@ -92,7 +92,8 @@ def do(self):
         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

diff --git a/whipper/command/main.py b/whipper/command/main.py
@@ -118,7 +118,11 @@ def add_arguments(self):
                                  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:

diff --git a/whipper/command/offset.py b/whipper/command/offset.py
@@ -80,7 +80,8 @@ def do(self):
         # 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