refactor: implement CameraManager class with methods for detecting GPhoto and OpenCV cameras

controllers/main_controller.py

@@ -5,10 +5,13 @@ from core.media import MediaRepository
 from ui.widgets.color_list_widget import ColorListWidget
 from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
 from ui.widgets.split_view_widget import SplitView
-from .camera_controller import CameraController
+# from .camera_controller import CameraController
+from core.camera.camera_controller import CameraController
+from core.camera.camera_manager import CameraManager
+
 
 from core.camera.gphoto_camera import GPhotoCamera
-from core.camera.camera_manager import CameraManager
+from core.camera.camera_controller import CameraController
 
 class MainController:
 	def __init__(self, view):
@@ -17,9 +20,11 @@ class MainController:
 		self.media_repo = MediaRepository(self.db)
 		self.media_repo.sync_media()
 
-        camera = GPhotoCamera()
+		# camera = GPhotoCamera()
-        self.manager = CameraManager(camera)
+		# self.manager = CameraController(camera)
-
+		manager = CameraManager()
+		manager.detect_gphoto()
+		manager.detect_opencv()
 
 		# self.camera_controller = CameraController()
 
@@ -39,9 +44,9 @@ class MainController:
 		self.thumbnail_list.selectedThumbnail.connect(self.on_thumbnail_selected)
 
 		# self.camera_controller.errorOccurred.connect(self.split_view.widget_start.set_info_text)
-        self.manager.error_occurred.connect(self.split_view.widget_start.set_info_text)
+		# self.manager.error_occurred.connect(self.split_view.widget_start.set_info_text)
 		# self.camera_controller.frameReady.connect(self.split_view.set_live_image)
-        self.manager.frame_ready.connect(self.split_view.set_live_image)
+		# self.manager.frame_ready.connect(self.split_view.set_live_image)
 		# self.split_view.widget_start.camera_start_btn.clicked.connect(self.camera_controller.start)
 		self.split_view.widget_start.camera_start_btn.clicked.connect(self.start_liveview)
 
@@ -86,8 +91,10 @@ class MainController:
 		self.split_view.toglle_live_view()
 
 	def start_liveview(self):
-        self.manager.start_camera()
+		pass
+		# self.manager.start_camera()
 		# self.manager.start_stream()
 
 	def shutdown(self):
-        self.manager.stop()
+		pass
+		# self.manager.stop()

core/camera/base_camera.py

@@ -5,8 +5,13 @@ class BaseCamera(ABC):
 	def __init__(self) -> None:
 		self.error_msg = None
 
+	@staticmethod
 	@abstractmethod
-    def connect(self) -> bool:
+	def detect() -> dict:
+		raise NotImplementedError
+
+	@abstractmethod
+	def connect(self, index: int | None = None) -> bool:
 		raise NotImplementedError
 
 	@abstractmethod

core/camera/camera_controller.py

@@ -0,0 +1,115 @@
+from PySide6.QtCore import QObject, QThread, QTimer, Signal, Slot, QMutex, QMutexLocker
+from PySide6.QtGui import QImage, QPixmap
+import cv2
+
+from .base_camera import BaseCamera
+
+
+class CameraController(QThread):
+    frame_ready = Signal(QPixmap)
+    photo_ready = Signal(QPixmap)
+    error_occurred = Signal(str)
+    _enable_timer = Signal(bool)
+
+
+    def __init__(self, parent: QObject | None = None) -> None:
+        super().__init__(parent)
+        self.camera = None
+        self.timer = None
+        self.fps = 15
+        self.is_streaming = False
+        self.is_connected = False
+
+        self._camera_mutex = QMutex()
+        self.start()
+
+
+    def run(self) -> None:
+        self.timer = QTimer()
+        self.timer.timeout.connect(self._update_frame)
+        self._enable_timer.connect(self._set_timer)
+        self.exec()
+ 
+    def stop(self):
+        self.stop_camera()
+        self.quit()
+        self.wait()
+
+    def set_camera(self, camera: BaseCamera, fps: int = 15) -> None:
+        with QMutexLocker(self._camera_mutex):
+            self.stop_stream()
+            self.stop_camera()
+
+            self.camera = camera
+            self.fps = fps
+
+    def start_camera(self) -> None:
+        if self.camera is None or self.is_connected:
+            return
+
+        if self.camera.connect():
+            self.is_connected = True
+        else:
+            self.is_connected = False
+            self.error_occurred.emit(self.camera.get_error_msg())
+
+    def stop_camera(self) -> None:
+        if self.is_streaming:
+            self.stop_stream()
+
+        if self.camera is not None:
+            self.camera.disconnect()
+
+        self.is_connected = False
+
+    def start_stream(self):
+        if not self.is_connected:
+            return
+
+        if self.is_streaming:
+            return
+
+        if self.timer:
+            self.is_streaming = True
+            # self.timer.start()
+            self._enable_timer.emit(True)
+
+    def stop_stream(self) -> None:
+        if self.is_streaming:
+            self.is_streaming = False
+            if self.timer:
+                # self.timer.stop()
+                self._enable_timer.emit(False)
+
+    def _update_frame(self) -> None:
+        with QMutexLocker(self._camera_mutex):
+            if self.camera is None or not self.is_connected:
+                return
+        
+            if not self.is_streaming:
+                return
+
+            ret, frame = self.camera.get_frame()
+
+            if not ret:
+                self.error_occurred.emit(self.camera.get_error_msg())
+                return
+
+        if frame is not None:
+            rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+            h, w, ch = rgb_image.shape
+            qimg = QImage(rgb_image.data, w, h, ch * w, QImage.Format.Format_RGB888)
+            pixmap = QPixmap.fromImage(qimg)
+
+            self.frame_ready.emit(pixmap)
+
+    def _set_timer(self, enable: bool):
+        if not self.timer:
+            return
+        
+        if enable:
+            self.timer.setInterval(int(1000 / self.fps))
+            self.timer.start()
+        else:
+            self.timer.stop()
+            

