Skip to content
Snippets Groups Projects
Commit 2bf79154 authored by am0ebe's avatar am0ebe
Browse files

search for file ending with json/xml in appdir and use as default if no...

 search for file ending with json/xml in appdir and use as default if no settings/config is specified as arg
parent 00b0b837
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@
#include "../utils.h"
#include "../cam.h"
#include "qdebug.h"
#include "qobjectdefs.h"
#include <QCoreApplication>
#include <QTimer>
......@@ -16,6 +17,9 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationVersion(utils::getVersion());
QCoreApplication::setApplicationName("recorder");
qDebug() << utils::getFirstFileInAppDirEndingWith("json");
qDebug() << utils::getFirstFileInAppDirEndingWith("xml");
//parse args
QStringList arguments = a.arguments();
for (int i = 1; i < arguments.size(); ++i)
......
......@@ -157,17 +157,19 @@ QString configFile(QString filename)
{
static QString _configFile;
if( _configFile.isEmpty() )
{
if(filename.isEmpty())
{
_configFile = QCoreApplication::applicationDirPath() + "/config.json" ; //default
}
else
{
_configFile = filename;
}
}
return _configFile;
_configFile = filename;
return _configFile.isEmpty() ? utils::getFirstFileInAppDirEndingWith("json") : _configFile;
}
QString getFirstFileInAppDirEndingWith( QString const& suffix )
{
QDir dir(QCoreApplication::applicationDirPath());
QStringList files = dir.entryList(QStringList() << "*."+suffix, QDir::Files);
// QStringList const folders = source.entryList(QDir::NoDot | QDir::NoDotDot | QDir::Dirs);
// auto file = QCoreApplication::applicationDirPath()+QDir::separator()+files.first();
auto file = files.first();
return files.isEmpty() || suffix.isEmpty() ? QString() : file;
}
// optional - only set cam settings when they changed
......@@ -175,13 +177,11 @@ QString settingsFile(QString filename)
{
static QString _settingsFile;
if( _settingsFile.isEmpty() )
{
if(filename.isEmpty())
_settingsFile = QCoreApplication::applicationDirPath() + "/settings.xml" ; //default
else
_settingsFile = filename;
}
return _settingsFile;
}
_settingsFile = filename;
return _settingsFile.isEmpty() ? utils::getFirstFileInAppDirEndingWith("xml") : _settingsFile;
}
} // namespace utils
......@@ -13,9 +13,11 @@ class QDir;
namespace utils
{
bool parseConfig(QList<QPair<QString,QString>>& parsedCameras);
bool parseConfig(QList<QPair<QString,QString>>&);
QString configFile(QString filename="");
QString settingsFile(QString filename="");
QString getFirstFileInAppDirEndingWith( QString const&);
const QStringList getVersions();
const QString getVersion();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment