Moved methods setAuthor* and setClassName to Export Cli Base class

Author: sea5kg

example-of-exported/py3/API.md

@@ -2,7 +2,7 @@
 
 Automatically generated by wsjcpp-jsonrpc20. 
 * Version: v0.0.4
-* Date: Wed, 07 Oct 2020 02:05:13 GMT
+* Date: Wed, 07 Oct 2020 17:03:09 GMT
 
 Example connect/disconnect:
 ```

example-of-exported/py3/libwsjcppjson20client/SomeClient.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 ### This file was automatically generated by wsjcpp-jsonrpc20
 ### Version: v0.0.4
-### Date: Wed, 07 Oct 2020 02:05:13 GMT
+### Date: Wed, 07 Oct 2020 17:03:09 GMT
 
 import asyncio
 import websocket

src/wsjcpp_jsonrpc20_export_cli_base.cpp

@@ -22,6 +22,11 @@ WsjcppJsonRpc20ExportCliBase::WsjcppJsonRpc20ExportCliBase(
     TAG = "WsjcppJsonRpc20ExportCliBase";
     m_sExportDir = WsjcppCore::doNormalizePath(sExportDir);
     m_sPackageName = sPackageName;
+    m_sAppName = "unknown";
+    m_sAppVersion = "unknown";
+    m_sAuthorName = "Unknown";
+    m_sAuthorEmail = "unknown";
+    m_sClassName = "Unknown";
 }
 
 // ---------------------------------------------------------------------
@@ -63,4 +68,40 @@ std::string WsjcppJsonRpc20ExportCliBase::getAppVersion() const {
     return m_sAppVersion;
 }
 
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20ExportCliBase::setAuthorName(const std::string &sAuthorName) {
+    m_sAuthorName = sAuthorName;
+}
+
+// ---------------------------------------------------------------------
+
+std::string WsjcppJsonRpc20ExportCliBase::getAuthorName() const {
+    return m_sAuthorName;
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20ExportCliBase::setAuthorEmail(const std::string &sAuthorEmail) {
+    m_sAuthorEmail = sAuthorEmail;
+}
+
+// ---------------------------------------------------------------------
+
+std::string WsjcppJsonRpc20ExportCliBase::getAuthorEmail() const {
+    return m_sAuthorEmail;
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20ExportCliBase::setClassName(const std::string &sClassName) {
+    m_sClassName = sClassName;
+}
+
+// ---------------------------------------------------------------------
+
+std::string WsjcppJsonRpc20ExportCliBase::getClassName() const {
+    return m_sClassName;
+}
+
 // ---------------------------------------------------------------------

src/wsjcpp_jsonrpc20_export_cli_base.h

@@ -18,6 +18,12 @@ class WsjcppJsonRpc20ExportCliBase {
         std::string getAppName() const;
         void setAppVersion(const std::string &sAppVersion);
         std::string getAppVersion() const;
+        void setAuthorName(const std::string &sAuthorName);
+        std::string getAuthorName() const;
+        void setAuthorEmail(const std::string &sAuthorEmail);
+        std::string getAuthorEmail() const;
+        void setClassName(const std::string &sClassName);
+        std::string getClassName() const;
 
         virtual bool doExportLib() = 0;
 
@@ -29,6 +35,11 @@ class WsjcppJsonRpc20ExportCliBase {
         std::string m_sPackageName;
         std::string m_sAppName;
         std::string m_sAppVersion;
+
+        std::string m_sClassName;
+        std::string m_sAuthorName;
+        std::string m_sAuthorEmail;
+
 };
 
 #endif //  WSJCPP_JSONRPC20_EXPORT_CLI_BASE_H

src/wsjcpp_jsonrpc20_export_cli_python.cpp

@@ -128,32 +128,11 @@ WsjcppJsonRpc20ExportCliPython::WsjcppJsonRpc20ExportCliPython(
     const std::string &sPackageName
 ) : WsjcppJsonRpc20ExportCliBase(sExportDir, sPackageName) {
     TAG = "WsjcppJsonRpc20ExportCliPython";
-    m_sAuthorName = "Unknown";
-    m_sAuthorEmail = "unknown";
-    m_sClassName = "Unknown";
     m_sUrl = "none";
 }
 
 // ---------------------------------------------------------------------
 
-void WsjcppJsonRpc20ExportCliPython::setAuthorName(const std::string &sAuthorName) {
-    m_sAuthorName = sAuthorName;
-}
-
-// ---------------------------------------------------------------------
-
-void WsjcppJsonRpc20ExportCliPython::setAuthorEmail(const std::string &sAuthorEmail) {
-    m_sAuthorEmail = sAuthorEmail;
-}
-
-// ---------------------------------------------------------------------
-
-void WsjcppJsonRpc20ExportCliPython::setClassName(const std::string &sClassName) {
-    m_sClassName = sClassName;
-}
-
-// ---------------------------------------------------------------------
-
 void WsjcppJsonRpc20ExportCliPython::setUrl(const std::string &sUrl) {
     m_sUrl = sUrl;
 }
@@ -252,7 +231,7 @@ bool WsjcppJsonRpc20ExportCliPython::prepareReadmeMdIfNeed() {
     if (!WsjcppCore::fileExists(sReadmeMd)) {
         std::string sContentReadme = 
             "#" + this->getPackageName() + "\n\n"
-            + m_sClassName + " Python Library for " + this->getAppName() + "\n\n"
+            + this->getClassName() + " Python Library for " + this->getAppName() + "\n\n"
             + "## Install \n\n"
             + "```\n"
             + "$ pip3 install " + this->getPackageName() + " --upgrade\n"
