WIP proto for parametric signature

(references OpenFLUID#1157)
Arthoni · Oct 26, 2023 · 3c6f745 · 3c6f745
1 parent 15c9a87
commit 3c6f745
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/CMake.in.cmake b/CMake.in.cmake
@@ -23,7 +23,7 @@ SET(OFBUILD_CUSTOM_CMAKE_VERSION "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.
 SET(OPENFLUID_VERSION_MAJOR 2)
 SET(OPENFLUID_VERSION_MINOR 2)
 SET(OPENFLUID_VERSION_PATCH 0)
-SET(OPENFLUID_VERSION_STATUS "alpha99") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
+SET(OPENFLUID_VERSION_STATUS "alpha100") # example: SET(OPENFLUID_VERSION_STATUS "rc1")
 
 SET(OPENFLUID_VERSION_FULL "${OPENFLUID_VERSION_MAJOR}.${OPENFLUID_VERSION_MINOR}.${OPENFLUID_VERSION_PATCH}")
 

diff --git a/cmake/OpenFLUIDHelpers.cmake.in b/cmake/OpenFLUIDHelpers.cmake.in
@@ -174,10 +174,10 @@ FUNCTION(_OPENFLUID_WAREPLUGIN_BUILD)
     SET(CMAKE_BUILD_TYPE "Debug")
   ENDIF()
 
-  # Run info2build if not already done
+  # Run info2build if not already done, src-path was CMAKE_SOURCE_DIR but parametrized signature require configuration
   IF (NOT _FORCE_PARAMSUI)
     EXECUTE_PROCESS(COMMAND "${OpenFLUID_CMD_PROGRAM}" "info2build"
-                            "--src-path=${CMAKE_SOURCE_DIR}" "--dest-path=${CMAKE_BINARY_DIR}"
+                            "--src-path=${CMAKE_BINARY_DIR}" "--dest-path=${CMAKE_BINARY_DIR}"
                     RESULT_VARIABLE _WAREINFO_RESULT
                     OUTPUT_VARIABLE _WAREINFO_OUTPUT)
     IF(_WAREINFO_RESULT AND NOT _WAREINFO_RESULT EQUAL 0)

diff --git a/share/openfluid/waresdev/templates/common/skeleton/CMakeLists.txt b/share/openfluid/waresdev/templates/common/skeleton/CMakeLists.txt
@@ -4,6 +4,8 @@ PROJECT("%%WAREID%%")
 
 FIND_PACKAGE(OpenFLUID REQUIRED)
 
+CONFIGURE_FILE(openfluid-ware.json openfluid-ware.json COPYONLY)
+
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(tests)

diff --git a/src/openfluid/tools/IDHelpers.cpp b/src/openfluid/tools/IDHelpers.cpp
@@ -82,12 +82,19 @@ bool isValidDatasetName(const std::string& Name)
 // =====================================================================
 
 
-bool isValidWareID(const openfluid::ware::WareID_t& ID)
+bool isValidWareID(const openfluid::ware::WareID_t& ID, bool Template)
 {
   // authorized chars: a to z, A to Z, 0 to 9, -, ., _
   // must start by an alphanumeric char
 
-  return std::regex_match(ID,std::regex(WareIDRuleString));
+  if (Template)
+  {
+    return std::regex_match(ID,std::regex(WareIDRuleStringAndTpl));
+  }
+  else
+  {
+    return std::regex_match(ID,std::regex(WareIDRuleString));
+  }
 }
 
 

diff --git a/src/openfluid/tools/IDHelpers.hpp b/src/openfluid/tools/IDHelpers.hpp
@@ -60,6 +60,7 @@ namespace openfluid { namespace tools {
 constexpr auto DatasetNameRuleString("[A-Za-z0-9]+([A-Za-z0-9_\\.\\-]*)");
 
 constexpr auto WareIDRuleString("[A-Za-z0-9]+([A-Za-z0-9_\\.\\-]*)");
+constexpr auto WareIDRuleStringAndTpl("[A-Za-z0-9]+([A-Za-z0-9_@\\.\\-]*)");
 
 constexpr auto FragmentNameRuleString("[A-Za-z]+([A-Za-z0-9_\\.\\-]*)");
 
@@ -99,7 +100,7 @@ bool OPENFLUID_API isValidDatasetName(const std::string& Name);
   @param[in] ID the ware ID to check
   @return true if the ID is valid
 */
-bool OPENFLUID_API isValidWareID(const openfluid::ware::WareID_t& ID);
+bool OPENFLUID_API isValidWareID(const openfluid::ware::WareID_t& ID, bool Template=false);
 
 
 /**

diff --git a/src/openfluid/ui/common/SignatureEditorWidget.cpp b/src/openfluid/ui/common/SignatureEditorWidget.cpp
@@ -923,7 +923,7 @@ bool SignatureEditorWidget::isValidID() const
     return true;
   }
 
-  return openfluid::tools::isValidWareID(ui->IDEdit->text().toStdString());
+  return openfluid::tools::isValidWareID(ui->IDEdit->text().toStdString(), true);
 }
 
 

diff --git a/src/openfluid/ui/waresdev/NewWareDialog.cpp b/src/openfluid/ui/waresdev/NewWareDialog.cpp
@@ -199,7 +199,7 @@ QRegularExpression NewWareDialog::getWareIdRegExp(QString& Tooltip)
 
   Tooltip = QObject::tr("Accepts only letters, digits, dashes ('-'), underscores ('_') and dots ('.').");
 #if (QT_VERSION_MAJOR < 6)
-  return QRegExp(QString::fromStdString(openfluid::tools::WareIDRuleString));
+  return QRegExp(QString::fromStdString(openfluid::tools::WareIDRuleStringAndTpl));
 #else
   return QRegularExpression(QString::fromStdString(openfluid::tools::WareIDRuleString));
 #endif

diff --git a/src/openfluid/waresdev/WareSignatureSerializer.hpp b/src/openfluid/waresdev/WareSignatureSerializer.hpp
@@ -288,7 +288,7 @@ SignatureType WareSignatureSerializer<SignatureType>::fromJSONBase(const openflu
   SignatureType Sign;
 
   Sign.ID = Json.value("id","");
-  if (!openfluid::tools::isValidWareID(Sign.ID))
+  if (!openfluid::tools::isValidWareID(Sign.ID, true))
   {
     throw openfluid::base::FrameworkException(OPENFLUID_CODE_LOCATION,"Missing or invalid ware ID");
   }