core/camera/camera_manager.py

@@ -1,88 +1,20 @@
-from PySide6.QtCore import QObject, QThread, QTimer, Signal, Slot
-from PySide6.QtGui import QImage, QPixmap
-import cv2
-
-from .base_camera import BaseCamera
 
 
-class CameraManager(QThread):
+from .gphoto_camera import GPhotoCamera
-    frame_ready = Signal(QPixmap)
+from .opencv_camera import OpenCvCamera
-    photo_ready = Signal(QPixmap)
+from .camera_controller import CameraController
-    error_occurred = Signal(str)
 
-    def __init__(self, camera: BaseCamera, fps: int = 15, parent: QObject | None = None) -> None:
-        super().__init__(parent)
-        self.camera = camera
-        self.fps = fps
-        self.timer = None
-        self.is_streaming = False
 
-        self.is_connected = False
+class CameraManager:
+	def __init__(self) -> None:
+		pass
 
-        self.timer = QTimer()
+	def detect_gphoto(self):
-        self.timer.setInterval(int(1000 / self.fps))
+		camera_list = GPhotoCamera.detect()
-        self.timer.timeout.connect(self._update_frame)
+		print(camera_list)
-        self.start()
+		return camera_list
 
-    def run(self) -> None:
+	def detect_opencv(self):
-        # self.timer = QTimer()
+		camera_list = OpenCvCamera.detect()
-        # self.timer.setInterval(int(1000 / self.fps))
+		print(camera_list)
-        # self.timer.timeout.connect(self._update_frame)
+		return camera_list
-        self.exec()
-
-    def start_camera(self) -> None:
-        if self.is_connected:
-            return
-        
-        if self.camera.connect():
-            self.is_connected = True
-        else:
-            self.is_connected = False
-            self.error_occurred.emit(self.camera.get_error_msg())
-
-    def stop_camera(self) -> None:
-        self.is_streaming = False
-        self.is_connected = False
-        if self.timer:
-            self.timer.stop()
-        self.camera.disconnect()
-
-    def start_stream(self):
-        if not self.is_connected:
-            return
-        
-        if self.is_streaming:
-            return
-        
-        if self.timer:
-            self.is_streaming = True
-            self.timer.start()
-
-    def stop_stream(self) -> None:
-        if self.is_streaming:
-            self.is_streaming = False
-            if self.timer:
-                self.timer.stop()
-
-    def _update_frame(self) -> None:
-        if not self.is_streaming or not self.is_connected:
-            return
-
-        ret, frame = self.camera.get_frame()
-
-        if not ret:
-            self.error_occurred.emit(self.camera.get_error_msg())
-            return
-
-        if frame is not None:
-            rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
-            h, w, ch = rgb_image.shape
-            qimg = QImage(rgb_image.data, w, h, ch * w, QImage.Format.Format_RGB888)
-            pixmap = QPixmap.fromImage(qimg)
-
-            self.frame_ready.emit(pixmap)
-
-    def stop(self):
-        self.stop_camera()
-        self.quit()
-        self.wait()

