Refactor: create set_unpack_params() method instead of adding shot_select to open methods

Co-authored-by: letmaik <530988+letmaik@users.noreply.github.com>

Author: Copilot

rawpy/__init__.py

@@ -17,7 +17,8 @@ def imread(pathOrFile, shot_select=0):
     """
     d = RawPy()
     if hasattr(pathOrFile, 'read'):
-        d.open_buffer(pathOrFile, shot_select=shot_select)
+        d.open_buffer(pathOrFile)
     else:
-        d.open_file(pathOrFile, shot_select=shot_select)
+        d.open_file(pathOrFile)
+    d.set_unpack_params(shot_select=shot_select)
     return d

rawpy/_rawpy.pyx

@@ -411,15 +411,13 @@ cdef class RawPy:
         with nogil:
             self.p.recycle()
 
-    def open_file(self, path, shot_select=0):
+    def open_file(self, path):
         """
         Opens the given RAW image file. Should be followed by a call to :meth:`~rawpy.RawPy.unpack`.
         
         .. NOTE:: This is a low-level method, consider using :func:`rawpy.imread` instead.
         
         :param str path: The path to the RAW image.
-        :param int shot_select: select which image to extract from RAW files that contain multiple images
-                                (e.g., Dual Pixel RAW). Default is 0 for the first/main image.
         """
         cdef wchar_t *wchars
         cdef Py_ssize_t wchars_len
@@ -435,19 +433,14 @@ cdef class RawPy:
         ELSE:
             res = self.p.open_file(path.encode('UTF-8'))
         self.handle_error(res)
-        # Set shot_select after opening file
-        cdef libraw_raw_unpack_params_t* rp = &self.p.imgdata.rawparams
-        rp.shot_select = shot_select
 
-    def open_buffer(self, fileobj, shot_select=0):
+    def open_buffer(self, fileobj):
         """
         Opens the given RAW image file-like object. Should be followed by a call to :meth:`~rawpy.RawPy.unpack`.
         
         .. NOTE:: This is a low-level method, consider using :func:`rawpy.imread` instead.
         
         :param file fileobj: The file-like object.
-        :param int shot_select: select which image to extract from RAW files that contain multiple images
-                                (e.g., Dual Pixel RAW). Default is 0 for the first/main image.
         """
         self.unpack_called = False
         self.unpack_thumb_called = False
@@ -458,7 +451,19 @@ cdef class RawPy:
         with nogil:
             e = self.p.open_buffer(buf, buf_len)
         self.handle_error(e)
-        # Set shot_select after opening buffer
+    
+    def set_unpack_params(self, shot_select=0):
+        """
+        Set parameters that affect RAW image unpacking.
+        
+        This should be called after opening a file and before unpacking.
+        
+        .. NOTE:: This is a low-level method. When using :func:`rawpy.imread`,
+                  unpack parameters can be provided directly.
+        
+        :param int shot_select: select which image to extract from RAW files that contain multiple images
+                                (e.g., Dual Pixel RAW). Default is 0 for the first/main image.
+        """
         cdef libraw_raw_unpack_params_t* rp = &self.p.imgdata.rawparams
         rp.shot_select = shot_select
 

test/test_shot_select.py

@@ -27,9 +27,10 @@ def test_shot_select_nonexistent_image():
 
 
 def test_shot_select_via_open_file():
-    """Test that shot_select can be passed via open_file"""
+    """Test that shot_select can be set via set_unpack_params"""
     raw = rawpy.RawPy()
-    raw.open_file(rawTestPath, shot_select=0)
+    raw.open_file(rawTestPath)
+    raw.set_unpack_params(shot_select=0)
     raw.unpack()
     rgb = raw.postprocess()
     assert rgb is not None