Prepare class WsjcppJsonRpc20ExportCliBase

Author: sea5kg

CMakeLists.txt

@@ -14,6 +14,8 @@ list (APPEND WSJCPP_INCLUDE_DIRS "src/app")
 # package
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20.h")
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20.cpp")
+list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20_export_cli_base.h")
+list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20_export_cli_base.cpp")
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20_export_cli_python.h")
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20_export_cli_python.cpp")
 list (APPEND WSJCPP_SOURCES "src/wsjcpp_jsonrpc20_export_cli_webjs.h")

example-of-exported/py3/API.md

@@ -2,7 +2,7 @@
 
 Automatically generated by wsjcpp-jsonrpc20. 
 * Version: v0.0.4
-* Date: Tue, 06 Oct 2020 02:19:51 GMT
+* Date: Wed, 07 Oct 2020 01:59: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: Tue, 06 Oct 2020 02:19:51 GMT
+### Date: Wed, 07 Oct 2020 01:59:09 GMT
 
 import asyncio
 import websocket
@@ -44,6 +44,7 @@ def hasConnection(self):
 
     def getToken(self):
         return self.__token
+    
     def setToken(self, token):
         if self.__token is None:
             self.__token = token

example-of-exported/webjs/API.md

@@ -2,7 +2,7 @@
 
  Automatically generated by wsjcpp-jsonrpc20. 
  * Version: v0.0.4
- * Date: 06 Oct 2020
+ * Date: 07 Oct 2020
 
  Include script ```dist/libwsjcppjson20client.js```
  Example connect:

example-of-exported/webjs/dist/libwsjcppjson20client.js

