Merge Detection Strat

Author: Behemyth

cppython/plugins/conan/plugin.py

@@ -109,30 +109,7 @@ def _install_dependencies(self, *, update: bool = False) -> None:
             logger.debug('Available remotes: %s', [remote.name for remote in all_remotes])
 
             # Get profiles with fallback to auto-detection
-            try:
-                profile_host_path = conan_api.profiles.get_default_host()
-                profile_build_path = conan_api.profiles.get_default_build()
-
-                # Check if profile paths exist
-                if profile_host_path is None or profile_build_path is None:
-                    logger.warning('Default profile paths not available, using auto-detection')
-                    raise ValueError('Profile paths are None')
-
-                # Load the actual profile objects
-                profile_host = conan_api.profiles.get_profile([profile_host_path])
-                profile_build = conan_api.profiles.get_profile([profile_build_path])
-
-                # Check if profiles are valid (not None)
-                if profile_host is None or profile_build is None:
-                    logger.warning('Default profiles are corrupted/invalid, using auto-detection')
-                    raise ValueError('Profile loading returned None')
-
-                logger.debug('Using existing default profiles')
-            except Exception as e:
-                logger.warning('Default profiles not available (%s), using auto-detection', str(e))
-                # Use Conan's auto-detection to create minimal profiles
-                profile_host = conan_api.profiles.detect()
-                profile_build = conan_api.profiles.detect()
+            profile_host, profile_build = self._get_profiles(conan_api)
 
             path = str(conanfile_path)
             remotes = all_remotes
@@ -272,26 +249,7 @@ def publish(self) -> None:
         )
 
         # Step 2: Get profiles with fallback to auto-detection
-        try:
-            profile_host_path = conan_api.profiles.get_default_host()
-            profile_build_path = conan_api.profiles.get_default_build()
-
-            # Check if profile paths exist
-            if profile_host_path is None or profile_build_path is None:
-                raise ValueError('Profile paths are None')
-
-            # Load the actual profile objects
-            profile_host = conan_api.profiles.get_profile([profile_host_path])
-            profile_build = conan_api.profiles.get_profile([profile_build_path])
-
-            # Check if profiles are valid
-            if profile_host is None or profile_build is None:
-                raise ValueError('Profile loading returned None')
-
-        except Exception:
-            # Use Conan's auto-detection to create minimal profiles
-            profile_host = conan_api.profiles.detect()
-            profile_build = conan_api.profiles.detect()
+        profile_host, profile_build = self._get_profiles(conan_api)
 
         # Step 3: Build dependency graph for the package - prepare parameters
         path = str(conanfile_path)
@@ -346,3 +304,42 @@ def publish(self) -> None:
                 )
             else:
                 raise ProviderInstallationError('conan', 'No packages found to upload')
+
+    def _get_profiles(self, conan_api: ConanAPI) -> tuple[Any, Any]:
+        """Get Conan profiles with fallback to auto-detection.
+
+        Args:
+            conan_api: The Conan API instance
+
+        Returns:
+            A tuple of (profile_host, profile_build) objects
+        """
+        logger = logging.getLogger('cppython.conan')
+
+        try:
+            profile_host_path = conan_api.profiles.get_default_host()
+            profile_build_path = conan_api.profiles.get_default_build()
+
+            # Check if profile paths exist
+            if profile_host_path is None or profile_build_path is None:
+                logger.warning('Default profile paths not available, using auto-detection')
+                raise ValueError('Profile paths are None')
+
+            # Load the actual profile objects
+            profile_host = conan_api.profiles.get_profile([profile_host_path])
+            profile_build = conan_api.profiles.get_profile([profile_build_path])
+
+            # Check if profiles are valid (not None)
+            if profile_host is None or profile_build is None:
+                logger.warning('Default profiles are corrupted/invalid, using auto-detection')
+                raise ValueError('Profile loading returned None')
+
+            logger.debug('Using existing default profiles')
+            return profile_host, profile_build
+
+        except Exception as e:
+            logger.warning('Default profiles not available (%s), using auto-detection', str(e))
+            # Use Conan's auto-detection to create minimal profiles
+            profile_host = conan_api.profiles.detect()
+            profile_build = conan_api.profiles.detect()
+            return profile_host, profile_build