From b1e455b97641c05c93744c3830deb1ea09e6d8a7 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 6 Apr 2014 13:08:32 +0400 Subject: [PATCH] changed de configuration --- sources/CMakeLists.txt | 2 +- sources/dataengine/netctl.cpp | 50 +++++++++++++++-------------------- sources/dataengine/netctl.h | 21 ++++++++------- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 545dd44..cb4ef58 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW) project (netctl-plasmoid) set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 0) -set (PROJECT_VERSION_PATCH 2) +set (PROJECT_VERSION_PATCH 3) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp index 9dcff79..e4609e3 100644 --- a/sources/dataengine/netctl.cpp +++ b/sources/dataengine/netctl.cpp @@ -52,11 +52,11 @@ QStringList Netctl::sources() const bool Netctl::readConfiguration() { // default configuration - checkExtIP = QString("false"); - cmd = QString("/usr/bin/netctl"); - extIpCmd = QString("wget -qO- http://ifconfig.me/ip"); - ipCmd = QString("/usr/bin/ip"); - netDir = QString("/sys/class/net/"); + configuration[QString("CMD")] = QString("/usr/bin/netctl"); + configuration[QString("EXTIP")] = QString("false"); + configuration[QString("EXTIPCMD")] = QString("wget -qO- http://ifconfig.me/ip"); + configuration[QString("IPCMD")] = QString("/usr/bin/ip"); + configuration[QString("NETDIR")] = QString("/sys/class/net/"); QString fileStr; // FIXME: define configuration file @@ -72,18 +72,10 @@ bool Netctl::readConfiguration() while (true) { fileStr = QString(confFile.readLine()); if (fileStr[0] != '#') { - if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2) { - if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("EXTIP")) - checkExtIP = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("CMD")) - cmd = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("EXTIPCMD")) - extIpCmd = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("IPCMD")) - ipCmd = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("NETDIR")) - netDir = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0]; - } + if (fileStr.contains(QString("="))) + configuration[fileStr.split(QString("="))[0]] = fileStr.split(QString("="))[1] + .remove(QString(" ")) + .trimmed(); } if (confFile.atEnd()) break; @@ -107,7 +99,7 @@ bool Netctl::updateSourceEvent(const QString &source) QString value = QString(""); if (source == QString("currentProfile")) { - command.start(cmd + QString(" list")); + command.start(configuration[QString("CMD")] + QString(" list")); command.waitForFinished(-1); cmdOutput = command.readAllStandardOutput(); if (!cmdOutput.isEmpty()) { @@ -121,8 +113,8 @@ bool Netctl::updateSourceEvent(const QString &source) setData(source, QString("value"), value); } else if (source == QString("extIp")) { - if (checkExtIP == QString("true")) { - command.start(extIpCmd); + if (configuration[QString("EXTIP")] == QString("true")) { + command.start(configuration[QString("EXTIPCMD")]); command.waitForFinished(-1); cmdOutput = command.readAllStandardOutput(); if (!cmdOutput.isEmpty()) @@ -131,18 +123,18 @@ bool Netctl::updateSourceEvent(const QString &source) setData(source, QString("value"), value); } else if (source == QString("interfaces")) { - if (QDir(netDir).exists()) - value = QDir(netDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot).join(QString(",")); + if (QDir(configuration[QString("NETDIR")]).exists()) + value = QDir(configuration[QString("NETDIR")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot).join(QString(",")); setData(source, QString("value"), value); } else if (source == QString("intIp")) { - if (QDir(netDir).exists()) { + if (QDir(configuration[QString("NETDIR")]).exists()) { value = QString("127.0.0.1/8"); - QStringList netDevices = QDir(netDir).entryList(QDir::Dirs | QDir::NoDotAndDotDot); + QStringList netDevices = QDir(configuration[QString("NETDIR")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot); for (int i=0; i configuration; +// // enable check external IP +// QString checkExtIP; +// // path to netctl command +// QString cmd; +// // command to check external IP +// QString extIpCmd; +// // path to ip command +// QString ipCmd; +// // path to directory with network device configuration +// QString netDir; };