fix: Make focuable interface separate

rdkcentral · Jul 25, 2024 · 4bd523d · 4bd523d
1 parent 82022de
commit 4bd523d
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 41 deletions.
diff --git a/languages/cpp/templates/codeblocks/interface-focusable.cpp b/languages/cpp/templates/codeblocks/interface-focusable.cpp
@@ -0,0 +1,47 @@
+    static void ProviderInvokeSession(std::string& methodName, JsonObject& jsonParameters, Firebolt::Error *err = nullptr)
+    {
+        Firebolt::Error status = Firebolt::Error::NotConnected;
+        FireboltSDK::Transport<WPEFramework::Core::JSON::IElement>* transport = FireboltSDK::Accessor::Instance().GetTransport();
+        if (transport != nullptr) {
+
+            JsonObject jsonResult;
+            status = transport->Invoke(methodName, jsonParameters, jsonResult);
+            if (status == Firebolt::Error::None) {
+                FIREBOLT_LOG_INFO(FireboltSDK::Logger::Category::OpenRPC, FireboltSDK::Logger::Module<FireboltSDK::Accessor>(), "%s is successfully invoked", methodName.c_str());
+            }
+
+        } else {
+            FIREBOLT_LOG_ERROR(FireboltSDK::Logger::Category::OpenRPC, FireboltSDK::Logger::Module<FireboltSDK::Accessor>(), "Error in getting Transport err = %d", status);
+        }
+        if (err != nullptr) {
+            *err = status;
+        }
+    }
+    static void ProviderFocusSession(std::string methodName, std::string& correlationId, Firebolt::Error *err = nullptr)
+    {
+        JsonObject jsonParameters;
+        WPEFramework::Core::JSON::Variant CorrelationId(correlationId);
+        jsonParameters.Set(_T("correlationId"), CorrelationId);
+
+        ProviderInvokeSession(methodName, jsonParameters, err);
+    }
+    static void ProviderResultSession(std::string methodName, std::string& correlationId, ${provider.xresponse.name} result, Firebolt::Error *err = nullptr)
+    {
+        JsonObject jsonParameters;
+        WPEFramework::Core::JSON::Variant CorrelationId(correlationId);
+        jsonParameters.Set(_T("correlationId"), CorrelationId);
+
+${provider.xresponse.serialization}
+        ProviderInvokeSession(methodName, jsonParameters, err);
+    }
+    static void ProviderErrorSession(std::string methodName, std::string& correlationId, ${provider.xerror.name} result, Firebolt::Error *err = nullptr)
+    {
+        JsonObject jsonParameters;
+        WPEFramework::Core::JSON::Variant CorrelationId(correlationId);
+        jsonParameters.Set(_T("correlationId"), CorrelationId);
+
+${provider.xerror.serialization}
+        ProviderInvokeSession(methodName, jsonParameters, err);
+    }
+
+${methods}
diff --git a/languages/cpp/templates/codeblocks/interface-focusable.h b/languages/cpp/templates/codeblocks/interface-focusable.h
@@ -0,0 +1,12 @@
+struct I${info.Title}Session : virtual public IFocussableProviderSession {
+    virtual ~I${info.Title}Session() override = default;
+
+    virtual void error( ${provider.xerror.name} error, Firebolt::Error *err = nullptr ) = 0;
+    virtual void result( ${provider.xresponse.name} result, Firebolt::Error *err = nullptr ) = 0;
+};
+
+struct I${info.Title}Provider {
+    virtual ~I${info.Title}Provider() = default;
+
+${methods}
+};
diff --git a/languages/cpp/templates/codeblocks/interface.cpp b/languages/cpp/templates/codeblocks/interface.cpp
@@ -17,31 +17,5 @@
             *err = status;
         }
     }
