Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui

1 files changed, 30 insertions, 9 deletions

diff --git a/src/main.cpp b/src/main.cpp
index c5269a7..fc75aab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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:D:h";
+    static const char *optString = "u:d:c:t:D:h";
     static const struct option longOpts[] =
     {
     	{"url", required_argument, NULL, 'u'},
     	{"download", required_argument, NULL, 'd'},
     	{"config", required_argument, NULL, 'c'},
+    	{"trigger", required_argument, NULL, 't'},
     	{"debug", required_argument, NULL, 'D'},
     	{"help", no_argument, NULL, 'h'}
     };
@@ -56,6 +57,10 @@ int main(int argc, char *argv[])
             	break;
             case 'c':
             	clOpts.insert("configFile", optarg);
+            	break;
+            case 't':
+            	clOpts.insert("trigger", optarg);
+            	break;
             case 'D':
 	    		clOpts.insert("debug", optarg);
 	    		break;
@@ -99,29 +104,45 @@ int main(int argc, char *argv[])
     if (clOpts.contains("url")) {
     	baseURL = QUrl(clOpts.value("url"));
     }
-    else if (confFileSettings.contains("default/url")) {
-    	baseURL = confFileSettings.value("default/url").toUrl();
+    else if (confFileSettings.contains("default/pbs_url")) {
+    	baseURL = confFileSettings.value("default/pbs_url").toUrl();
     }
     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;
+
+    qDebug() << "file to trigger: " << fileToTriggerURL;
+
     // setting directory for downloads
     if (clOpts.contains("downloadDir")){
     	downloadPath = clOpts.value("downloadDir");
     }
-    else if (confFileSettings.contains("default/downloadDirectory")){
-    	downloadPath = confFileSettings.value("default/downloadDirectory").toString();
+    else if (confFileSettings.contains("default/download_directory")){
+    	downloadPath = confFileSettings.value("default/download_directory").toString();
     }
-    else {
+    else
     	downloadPath = DEFAULT_DOWNLOAD_DIR;
-    }
 
-	if (confFileSettings.contains("default/updateInterval")){
-		updateInterval = confFileSettings.value("default/updateInterval").toInt();
+	if (confFileSettings.contains("default/update_interval")){
+		updateInterval = confFileSettings.value("default/update_interval").toInt();
 	}
 	else updateInterval = DEFAULT_UPDATE_INTERVAL;
 
+	// basic std out engine is ugly... not yet initialised so using qDebug
+	qDebug() << "configFilePath: " << configFilePath;
+	qDebug() << "baseURL: " << baseURL;
+	qDebug() << "downloadDir : " << downloadPath;
+	qDebug() << "trigger: " << fileToTriggerURL;
+
+	// start fbgui
     fbgui gui;
     gui.show();
     return app.exec();