@@ -1,9 +1,9 @@
-// This file was automatically generated by wsjcpp-jsonrpc20 (v0.0.4), date: 06 Oct 2020
+// This file was automatically generated by wsjcpp-jsonrpc20 (v0.0.4), date: 07 Oct 2020
 window.SomeClient = window.SomeClient || (function() { 
     var self = {};
     self.appName = 'wsjcpp-jsonrpc20';
     self.appVersion = 'v0.0.4';
-    self.appBuildDate = '06 Oct 2020';
+    self.appBuildDate = '07 Oct 2020';
     var _lastm = 0;
     var _listeners = {};
     var _connectionState = '?';

src/wsjcpp_jsonrpc20_export_cli_base.cpp

@@ -0,0 +1,39 @@
+#include "wsjcpp_jsonrpc20_export_cli_base.h"
+
+#include <iostream>
+#include <iomanip>
+#include <algorithm>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <iomanip> // put_time
+#include <ctime>
+#include <sstream>
+
+// ---------------------------------------------------------------------
+// WsjcppJsonRpc20ExportCliBase
+
+WsjcppJsonRpc20ExportCliBase::WsjcppJsonRpc20ExportCliBase(
+    const std::string &sExportDir,
+    const std::string &sPackageName
+) {
+    TAG = "WsjcppJsonRpc20ExportCliBase";
+    m_sExportDir = WsjcppCore::doNormalizePath(sExportDir);
+    m_sPackageName = sPackageName;
+}
+
+// ---------------------------------------------------------------------
+
+std::string WsjcppJsonRpc20ExportCliBase::getExportDir() const {
+    return m_sExportDir;
+}
+
+// ---------------------------------------------------------------------
+
+std::string WsjcppJsonRpc20ExportCliBase::getPackageName() const {
+    return m_sPackageName;
+}
+
+// ---------------------------------------------------------------------

src/wsjcpp_jsonrpc20_export_cli_base.h

@@ -0,0 +1,28 @@
+#ifndef WSJCPP_JSONRPC20_EXPORT_CLI_BASE_H
+#define WSJCPP_JSONRPC20_EXPORT_CLI_BASE_H
+
+#include "wsjcpp_core.h"
+#include "wsjcpp_jsonrpc20.h"
+#include <vector>
+
+class WsjcppJsonRpc20ExportCliBase {
+    public:
+        WsjcppJsonRpc20ExportCliBase(
+            const std::string &sExportDir,
+            const std::string &sPackageName
+        );
+
+        std::string getExportDir() const;
+        std::string getPackageName() const;
+
+        virtual bool doExportLib() = 0;
+
+    protected:
+        std::string TAG;
+
+    private:
+        std::string m_sExportDir;
+        std::string m_sPackageName;
+};
+
+#endif //  WSJCPP_JSONRPC20_EXPORT_CLI_BASE_H

src/wsjcpp_jsonrpc20_export_cli_python.cpp

@@ -126,10 +126,8 @@ class PyCodeBuilder {
 WsjcppJsonRpc20ExportCliPython::WsjcppJsonRpc20ExportCliPython(
     const std::string &sExportDir,
     const std::string &sPackageName
-) {
+) : WsjcppJsonRpc20ExportCliBase(sExportDir, sPackageName) {
     TAG = "WsjcppJsonRpc20ExportCliPython";
-    m_sExportDir = WsjcppCore::doNormalizePath(sExportDir);
-    m_sPackageName = sPackageName;
     m_sAuthorName = "Unknown";
     m_sAuthorEmail = "unknown";
     m_sAppName = "unknown";
@@ -235,7 +233,7 @@ bool WsjcppJsonRpc20ExportCliPython::doExportLib() {
 
 bool WsjcppJsonRpc20ExportCliPython::exportPrepareDirs() {
     std::vector<std::string> vCreateDirs;
-    std::vector<std::string> vSplited = WsjcppCore::split(m_sExportDir, "/");
+    std::vector<std::string> vSplited = WsjcppCore::split(this->getExportDir(), "/");
     std::string sExportDir = "";
     for (int i = 0; i < vSplited.size(); i++) {
         if (i > 0) {
@@ -245,7 +243,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportPrepareDirs() {
         sExportDir = WsjcppCore::doNormalizePath(sExportDir);
         vCreateDirs.push_back(sExportDir);
     }
-    sExportDir = WsjcppCore::doNormalizePath(sExportDir + "/" + m_sPackageName);
+    sExportDir = WsjcppCore::doNormalizePath(sExportDir + "/" + this->getPackageName());
     vCreateDirs.push_back(sExportDir);
 
     for (int i = 0; i < vCreateDirs.size(); i++) {
@@ -267,20 +265,20 @@ bool WsjcppJsonRpc20ExportCliPython::exportPrepareDirs() {
 // ---------------------------------------------------------------------
 
 bool WsjcppJsonRpc20ExportCliPython::prepareReadmeMdIfNeed() {
-    std::string sReadmeMd = m_sExportDir + "/README.md";
+    std::string sReadmeMd = this->getExportDir() + "/README.md";
     if (!WsjcppCore::fileExists(sReadmeMd)) {
         std::string sContentReadme = 
-            "#" + m_sPackageName + "\n\n"
+            "#" + this->getPackageName() + "\n\n"
             + m_sClassName + " Python Library for " + m_sAppName + "\n\n"
             + "## Install \n\n"
             + "```\n"
-            + "$ pip3 install " + m_sPackageName + " --upgrade\n"
+            + "$ pip3 install " + this->getPackageName() + " --upgrade\n"
             + "```\n\n"
             + "## Example code\n\n"
             + "```\n"
             + "#!/usr/bin/env python3\n"
             + "# -*- coding: utf-8 -*-\n"
-            + "from " + m_sPackageName + " import " + m_sClassName + "\n\n"
+            + "from " + this->getPackageName() + " import " + m_sClassName + "\n\n"
             + "client = " + m_sClassName + "(\"ws://host/ws-api/\")\n\n"
             + "resp = client.server_api({})\n\n"
             + "print(resp)\n"
@@ -296,7 +294,7 @@ bool WsjcppJsonRpc20ExportCliPython::prepareReadmeMdIfNeed() {
 
 bool WsjcppJsonRpc20ExportCliPython::exportSetupPy() {
     std::ofstream setupPy;
-    std::string sFilename = m_sExportDir + "/setup.py";
+    std::string sFilename = this->getExportDir() + "/setup.py";
     WsjcppLog::info(TAG, "Prepare setup.py " + sFilename);
 
     // https://packaging.python.org/tutorials/packaging-projects/
@@ -307,9 +305,9 @@ bool WsjcppJsonRpc20ExportCliPython::exportSetupPy() {
         "    long_description = fh.read()\n"
         "\n"
         "setuptools.setup(\n"
-        "    name='" + m_sPackageName + "',\n"
+        "    name='" + this->getPackageName() + "',\n"
         "    version='" + m_sAppVersion + "',\n"
-        "    packages=['" + m_sPackageName + "'],\n"
+        "    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"
@@ -345,7 +343,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportSetupPy() {
 bool WsjcppJsonRpc20ExportCliPython::exportAPImd() {
 
     std::ofstream apimd;
-    std::string sFilename = m_sExportDir + "/API.md";
+    std::string sFilename = this->getExportDir() + "/API.md";
     WsjcppLog::info(TAG, "Prepare API.md " + sFilename);
 
     apimd.open(sFilename);
@@ -358,7 +356,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportAPImd() {
     apimd << "* Date: " << WsjcppCore::formatTimeForWeb(nSec) << "\n\n";
     apimd << "Example connect/disconnect:\n"
         << "```\n"
-        << "from " + m_sPackageName + " import " + m_sClassName + " \n\n"
+        << "from " + getPackageName() + " import " + m_sClassName + " \n\n"
         << "client = " + m_sClassName + "('ws://host:1234')\n"
         << " ... \n"
         << "client.close()\n"
@@ -426,7 +424,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportAPImd() {
 // ---------------------------------------------------------------------
 
 bool WsjcppJsonRpc20ExportCliPython::exportInitPy() {
-    std::string sFilename = m_sExportDir + "/" + m_sPackageName + "/__init__.py";
+    std::string sFilename = this->getExportDir() + "/" + this->getPackageName() + "/__init__.py";
     WsjcppLog::info(TAG, "Prepare __init__.py " + sFilename);
     std::ofstream __init__;
     __init__.open (sFilename);
@@ -470,8 +468,10 @@ void exportCliPythonAddCheckDataTypeOfParam(
     }
 };
 
+// ---------------------------------------------------------------------
+
 bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
-    std::string sFilename = m_sExportDir + "/" + m_sPackageName + "/" + m_sClassName + ".py";
+    std::string sFilename = this->getExportDir() + "/" + this->getPackageName() + "/" + m_sClassName + ".py";
     WsjcppLog::info(TAG, "Prepare " + m_sClassName + ".py: " + sFilename);
 
     std::ofstream clientpy;
@@ -534,6 +534,7 @@ bool WsjcppJsonRpc20ExportCliPython::exportClientPy() {
         .sub("def getToken(self):")
             .add("return self.__token")
             .end()
+        .add("")
         .sub("def setToken(self, token):")
             .sub("if self.__token is None:")
                 .add("self.__token = token")

src/wsjcpp_jsonrpc20_export_cli_python.h

@@ -1,11 +1,11 @@
 #ifndef WSJCPP_JSONRPC20_EXPORT_CLI_PYTHON_H
 #define WSJCPP_JSONRPC20_EXPORT_CLI_PYTHON_H
 
-#include <string>
+#include "wsjcpp_jsonrpc20_export_cli_base.h"
 #include <vector>
 #include <map>
 
-class WsjcppJsonRpc20ExportCliPython {
+class WsjcppJsonRpc20ExportCliPython : public WsjcppJsonRpc20ExportCliBase {
     public:
         WsjcppJsonRpc20ExportCliPython(
             const std::string &sExportDir,
@@ -22,11 +22,8 @@ class WsjcppJsonRpc20ExportCliPython {
         void addLoginMethod(const std::string &sMethod, const std::string &sResultVarName);
         void addLogoffMethod(const std::string &sMethod);
 
-        bool doExportLib();
+        virtual bool doExportLib() override;
     private:
-        std::string TAG;
-        std::string m_sExportDir;
-        std::string m_sPackageName;
         std::string m_sAuthorName;
         std::string m_sAuthorEmail;
         std::string m_sAppName;

src/wsjcpp_jsonrpc20_export_cli_webjs.cpp

@@ -19,10 +19,8 @@
 WsjcppJsonRpc20ExportCliWebJs::WsjcppJsonRpc20ExportCliWebJs(
     const std::string &sExportDir,
     const std::string &sPackageName
-) {
+) : WsjcppJsonRpc20ExportCliBase(sExportDir, sPackageName) {
     TAG = "WsjcppJsonRpc20ExportCliWebJs";
-    m_sExportDir = WsjcppCore::doNormalizePath(sExportDir);
-    m_sPackageName = sPackageName;
     m_sAuthorName = "Unknown";
     m_sAuthorEmail = "unknown";
     m_sAppName = "unknown";
@@ -106,7 +104,7 @@ void WsjcppJsonRpc20ExportCliWebJs::setAppVersion(const std::string &sAppVersion
 // ---------------------------------------------------------------------
 
 bool WsjcppJsonRpc20ExportCliWebJs::doExportLib() {
-    std::string sBasicDir = "./" + m_sPackageName;
+    std::string sBasicDir = "./" + this->getPackageName();
 
     if (!prepareDirs()) {
         return false;
@@ -126,8 +124,8 @@ bool WsjcppJsonRpc20ExportCliWebJs::doExportLib() {
 
 bool WsjcppJsonRpc20ExportCliWebJs::prepareDirs() {
     std::vector<std::string> vDirs;
-    vDirs.push_back(m_sExportDir);
-    vDirs.push_back(m_sExportDir + "/dist");
+    vDirs.push_back(this->getExportDir());
+    vDirs.push_back(this->getExportDir() + "/dist");
 
     for (int i = 0; i < vDirs.size(); i++) {
         std::string sDir = vDirs[i];
@@ -150,8 +148,8 @@ bool WsjcppJsonRpc20ExportCliWebJs::prepareDirs() {
 
 void WsjcppJsonRpc20ExportCliWebJs::exportPackageJson() {
     std::ofstream packageJson;
-    std::cout << " * write code to " << m_sExportDir << "/package.json " << std::endl;
-    packageJson.open (m_sExportDir + "/package.json");
+    std::cout << " * write code to " << this->getExportDir() << "/package.json " << std::endl;
+    packageJson.open (this->getExportDir() + "/package.json");
 
     std::time_t t = std::time(nullptr);
     std::stringstream buffer;
@@ -160,10 +158,10 @@ void WsjcppJsonRpc20ExportCliWebJs::exportPackageJson() {
     // look here an example https://github.com/jquery/jquery/blob/master/package.json
     packageJson << 
         "{\n"
-        "  \"name\": \"" + m_sPackageName + "\",\n"
+        "  \"name\": \"" + this->getPackageName() + "\",\n"
         "  \"version\": \"" + m_sAppVersion + "\",\n"
         "  \"description\": \"" + m_sClassName + " JavaScript Web Client Library for " + m_sAppName + "\",\n"
-        "  \"main\": \"dist/" + m_sPackageName + ".js\",\n"
+        "  \"main\": \"dist/" + this->getPackageName() + ".js\",\n"
         "  \"repository\": {\n"
         "    \"type\": \"" + m_sRepositoryType + "\",\n"
         "    \"url\": \"" + m_sRepositoryURL + "\"\n"
@@ -192,19 +190,19 @@ void WsjcppJsonRpc20ExportCliWebJs::exportPackageJson() {
 void WsjcppJsonRpc20ExportCliWebJs::exportAPImd() {
 
     std::ofstream apimd;
-    std::cout << " * write file to " + m_sExportDir + "/API.md" << std::endl;
-    apimd.open(m_sExportDir + "/API.md");
+    std::cout << " * write file to " + this->getExportDir() + "/API.md" << std::endl;
+    apimd.open(this->getExportDir() + "/API.md");
 
     std::time_t t = std::time(nullptr);
     std::stringstream buffer;
     buffer << std::put_time(std::gmtime(&t), "%d %b %Y");
 
     apimd <<
-        "# " + m_sPackageName + "\n\n"
+        "# " + this->getPackageName() + "\n\n"
         " Automatically generated by " << m_sAppName << ". \n"
         " * Version: " << m_sAppVersion << "\n"
         " * Date: " << buffer.str() << "\n\n"
-        " Include script ```dist/" + m_sPackageName + ".js```\n"
+        " Include script ```dist/" + this->getPackageName() + ".js```\n"
         " Example connect:\n"
         "```\n"
         "var client = new " + m_sClassName + "();\n"
@@ -288,14 +286,14 @@ void WsjcppJsonRpc20ExportCliWebJs::exportAPImd() {
 // ---------------------------------------------------------------------
 
 void WsjcppJsonRpc20ExportCliWebJs::exportSampleHtmlFile() {
-    std::string sFilename = m_sExportDir + "/sample.html";
+    std::string sFilename = this->getExportDir() + "/sample.html";
     std::ofstream sample_html;
     std::cout << " * write code to " << sFilename << std::endl;
     sample_html.open(sFilename);
     sample_html <<
         "<html>\r\n"
         "<head>\r\n"
-        "    <script src='dist/" + m_sPackageName + ".js'></script>\r\n"
+        "    <script src='dist/" + this->getPackageName() + ".js'></script>\r\n"
         "    <script>\r\n"
         "        function log(n) {\r\n"
         "            console.log(n);\r\n"
@@ -370,7 +368,7 @@ void WsjcppJsonRpc20ExportCliWebJs::exportSampleHtmlFile() {
 
 bool WsjcppJsonRpc20ExportCliWebJs::exportLibCliWebJSFile() {
 
-    std::string sFilename = m_sExportDir + "/dist/" + m_sPackageName + ".js";
+    std::string sFilename = this->getExportDir() + "/dist/" + this->getPackageName() + ".js";
     std::ofstream libwjscppcli_web_js_file;
     std::cout << " * write code to " << sFilename << std::endl;
     libwjscppcli_web_js_file.open(sFilename);
@@ -687,7 +685,7 @@ bool WsjcppJsonRpc20ExportCliWebJs::exportLibCliWebJSFile() {
 // ---------------------------------------------------------------------
 
 void WsjcppJsonRpc20ExportCliWebJs::exportLibCliWebServiceTSFile() {
-    std::string sFilename = m_sExportDir + "/dist/" + m_sPackageName + ".service.ts";
+    std::string sFilename = this->getExportDir() + "/dist/" + this->getPackageName() + ".service.ts";
     std::ofstream libwjscppcli_web_service_ts_file;
     std::cout << " * write code to " << sFilename << std::endl;
     libwjscppcli_web_service_ts_file.open(sFilename);