* make commandline argument parsing a little nicer.

* added preparse method
* removed debug message
* added deamonize function again

Signed-off-by: Christian Linke <christian.linke@bmw.de>

4 files changed, 140 insertions, 68 deletions

diff --git a/AudioManagerDaemon/src/CAmCommandSender.cpp b/AudioManagerDaemon/src/CAmCommandSender.cpp
index d864981..0803dc8 100644
--- a/AudioManagerDaemon/src/CAmCommandSender.cpp
+++ b/AudioManagerDaemon/src/CAmCommandSender.cpp
@@ -27,6 +27,7 @@
 #include <sstream>
 #include <string>
 #include <cstring>
+#include <stdexcept>
 #include "CAmCommandReceiver.h"
 #include "TAmPluginTemplate.h"
 #include "CAmDltWrapper.h"
@@ -53,6 +54,12 @@ CAmCommandSender::CAmCommandSender(const std::vector<std::string>& listOfPluginD
         mListLibraryNames(), //
         mCommandReceiver()
 {
+    if (listOfPluginDirectories.empty())
+    {
+        logError("CAmCommandSender::CAmCommandSender: List of commandplugins is empty");
+        throw std::runtime_error("List of commandplugins is empty!");
+    }
+
     std::vector<std::string> sharedLibraryNameList;
     std::vector<std::string>::const_iterator dirIter = listOfPluginDirectories.begin();
     std::vector<std::string>::const_iterator dirIterEnd = listOfPluginDirectories.end();
diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp
index a064e53..2dd7757 100644
--- a/AudioManagerDaemon/src/CAmRoutingSender.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp
@@ -29,6 +29,7 @@
 #include <cassert>
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 #include "CAmRoutingReceiver.h"
 #include "TAmPluginTemplate.h"
 #include "CAmDltWrapper.h"
@@ -51,6 +52,13 @@ CAmRoutingSender::CAmRoutingSender(const std::vector<std::string>& listOfPluginD
         mMapHandleInterface(), //
         mpRoutingReceiver()
 {
+
+    if (listOfPluginDirectories.empty())
+    {
+        logError("CAmRoutingSender::CAmRoutingSender: List of routingplugins is empty");
+        throw std::runtime_error("List of routingplugins is empty!");
+    }
+
     std::vector<std::string> sharedLibraryNameList;
     std::vector<std::string>::const_iterator dirIter = listOfPluginDirectories.begin();
     std::vector<std::string>::const_iterator dirIterEnd = listOfPluginDirectories.end();
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index 6891a5c..db9c210 100755
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -20,13 +20,6 @@
  *
  */
 
-/**
- * \todo create systemd compatibility
- * \todo all communication like all plugins loaded etc...
- * \todo check the startup sequence. Dbus shall be activated last...
- * \bug package generation only works if package directory exists...
- */
-
 #include "config.h"
 
 #ifdef  WITH_TELNET
@@ -88,12 +81,11 @@ using namespace am;
 DLT_DECLARE_CONTEXT(AudioManager)
 
 //we need these because we parse them beforehand.
-std::string controllerPlugin = std::string(CONTROLLER_PLUGIN);
 std::vector<std::string> listCommandPluginDirs;
 std::vector<std::string> listRoutingPluginDirs;
 
 //commandline options used by the Audiomanager itself
-TCLAP::ValueArg<std::string> controllerPlugin_("c","controllerPlugin","use controllerPlugin full path with .so ending",false,CONTROLLER_PLUGIN,"string");
+TCLAP::ValueArg<std::string> controllerPlugin("c","controllerPlugin","use controllerPlugin full path with .so ending",false,CONTROLLER_PLUGIN,"string");
 TCLAP::ValueArg<std::string> additionalCommandPluginDirs("L","additionalCommandPluginDirs","additional path for looking for command plugins, can be used after -l option",false," ","string");
 TCLAP::ValueArg<std::string> additionalRoutingPluginDirs("R","additionalRoutingPluginDirs","additional path for looking for routing plugins, can be used after -r option ",false," ","string");
 TCLAP::ValueArg<std::string> routingPluginDir("r","RoutingPluginDir","path for looking for routing plugins",false," ","string");
@@ -104,6 +96,8 @@ TCLAP::ValueArg<unsigned int> maxConnections ("m","maxConnections","Maximal numb
 TCLAP::SwitchArg dbusWrapperTypeBool ("t","dbusType","DbusType to be used by CAmDbusWrapper: if option is selected, DBUS_SYSTEM is used otherwise DBUS_SESSION",false);
 TCLAP::SwitchArg enableNoDLTDebug ("V","logDlt","print DLT logs to stdout",false);
 TCLAP::SwitchArg currentSettings("i","currentSettings","print current settings and exit",false);
+TCLAP::SwitchArg daemonizeAM("d","daemonize","daemonize Audiomanager. Better use systemd...",false);
+
 int fd0, fd1, fd2;
 
 #ifdef WITH_DBUS_WRAPPER
@@ -171,42 +165,39 @@ void daemonize()
     }
 }
 
-/**
- * parses the command line just for the arguments we need before starting the plugins.
- * @param argc
- * @param argv
- */
-void parseCommandLine(int argc, char** argv)
+
+
+void printCmdInformation()
 {
-	for (int i = 1; i < argc; ++i)
+	printf("\n\n\nCurrent settings:\n\n");
+	printf("\tAudioManagerDaemon Version:\t\t%s\n", DAEMONVERSION);
+#ifdef WITH_TELNET
+	printf("\tTelnet portNumber:\t\t\t%i\n", telnetPort.getValue());
+	printf("\tTelnet maxConnections:\t\t\t%i\n", maxConnections.getValue());
+#endif
+#ifdef WITH_DATABASE_STORAGE
+	printf("\tSqlite Database path:\t\t\t%s\n", databasePath.getValue().c_str());
+#endif
+#ifndef WITH_DLT
+	printf("\tDlt Command Line Output: \t\t%s\n", enableNoDLTDebug.getValue()?"enabled":"not enabled");
+#endif
+	printf("\tControllerPlugin: \t\t\t%s\n", controllerPlugin.getValue().c_str());
+	printf("\tDirectories of CommandPlugins: \t\t\n");
+    std::vector<std::string>::const_iterator dirIter = listCommandPluginDirs.begin();
+    std::vector<std::string>::const_iterator dirIterEnd = listCommandPluginDirs.end();
+    for (; dirIter < dirIterEnd; ++dirIter)
     {
-		std::string arg = argv[i];
-
-        if (arg=="-c")
-        {
-        	controllerPlugin = std::string(argv[++i]);
-			assert(!controllerPlugin.empty());
-			assert(controllerPlugin.find(".so")!=std::string::npos);
-        }
-        else if (arg=="-l")
-        {
-            listCommandPluginDirs.clear();
-            listCommandPluginDirs.push_back(std::string(argv[++i]));
-        }
-        else if (arg=="-L")
-        {
-            listCommandPluginDirs.push_back(std::string(argv[++i]));
-        }
-        else if (arg=="-r")
-        {
-        	listRoutingPluginDirs.clear();
-        	listRoutingPluginDirs.push_back(std::string(argv[++i]));
-        }
-        else if (arg=="-R")
-        {
-        	listRoutingPluginDirs.push_back(std::string(argv[++i]));
-        }
+    	printf("\t                              \t\t%s\n", dirIter->c_str());
     }
+
+	printf("\tDirectories of RoutingPlugins: \t\t\n");
+    dirIter = listRoutingPluginDirs.begin();
+    dirIterEnd = listRoutingPluginDirs.end();
+    for (; dirIter < dirIterEnd; ++dirIter)
+    {
+    	printf("\t                              \t\t%s\n", dirIter->c_str());
+    }
+	exit(0);
 }
 
 /**
@@ -256,13 +247,13 @@ void mainProgram(int argc, char *argv[])
     try
     {
     	TCLAP::CmdLine* cmd(CAmCommandLineSingleton::instanciateOnce("The team of the AudioManager wishes you a nice day!",' ',DAEMONVERSION,true));
-
-    	cmd->add(controllerPlugin_);
+    	cmd->add(controllerPlugin);
     	cmd->add(additionalCommandPluginDirs);
     	cmd->add(commandPluginDir);
     	cmd->add(additionalRoutingPluginDirs);
     	cmd->add(routingPluginDir);
     	cmd->add(currentSettings);
+    	cmd->add(daemonizeAM);
 #ifndef WITH_DLT
     	cmd->add(enableNoDLTDebug);
 #endif
@@ -280,56 +271,66 @@ void mainProgram(int argc, char *argv[])
     catch (TCLAP::ArgException &e)  // catch any exceptions
     { std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; }
 
-
     //hen and egg. We need to parse a part of the commandline options to get the paths of the controller and the plugins.
     //So we do some little parsing first and the real parsing later so that the plugins can profit from that.
-    parseCommandLine(argc, (char**) argv);
+    CAmCommandLineSingleton::instance()->preparse(argc,argv);
+	if (daemonizeAM.getValue())
+	{
+		daemonize();
+	}
+
+    CAmDltWrapper::instance(enableNoDLTDebug.getValue())->registerApp("AudioManagerDeamon", "AudioManagerDeamon");
+    CAmDltWrapper::instance()->registerContext(AudioManager, "Main", "Main Context");
 
     //Instantiate all classes. Keep in same order !
     CAmSocketHandler iSocketHandler;
 
+    if(commandPluginDir.isSet())
+    {
+    	listCommandPluginDirs.clear();
+    	listCommandPluginDirs.push_back(commandPluginDir.getValue());
+    }
+
+    if (additionalCommandPluginDirs.isSet())
+    {
+    	listCommandPluginDirs.push_back(additionalCommandPluginDirs.getValue());
+    }
+
+    if(routingPluginDir.isSet())
+    {
+    	listRoutingPluginDirs.clear();
+    	listRoutingPluginDirs.push_back(routingPluginDir.getValue());
+    }
+
+    if (additionalRoutingPluginDirs.isSet())
+    {
+    	listRoutingPluginDirs.push_back(additionalRoutingPluginDirs.getValue());
+    }
+
     //in this place, the plugins can get the gloval commandlineparser via CAmCommandLineSingleton::instance() and add their options to the commandline
     //this must be done in the constructor.
     //later when the plugins are started, the commandline is already parsed and the objects defined before can be used to get the neccesary information
 
     CAmRoutingSender iRoutingSender(listRoutingPluginDirs);
     CAmCommandSender iCommandSender(listCommandPluginDirs);
-    CAmControlSender iControlSender(controllerPlugin,&iSocketHandler);
+    CAmControlSender iControlSender(controllerPlugin.getValue(),&iSocketHandler);
 
     try
     {
     	//parse the commandline options
+    	CAmCommandLineSingleton::instance()->reset();
     	CAmCommandLineSingleton::instance()->parse(argc,argv);
     	if (currentSettings.getValue())
     	{
-    		printf("Current settings:\n");
-			printf("\tAudioManagerDaemon Version:\t\t%s\n", DAEMONVERSION);
-#ifdef WITH_TELNET
-			printf("\tTelnet portNumber:\t\t\t%i\n", telnetPort.getValue());
-			printf("\tTelnet maxConnections:\t\t\t%i\n", maxConnections.getValue());
-#endif
-#ifdef WITH_DATABASE_STORAGE
-			printf("\tSqlite Database path:\t\t\t%s\n", databasePath.getValue().c_str());
-#endif
-#ifndef WITH_DLT
-			printf("\tDlt Command Line Output: \t\t%s\n", enableNoDLTDebug.getValue()?"enabled":"not enabled");
-#endif
-			printf("\tControllerPlugin: \t\t\t%s\n", controllerPlugin.c_str());
-			printf("\tDirectory of CommandPlugins: \t\t%s\n", listCommandPluginDirs.front().c_str());
-			printf("\tDirectory of RoutingPlugins: \t\t%s\n", listRoutingPluginDirs.front().c_str());
-			exit(0);
+    		printCmdInformation();
     	}
     }
     catch (TCLAP::ArgException &e)  // catch any exceptions
     { std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; }
 
-    CAmDltWrapper::instance(enableNoDLTDebug.getValue())->registerApp("AudioManagerDeamon", "AudioManagerDeamon");
-    CAmDltWrapper::instance()->registerContext(AudioManager, "Main", "Main Context");
     logInfo("The Audiomanager is started");
     logInfo("The version of the Audiomanager", DAEMONVERSION);
 
-
-
 #ifdef WITH_CAPI_WRAPPER
     //We instantiate a singleton with the current socket handler, which loads the common-api runtime.
     CAmCommonAPIWrapper *pCAPIWrapper = CAmCommonAPIWrapper::instantiateOnce(&iSocketHandler);
@@ -410,7 +411,6 @@ void mainProgram(int argc, char *argv[])
 int main(int argc, char *argv[], char** envp)
 {
     (void) envp;
-    printf("bla %s",DEFAULT_PLUGIN_COMMAND_DIR);
     listCommandPluginDirs.push_back(std::string(DEFAULT_PLUGIN_COMMAND_DIR));
     listRoutingPluginDirs.push_back(std::string(DEFAULT_PLUGIN_ROUTING_DIR));
 
diff --git a/tclap-1.2.1/include/tclap/CmdLine.h b/tclap-1.2.1/include/tclap/CmdLine.h
index 0fec8d8..e8d7da1 100644
--- a/tclap-1.2.1/include/tclap/CmdLine.h
+++ b/tclap-1.2.1/include/tclap/CmdLine.h
@@ -242,6 +242,20 @@ private:
 		void parse(int argc, const char * const * argv);
 
 		/**
+		 * Parses the command line but does not process help.
+		 * \param args - A vector of strings representing the args.
+		 * args[0] is still the program name.
+		 */
+		void preparse(std::vector<std::string>& args);
+
+		/**
+		 * Parses the command line but does not process help.
+		 * \param argc - Number of arguments.
+		 * \param argv - Array of arguments.
+		 */
+		void preparse(int argc, const char * const * argv);
+
+		/**
 		 * Parses the command line.
 		 * \param args - A vector of strings representing the args.
 		 * args[0] is still the program name.
@@ -441,6 +455,49 @@ inline void CmdLine::parse(int argc, const char * const * argv)
 		parse(args);
 }
 
+inline void CmdLine::preparse(int argc, const char * const * argv)
+{
+		// this step is necessary so that we have easy access to
+		// mutable strings.
+		std::vector<std::string> args;
+		for (int i = 0; i < argc; i++)
+			args.push_back(argv[i]);
+
+		preparse(args);
+}
+
+inline void CmdLine::preparse(std::vector<std::string>& args)
+{
+	bool shouldExit = false;
+	int estat = 0;
+
+	try {
+
+		_progName = args.front();
+		args.erase(args.begin());
+
+		int requiredCount = 0;
+
+		for (int i = 0; static_cast<unsigned int>(i) < args.size(); i++)
+		{
+			bool matched = false;
+			for (ArgListIterator it = _argList.begin();
+				 it != _argList.end(); it++) {
+				if ( (*it)->processArg( &i, args ) )
+				{
+					requiredCount += _xorHandler.check( *it );
+					matched = true;
+					break;
+				}
+			}
+		}
+	} catch ( ArgException& e ) {
+	try {
+		_output->failure(*this,e);
+		} catch ( ExitException &ee ) {}
+	} catch (ExitException &ee) {}
+}
+
 inline void CmdLine::parse(std::vector<std::string>& args)
 {
 	bool shouldExit = false;