core/camera/gphoto_camera.py

@@ -24,11 +24,38 @@ class GPhotoCamera(BaseCamera):
 		super().__init__()
 		self.camera = None
 		self.configs: List[dict] = []
+		self.camera_index = 0
 
-    def connect(self) -> bool:
+	@staticmethod
+	def detect() -> dict:
+		cameras = gp.check_result(gp.gp_camera_autodetect()) # type: ignore
+		# cameras = gp.Camera().autodetect()
+		if not cameras or cameras.count() == 0:  # type: ignore
+			return {}
+		
+		camera_list = {}
+		for i in range(cameras.count()):     # type: ignore
+			name = cameras.get_name(i)       # type: ignore
+			port = cameras.get_value(i)      # type: ignore
+			camera_list[i] = {"name": name, "port": port}
+		return camera_list
+	
+	def connect(self, index: int | None = None) -> bool:
 		self.error_msg = None
-        try:
 		self.camera = gp.Camera()   # type: ignore
+		
+		try:
+			if index:
+				self.camera_index = index
+				camera_list = GPhotoCamera.detect()
+				port_info_list = gp.PortInfoList()
+				port_info_list.load()
+
+				port_address = camera_list[index]["port"]
+				port_index = port_info_list.lookup_path(port_address)
+		
+				self.camera.set_port_info(port_info_list[port_index])
+		 
 			self.camera.init()
 			config = self.camera.get_config()
 			self.read_config(config)
@@ -72,7 +99,7 @@ class GPhotoCamera(BaseCamera):
 		if value not in config['choices']:
 			return
 
-        config['config'].set_value(value)  # type: ignore
+		config['widget'].set_value(value)  # type: ignore
 		if self._save_config(config):
 			config['value'] = value
 

core/camera/opencv_camera.py

@@ -1,12 +1,11 @@
 import cv2
+from cv2_enumerate_cameras import enumerate_cameras
 from typing import List
 
 from .base_camera import BaseCamera
 
 
-
+class OpenCvCamera(BaseCamera):
-
-class CvCamera(BaseCamera):
 	"""Kamera oparta na cv2.VideoCapture"""
 
 	config_map = {
@@ -18,18 +17,48 @@ class CvCamera(BaseCamera):
 		5: {"name": "saturation", "cv_prop": cv2.CAP_PROP_SATURATION, "default": 0.5},
 	}
 
-    def __init__(self, device_index: int = 0) -> None:
+	def __init__(self) -> None:
 		super().__init__()
-        self.device_index = device_index
 		self.cap = None
 		self.configs: List[dict] = []
+		self.camera_list = []
+		self.camera_index = 0
 
-    def connect(self) -> bool:
+	@staticmethod
+	def detect():
+		camera_list = enumerate_cameras(cv2.CAP_ANY)
+		result = {}
+		seen_ports = set()
+
+		for camera in camera_list:
+			# unikamy duplikatów tego samego /dev/videoX albo tej samej ścieżki na Windows/macOS
+			if camera.path in seen_ports:
+				continue
+
+			cap = cv2.VideoCapture(camera.index, camera.backend)  # próbujemy otworzyć
+			ret, frame = cap.read()
+			cap.release()
+
+			if ret and frame is not None and frame.size > 0:
+				result[camera.index] = {
+					"name": camera.name,
+					"port": camera.path,
+					"backend": camera.backend,
+				}
+				seen_ports.add(camera.path)
+
+		return result
+
+	def connect(self, index: int | None = None) -> bool:
 		self.error_msg = None
 		try:
-            self.cap = cv2.VideoCapture(self.device_index)
+			if index:
+				self.camera_index = index
+
+			self.cap = cv2.VideoCapture(self.camera_index)
+
 			if not self.cap.isOpened():
-                self.error_msg = f"[CV2] Could not open camera {self.device_index}"
+				self.error_msg = f"[CV2] Could not open camera {self.camera_index}"
 				return False
 
 			self.configs.clear()
@@ -85,7 +114,8 @@ class CvCamera(BaseCamera):
 			return
 		try:
 			self.cap.set(config["cv_prop"], value)
-            config["value"] = self.cap.get(config["cv_prop"])  # sprawdz co ustawiło
+			config["value"] = self.cap.get(
+				config["cv_prop"])  # sprawdz co ustawiło
 		except Exception as e:
 			self.error_msg = f"[CV2] {e}"