@@ -261,8 +240,8 @@ bool WsjcppJsonRpc20ExportCliPython::prepareReadmeMdIfNeed() {
             + "```\n"
             + "#!/usr/bin/env python3\n"
             + "# -*- coding: utf-8 -*-\n"
-            + "from " + this->getPackageName() + " import " + m_sClassName + "\n\n"
-            + "client = " + m_sClassName + "(\"ws://host/ws-api/\")\n\n"
+            + "from " + this->getPackageName() + " import " + this->getClassName() + "\n\n"
+            + "client = " + this->getClassName() + "(\"ws://host/ws-api/\")\n\n"
             + "resp = client.server_api({})\n\n"
             + "print(resp)\n"
             + "```\n\n"
@@ -293,9 +272,9 @@ bool WsjcppJsonRpc20ExportCliPython::exportSetupPy() {
         "    packages=['" + this->getPackageName() + "'],\n"
         "    install_requires=['websocket-client>=0.56.0', 'requests>=2.21.0'],\n"
         "    keywords=['" + WsjcppCore::join(m_vKeywords, "', '") + "'],\n"
-        "    author='" + m_sAuthorName + "',\n"
-        "    author_email='" + m_sAuthorEmail + "',\n"
-        "    description='" + m_sClassName + " Python Library for " + this->getAppName() + "',\n"
+        "    author='" + this->getAuthorName() + "',\n"
+        "    author_email='" + this->getAuthorEmail() + "',\n"
+        "    description='" + this->getClassName() + " Python Library for " + this->getAppName() + "',\n"
         "    long_description=long_description,\n"
         "    long_description_content_type='text/markdown',\n"
         "    url='" + m_sUrl + "',\n"
@@ -333,14 +312,14 @@ bool WsjcppJsonRpc20ExportCliPython::exportAPImd() {
 
     long nSec = WsjcppCore::getCurrentTimeInSeconds();
 
-    apimd << "# " + m_sClassName + " Python Library \n\n";
+    apimd << "# " + this->getClassName() + " Python Library \n\n";
     apimd << "Automatically generated by " << this->getAppName() << ". \n";
     apimd << "* Version: " << this->getAppVersion() << "\n";
     apimd << "* Date: " << WsjcppCore::formatTimeForWeb(nSec) << "\n\n";
     apimd << "Example connect/disconnect:\n"
         << "```\n"
-        << "from " + getPackageName() + " import " + m_sClassName + " \n\n"
-        << "client = " + m_sClassName + "('ws://host:1234')\n"
+        << "from " + getPackageName() + " import " + this->getClassName() + " \n\n"
+        << "client = " + this->getClassName() + "('ws://host:1234')\n"
         << " ... \n"
         << "client.close()\n"
         << "```\n";
@@ -411,7 +390,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportInitPy() {
     WsjcppLog::info(TAG, "Prepare __init__.py " + sFilename);
     std::ofstream __init__;
     __init__.open (sFilename);
-    __init__ << "from ." << m_sClassName << " import " << m_sClassName << "\n";
+    __init__ << "from ." << this->getClassName() << " import " << this->getClassName() << "\n";
     WsjcppLog::ok(TAG, "Done: " + sFilename);
     return true;
 }
@@ -454,8 +433,8 @@ void exportCliPythonAddCheckDataTypeOfParam(
 // ---------------------------------------------------------------------
 
 bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
-    std::string sFilename = this->getExportDir() + "/" + this->getPackageName() + "/" + m_sClassName + ".py";
-    WsjcppLog::info(TAG, "Prepare " + m_sClassName + ".py: " + sFilename);
+    std::string sFilename = this->getExportDir() + "/" + this->getPackageName() + "/" + this->getClassName() + ".py";
+    WsjcppLog::info(TAG, "Prepare " + this->getClassName() + ".py: " + sFilename);
 
     std::ofstream clientpy;
     clientpy.open (sFilename);
@@ -476,7 +455,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
     .add("import select")
     .add("import time")
     .add("")
-    .sub("class " + m_sClassName + ":")
+    .sub("class " + this->getClassName() + ":")
         .add("__ws = None")
         .add("__url = None")
         .add("__cli_version = '" + this->getAppVersion() + "'")
@@ -732,14 +711,14 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
             if (paramDef.isRequired()) {
                 builder
                 .sub("if " + sParamName + " is None: ")
-                    .add("raise Exception('Parameter \"" + sParamName + "\" expected (lib: " + m_sClassName + "." + sMethod + ")')")
+                    .add("raise Exception('Parameter \"" + sParamName + "\" expected (lib: " + this->getClassName() + "." + sMethod + ")')")
                     .end();
-                exportCliPythonAddCheckDataTypeOfParam(builder, paramDef, m_sClassName, sMethod);
+                exportCliPythonAddCheckDataTypeOfParam(builder, paramDef, this->getClassName(), sMethod);
                 builder.add("reqJson['params']['" + sParamName + "'] = " + sParamName);
             } else if (paramDef.isOptional()) {
                 builder
                     .sub("if " + sParamName + " != None: ");
-                exportCliPythonAddCheckDataTypeOfParam(builder, paramDef, m_sClassName, sMethod);
+                exportCliPythonAddCheckDataTypeOfParam(builder, paramDef, this->getClassName(), sMethod);
                     builder
                         .add("reqJson['params']['" + sParamName + "'] = " + sParamName)
                         .end();

src/wsjcpp_jsonrpc20_export_cli_python.h

@@ -11,9 +11,6 @@ class WsjcppJsonRpc20ExportCliPython : public WsjcppJsonRpc20ExportCliBase {
             const std::string &sExportDir,
             const std::string &sPackageName
         );
-        void setAuthorName(const std::string &sAuthorName);
-        void setAuthorEmail(const std::string &sAuthorEmail);
-        void setClassName(const std::string &sClassName);
         void setUrl(const std::string &sUrl);
         void setDownloadUrl(const std::string &sDownloadUrl);
         void setKeywords(const std::vector<std::string> &vKeywords);
@@ -22,9 +19,7 @@ class WsjcppJsonRpc20ExportCliPython : public WsjcppJsonRpc20ExportCliBase {
 
         virtual bool doExportLib() override;
     private:
-        std::string m_sAuthorName;
-        std::string m_sAuthorEmail;
-        std::string m_sClassName;
+
         std::string m_sUrl;
         std::string m_sDownloadUrl;
         std::vector<std::string> m_vKeywords;