refactor

src/kodiclient.cpp

@@ -61,66 +61,17 @@ void CKodiClient::Process()
 
       printf("Connected to Kodi\n");
 
-      //Keep reading data from Kodi, when the tcp socket is closed an exception is thrown.
+      //Read data from the TCP socket, and split into separate JSON objects.
-      uint32_t    bracketlevel = 0;
+      ResetSplit();
-      bool        instring = false;
-      bool        escaped  = false;
-      std::string jsonstr;
       for(;;)
       {
         boost::asio::streambuf receive_buffer;
-        size_t bytesread = boost::asio::read(socket, receive_buffer, boost::asio::transfer_at_least(1));
+        size_t bytesread = boost::asio::read(socket, receive_buffer,
+                                             boost::asio::transfer_at_least(1));
 
         const char* data = boost::asio::buffer_cast<const char*>(receive_buffer.data());
 
-        //Parse the JSON data into separate JSON objects by finding the text from
+        Split(data, bytesread);
-        //the starting { to ending }, while ignoring curly brackets in strings.
-        for (uint32_t i = 0; i < (uint32_t)bytesread; i++)
-        {
-          jsonstr.push_back(data[i]);
-
-          if (!instring)
-          {
-            if (data[i] == '"')
-            {
-              instring = true;
-            }
-            else if (data[i] == '{')
-            {
-              bracketlevel++;
-            }
-            else if (data[i] == '}')
-            {
-              if (bracketlevel > 0)
-              {
-                bracketlevel--;
-                if (bracketlevel == 0)
-                {
-                  Parse(jsonstr);
-                  jsonstr.clear();
-                }
-              }
-              else
-              {
-                jsonstr.clear(); //Shouldn't happen.
-              }
-            }
-          }
-          else
-          {
-            if (!escaped)
-            {
-              if (data[i] == '\\')
-                escaped = true;
-              else if (data[i] == '"')
-                instring = false;
-            }
-            else
-            {
-              escaped = false;
-            }
-          }
-        }
       }
     }
     catch(boost::system::system_error& error)
@@ -132,6 +83,67 @@ void CKodiClient::Process()
   }
 }
 
+void CKodiClient::ResetSplit()
+{
+  m_bracketlevel = 0;
+  m_instring     = false;
+  m_escaped      = false;
+  m_parsebuf.clear();
+}
+
+/*! Splits JSON objects from Kodi's JSON RPC and passes them to Parse().*/
+void CKodiClient::Split(const char* data, uint32_t len)
+{
+  //Parse the JSON data into separate JSON objects by finding the text from
+  //the starting { to ending }, while ignoring curly brackets in strings.
+  for (uint32_t i = 0; i < len; i++)
+  {
+    m_parsebuf.push_back(data[i]);
+
+    if (!m_instring)
+    {
+      if (data[i] == '"')
+      {
+        m_instring = true;
+      }
+      else if (data[i] == '{')
+      {
+        m_bracketlevel++;
+      }
+      else if (data[i] == '}')
+      {
+        if (m_bracketlevel > 0)
+        {
+          m_bracketlevel--;
+          if (m_bracketlevel == 0)
+          { //Parse the full received JSON object.
+            Parse(m_parsebuf);
+            m_parsebuf.clear();
+          }
+        }
+        else
+        {
+          m_parsebuf.clear(); //Shouldn't happen.
+        }
+      }
+    }
+    else
+    {
+      if (!m_escaped)
+      {
+        if (data[i] == '\\')
+          m_escaped = true;
+        else if (data[i] == '"')
+          m_instring = false;
+      }
+      else
+      {
+        m_escaped = false;
+      }
+    }
+  }
+}
+
 void CKodiClient::Parse(const std::string& jsonstr)
 {
   json jsondata = json::parse(jsonstr);

src/kodiclient.h

@@ -32,10 +32,17 @@ class CKodiClient
   private:
     static void SProcess(CKodiClient* kodiclient);
     void        Process();
+    void        ResetSplit();
+    void        Split(const char* data, uint32_t len);
     void        Parse(const std::string& jsonstr);
 
     std::thread m_thread;
     CAmpSwitch* m_ampswitch;
+
+    uint32_t    m_bracketlevel;
+    bool        m_instring;
+    bool        m_escaped;
+    std::string m_parsebuf;
 };
 
 #endif //KODICLIENT_H