Work on testProperties: now tests compliance for many propsets

Signed-off-by: Gary Oberbrunner <[email protected]>

Author: garyo

Examples/TestProps/testProperties.cpp

@@ -34,7 +34,7 @@ propertySets:
       - OfxImageEffectPropSupportedComponents
       - OfxImageEffectPropSupportedContexts
       - OfxImageEffectPropMultipleClipDepths
-      - OfxImageEffectPropOpenCLSupported
+      - OfxImageEffectPropOpenCLSupported | host_optional=true
       - OfxImageEffectPropSupportsMultipleClipPARs
       - OfxImageEffectPropSetableFrameRate
       - OfxImageEffectPropSetableFielding
@@ -43,36 +43,36 @@ propertySets:
       - OfxParamHostPropSupportsChoiceAnimation
       - OfxParamHostPropSupportsBooleanAnimation
       - OfxParamHostPropSupportsCustomAnimation
-      - OfxParamHostPropSupportsStrChoice
-      - OfxParamHostPropSupportsStrChoiceAnimation
+      - OfxParamHostPropSupportsStrChoice | host_optional=true
+      - OfxParamHostPropSupportsStrChoiceAnimation | host_optional=true
       - OfxParamHostPropMaxParameters
       - OfxParamHostPropMaxPages
       - OfxParamHostPropPageRowColumnCount
-      - OfxPropHostOSHandle
-      - OfxParamHostPropSupportsParametricAnimation
-      - OfxImageEffectInstancePropSequentialRender
+      - OfxPropHostOSHandle | host_optional=true
+      - OfxParamHostPropSupportsParametricAnimation | host_optional=true
+      - OfxImageEffectInstancePropSequentialRender | host_optional=true
       - OfxImageEffectPropOpenGLRenderSupported
-      - OfxImageEffectPropRenderQualityDraft
-      - OfxImageEffectHostPropNativeOrigin
-      - OfxImageEffectPropColourManagementAvailableConfigs
-      - OfxImageEffectPropColourManagementStyle
+      - OfxImageEffectPropRenderQualityDraft | host_optional=true
+      - OfxImageEffectHostPropNativeOrigin | host_optional=true
+      - OfxImageEffectPropColourManagementAvailableConfigs | host_optional=true
+      - OfxImageEffectPropColourManagementStyle | host_optional=true
   EffectDescriptor:
     write: plugin
     props:
       - OfxPropType
       - OfxPropLabel
       - OfxPropShortLabel
       - OfxPropLongLabel
-      - OfxPropVersion
-      - OfxPropVersionLabel
-      - OfxPropPluginDescription
+      - OfxPropVersion | host_optional=true
+      - OfxPropVersionLabel | host_optional=true
+      - OfxPropPluginDescription | host_optional=true
       - OfxImageEffectPropSupportedContexts
       - OfxImageEffectPluginPropGrouping
       - OfxImageEffectPluginPropSingleInstance
       - OfxImageEffectPluginRenderThreadSafety
       - OfxImageEffectPluginPropHostFrameThreading
       - OfxImageEffectPluginPropOverlayInteractV1
-      - OfxImageEffectPropOpenCLSupported
+      - OfxImageEffectPropOpenCLSupported | host_optional=true
       - OfxImageEffectPropSupportsMultiResolution
       - OfxImageEffectPropSupportsTiles
       - OfxImageEffectPropTemporalClipAccess
@@ -84,11 +84,11 @@ propertySets:
       - OfxImageEffectPropClipPreferencesSlaveParam
       - OfxImageEffectPropOpenGLRenderSupported
       - OfxPluginPropFilePath | write=host
-      - OfxOpenGLPropPixelDepth
+      - OfxOpenGLPropPixelDepth | host_optional=true
       - OfxImageEffectPluginPropOverlayInteractV2
-      - OfxImageEffectPropColourManagementAvailableConfigs
-      - OfxImageEffectPropColourManagementStyle
-      - OfxImageEffectPropNoSpatialAwareness
+      - OfxImageEffectPropColourManagementAvailableConfigs | host_optional=true
+      - OfxImageEffectPropColourManagementStyle | host_optional=true
+      - OfxImageEffectPropNoSpatialAwareness | host_optional=true
   EffectInstance:
     write: host
     props:
@@ -735,9 +735,8 @@ properties:
     type: bool
     dimension: 1
   OfxPluginPropFilePath:
-    type: enum
+    type: string
     dimension: 1
-    values: ['false', 'true', 'needed']
   OfxImageEffectPropOpenGLRenderSupported:
     type: enum
     dimension: 1

include/ofx-props.yml

@@ -54,6 +54,20 @@ class Logger {
    */
   static void setLogHandler(LogHandler handler);
 
+  /**
+   * @brief Set a context string (e.g., plugin name) to prepend to all log messages
+   *
+   * @param context The context string (typically plugin name)
+   */
+  static void setContext(const std::string& context);
+
+  /**
+   * @brief Get the current context string
+   *
+   * @return The current context string
+   */
+  static std::string getContext();
+
   /**
    * @brief Log an informational message
    *
@@ -146,6 +160,7 @@ class Logger {
   // Static member variables (inline in C++17)
   static inline LogHandler g_logHandler = defaultLogHandler;
   static inline std::mutex g_logMutex;
+  static inline std::string g_context;
 };
 
 // Inline implementations for non-template methods
@@ -160,6 +175,16 @@ inline void Logger::setLogHandler(LogHandler handler) {
   }
 }
 
+inline void Logger::setContext(const std::string& context) {
+  std::lock_guard<std::mutex> lock(g_logMutex);
+  g_context = context;
+}
+
+inline std::string Logger::getContext() {
+  std::lock_guard<std::mutex> lock(g_logMutex);
+  return g_context;
+}
+
 inline void Logger::info(const std::string& message) { log(Level::Info, message); }
 
 inline void Logger::warn(const std::string& message) { log(Level::Warning, message); }
@@ -170,7 +195,14 @@ inline void Logger::log(Level level, const std::string& message) {
   auto timestamp = std::chrono::system_clock::now();
 
   std::lock_guard<std::mutex> lock(g_logMutex);
-  g_logHandler(level, timestamp, message);
+
+  // Prepend context if set
+  std::string finalMessage = message;
+  if (!g_context.empty()) {
+    finalMessage = "[" + g_context + "] " + message;
+  }
+
+  g_logHandler(level, timestamp, finalMessage);
 }
 
 inline void Logger::defaultLogHandler(Level level, std::chrono::system_clock::time_point timestamp,
@@ -186,9 +218,6 @@ inline void Logger::defaultLogHandler(Level level, std::chrono::system_clock::ti
     localtime_r(&time, &local_time);
 #endif
 
-  // Stream to write log message
-  std::ostream& os = (level == Level::Error) ? std::cerr : std::cout;
-
   // Level prefix
   const char* levelStr = "";
   switch (level) {
@@ -203,8 +232,9 @@ inline void Logger::defaultLogHandler(Level level, std::chrono::system_clock::ti
       break;
   }
 
-  // Write formatted log message
-  os << "[" << std::put_time(&local_time, "%Y-%m-%d %H:%M:%S") << "][" << levelStr << "] " << message
+  // Write formatted log message to stdout (not stderr)
+  // In plugin contexts, stderr may not be captured by host applications
+  std::cout << "[" << std::put_time(&local_time, "%Y-%m-%d %H:%M:%S") << "][" << levelStr << "] " << message
      << std::endl;
 }