From 589d2da3d47514b1d0a9291e8d9b170a240040f5 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 22 Mar 2011 13:24:03 +0100 Subject: pbs test page, POST data (hardcoded atm) --- src/main.cpp | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index c5269a7..d35909d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,12 +34,13 @@ int main(int argc, char *argv[]) // parse command line arguments QMap 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,44 @@ 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; + + // 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(); -- cgit v1.2.3-55-g7522