diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/src/main.cpp b/src/main.cpp index 9e92361..0e3ce53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,7 @@ void printHelp() qout << "-u <URL>, --url=<URL> " << QObject::tr("Set which URL to load.") << endl; qout << "-d <dir>, --download=<dir> " << QObject::tr("Specify the download directory.") << endl; qout << "-c <path>, --config=<path> " << QObject::tr("Path to config file.") << endl; - qout << "-D, --debug " << QObject::tr("Activate debug mode.") << endl; + qout << "-D <level>, --debug=<level> " << QObject::tr("Activate debug mode.") << endl; qout << "-h, --help " << QObject::tr("Prints usage information.") << endl; qout.flush(); exit(EXIT_SUCCESS); @@ -34,12 +34,13 @@ int main(int argc, char *argv[]) // parse command line arguments QMap<QString, QString> clOpts; int longIndex = 0; - static const char *optString = "u:d:c:t:D:h"; + static const char *optString = "c:u:d:s:t:D:h"; static const struct option longOpts[] = { + {"config", required_argument, NULL, 'c'}, {"url", required_argument, NULL, 'u'}, {"download", required_argument, NULL, 'd'}, - {"config", required_argument, NULL, 'c'}, + {"serial", required_argument, NULL, 's'}, {"trigger", required_argument, NULL, 't'}, {"debug", required_argument, NULL, 'D'}, {"help", no_argument, NULL, 'h'} @@ -110,14 +111,6 @@ int main(int argc, char *argv[]) else { baseURL = DEFAULT_URL; } - - // sets which file to watch to trigger loading of URL - if (clOpts.contains("trigger")) - fileToTriggerURL = clOpts.value("trigger"); - else if (confFileSettings.contains("default/file_trigger")) - fileToTriggerURL = confFileSettings.value("default/file_trigger").toString(); - else - fileToTriggerURL = DEFAULT_FILE_TRIGGER; // setting directory for downloads if (clOpts.contains("downloadDir")){ @@ -134,12 +127,31 @@ int main(int argc, char *argv[]) } else updateInterval = DEFAULT_UPDATE_INTERVAL; + // sets which file to watch to trigger loading of URL + if (clOpts.contains("trigger")) + fileToTriggerURL = clOpts.value("trigger"); + else if (confFileSettings.contains("default/file_trigger")) + fileToTriggerURL = confFileSettings.value("default/file_trigger").toString(); + else + fileToTriggerURL = DEFAULT_FILE_TRIGGER; + + // set serial location + if (clOpts.contains("serial")) + serialLocation = clOpts.value("serial"); + else if (confFileSettings.contains("default/serial_location")) + serialLocation = confFileSettings.value("default/serial_location").toString(); + else + serialLocation = QString("/serial"); + // basic std out engine is ugly... not yet initialised so using qDebug - qDebug() << "debugMode: " << debugMode; + + qDebug() << "************* CONFIG INFO *************"; qDebug() << "configFilePath: " << configFilePath; qDebug() << "baseURL: " << baseURL; qDebug() << "downloadDir : " << downloadPath; qDebug() << "trigger: " << fileToTriggerURL; + qDebug() << "serialLocation: " << serialLocation; + qDebug() << "*******************************************"; // start fbgui fbgui gui; |