-    static void ProviderFocusSession(std::string methodName, std::string& correlationId, Firebolt::Error *err = nullptr)
-    {
-        JsonObject jsonParameters;
-        WPEFramework::Core::JSON::Variant CorrelationId(correlationId);
-        jsonParameters.Set(_T("correlationId"), CorrelationId);
-
-        ProviderInvokeSession(methodName, jsonParameters, err);
-    }
-    static void ProviderResultSession(std::string methodName, std::string& correlationId, ${provider.xresponse.name} result, Firebolt::Error *err = nullptr)
-    {
-        JsonObject jsonParameters;
-        WPEFramework::Core::JSON::Variant CorrelationId(correlationId);
-        jsonParameters.Set(_T("correlationId"), CorrelationId);
-
-${provider.xresponse.serialization}
-        ProviderInvokeSession(methodName, jsonParameters, err);
-    }
-    static void ProviderErrorSession(std::string methodName, std::string& correlationId, ${provider.xerror.name} result, Firebolt::Error *err = nullptr)
-    {
-        JsonObject jsonParameters;
-        WPEFramework::Core::JSON::Variant CorrelationId(correlationId);
-        jsonParameters.Set(_T("correlationId"), CorrelationId);
-
-${provider.xerror.serialization}
-        ProviderInvokeSession(methodName, jsonParameters, err);
-    }
 
 ${methods}
diff --git a/languages/cpp/templates/codeblocks/interface.h b/languages/cpp/templates/codeblocks/interface.h
@@ -1,10 +1,3 @@
-struct I${info.Title}Session : virtual public IFocussableProviderSession {
-    virtual ~I${info.Title}Session() override = default;
-
-    virtual void error( ${provider.xerror.name} error, Firebolt::Error *err = nullptr ) = 0;
-    virtual void result( ${provider.xresponse.name} result, Firebolt::Error *err = nullptr ) = 0;
-};
-
 struct I${info.Title}Provider {
     virtual ~I${info.Title}Provider() = default;
 

diff --git a/src/macrofier/engine.mjs b/src/macrofier/engine.mjs
@@ -1813,9 +1813,24 @@ function insertProviderInterfaceMacros(template, capability, moduleJson = {}, te
   let name = getProviderInterfaceName(iface, capability, moduleJson)
   let xValues
   const suffix = state.destination ? state.destination.split('.').pop() : ''
-  let interfaceShape = getTemplate(suffix ? `/codeblocks/interface.${suffix}` : '/codeblocks/interface', templates)
-  if (!interfaceShape) {
-    interfaceShape = getTemplate('/codeblocks/interface', templates)
+
+  // Determine if any method has the 'x-allow-focus' tag set to true
+  const hasFocusableMethods = iface.some(method => 
+    method.tags.some(tag => tag['x-allow-focus'] === true)
+  )
+
+  // Determine the appropriate template based on hasFocusableMethods and suffix
+  let interfaceShape;
+  if (hasFocusableMethods) {
+    interfaceShape = getTemplate(suffix ? `/codeblocks/interface-focusable.${suffix}` : '/codeblocks/interface-focusable', templates);
+    if (!interfaceShape) {
+      interfaceShape = getTemplate('/codeblocks/interface-focusable', templates);
+    }
+  } else {
+    interfaceShape = getTemplate(suffix ? `/codeblocks/interface.${suffix}` : '/codeblocks/interface', templates);
+    if (!interfaceShape) {
+      interfaceShape = getTemplate('/codeblocks/interface', templates);
+    }
   }
 
   interfaceShape = interfaceShape.replace(/\$\{name\}/g, name)

diff --git a/src/macrofier/index.mjs b/src/macrofier/index.mjs
@@ -314,9 +314,9 @@ const macrofy = async (
         }
 
         await writeFiles(outputFiles)
-        // if (persistPermission) {
-        //     await writeFilesPermissions(templatesPermission)
-        // }
+        if (persistPermission) {
+            await writeFilesPermissions(templatesPermission)
+        }
         logSuccess(`Wrote ${Object.keys(outputFiles).length} files.`)
 
         resolve()

diff --git a/src/shared/modules.mjs b/src/shared/modules.mjs
@@ -91,8 +91,8 @@ const getProviderInterfaceMethods = (capability, json) => {
 
 function getProviderInterface(capability, module, extractProviderSchema = false) {
     module = JSON.parse(JSON.stringify(module))
-    const iface = getProviderInterfaceMethods(capability, module)//.map(method => localizeDependencies(method, module, null, { mergeAllOfs: true }))
-  
+    const iface = getProviderInterfaceMethods(capability, module).map(method => localizeDependencies(method, module, null, { mergeAllOfs: true }))
+
     iface.forEach(method => {
       const payload = getPayloadFromEvent(method)
       const focusable = method.tags.find(t => t['x-allow-focus'])