From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 27 Oct 2011 23:16:46 +0000 (+0200)
Subject: cec: added -sf and --short-log-file, which only log the actual messages, not the... 
X-Git-Tag: upstream/2.2.0~1^2~203
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=8bc454769d048179ac5ad47f15b7df4d494ec510;p=deb_libcec.git

cec: added -sf and --short-log-file, which only log the actual messages, not the level and timestamp
---

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index be3018c..ad22a12 100644
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -47,8 +47,10 @@ using namespace std;
 #define CEC_TEST_CLIENT_VERSION 8
 
 #include <cecloader.h>
+
 int g_cecLogLevel = CEC_LOG_ALL;
 ofstream g_logOutput;
+bool g_bShortLog = false;
 
 inline bool HexStrToInt(const std::string& data, uint8_t& value)
 {
@@ -131,12 +133,17 @@ void flush_log(ICECAdapter *cecParser)
         break;
       }
 
-      CStdString strMessageTmp;
-      strMessageTmp.Format("[%16lld]\t%s", message.time, message.message);
-      cout << strLevel.c_str() << strMessageTmp.c_str() << endl;
+      CStdString strFullLog;
+      strFullLog.Format("%s[%16lld]\t%s", strLevel.c_str(), message.time, message.message);
+      cout << strFullLog.c_str() << endl;
 
       if (g_logOutput.is_open())
-        g_logOutput << strLevel.c_str() << strMessageTmp.c_str() << endl;
+      {
+        if (g_bShortLog)
+          g_logOutput << message.message << endl;
+        else
+          g_logOutput << strFullLog.c_str() << endl;
+      }
     }
   }
 }
@@ -169,12 +176,17 @@ void show_help(const char* strExec)
       strExec << " {-h|--help|-l|--list-devices|[COM PORT]}" << endl <<
       endl <<
       "parameters:" << endl <<
-      "\t-h --help            Shows this help text" << endl <<
-      "\t-l --list-devices    List all devices on this system" << endl <<
-      "\t-f --log-file {file} Writes all libCEC log message to a file" << endl <<
-      "\t[COM PORT]           The com port to connect to. If no COM port is given, the client tries to connect to the first device that is detected" << endl <<
+      "  -h --help                   Shows this help text" << endl <<
+      "  -l --list-devices           List all devices on this system" << endl <<
+      "  -f --log-file {file}        Writes all libCEC log message to a file" << endl <<
+      "  -sf --short-log-file {file} Writes all libCEC log message without timestamps" << endl <<
+      "                              and log levels to a file." << endl <<
+      "  [COM PORT]                  The com port to connect to. If no COM" << endl <<
+      "                              port is given, the client tries to connect to the" << endl <<
+      "                              first device that is detected." << endl <<
       endl <<
-      "Type 'h' or 'help' and press enter after starting the client to display all available commands" << endl;
+      "Type 'h' or 'help' and press enter after starting the client to display all " << endl <<
+      "available commands" << endl;
 }
 
 void show_console_help(void)
@@ -241,14 +253,13 @@ int main (int argc, char *argv[])
   int iArgPtr = 0;
   if (argc >= 3)
   {
-    if (!strcmp(argv[1], "-f"))
-    {
-      g_logOutput.open(argv[2]);
-      iArgPtr = 2;
-    }
-    else if (!strcmp(argv[1], "--file"))
+    if (!strcmp(argv[1], "-f") ||
+        !strcmp(argv[1], "--log-file") ||
+        !strcmp(argv[1], "-sf") ||
+        !strcmp(argv[1], "--short-log-file"))
     {
       g_logOutput.open(argv[2]);
+      g_bShortLog = (!strcmp(argv[1], "-sf") || !strcmp(argv[1], "--short-log-file"));
       iArgPtr = 2;
     }
   }