arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-06 02:25:46 +00:00
Code Issues Projects Releases Wiki Activity

yae reading files`

Browse Source
This commit is contained in:
arcan1s
2014-07-21 12:11:30 +04:00
parent 0070f910cc
commit ec5dff4b75
5 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@ -15,7 +15,7 @@ optdepends=('kdebase-runtime: sudo support'
'wpa_supplicant: wifi support') 'wpa_supplicant: wifi support')
source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz") source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
install="${pkgbase}.install" install="${pkgbase}.install"
md5sums=('6299c02a0991b54434baa5b96aeba67b') md5sums=('2290c8a47dceeda69e523143d82680d4')
prepare() { prepare() {

27
sources/dataengine/netctl.cpp
View File

@ -78,26 +78,27 @@ void Netctl::readConfiguration()
QString fileName = KGlobal::dirs()->findResource("config", "netctl.conf"); QString fileName = KGlobal::dirs()->findResource("config", "netctl.conf");
if (debug) qDebug() << "[DE]" << "[readConfiguration]" << ":" << "Configuration file" << fileName; if (debug) qDebug() << "[DE]" << "[readConfiguration]" << ":" << "Configuration file" << fileName;
QFile confFile(fileName); QFile configFile(fileName);
if (!confFile.open(QIODevice::ReadOnly)) { if (!configFile.open(QIODevice::ReadOnly)) {
configuration = updateConfiguration(rawConfig); configuration = updateConfiguration(rawConfig);
return; return;
} }
QString fileStr; QString fileStr;
QStringList value; QStringList value;
while (true) { while (true) {
fileStr = QString(confFile.readLine()).trimmed(); fileStr = QString(configFile.readLine()).trimmed();
if ((fileStr.isEmpty()) && (!confFile.atEnd())) continue; if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!confFile.atEnd())) continue; if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!confFile.atEnd())) continue; if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
if ((!fileStr.contains(QChar('='))) && (!confFile.atEnd())) continue; if (fileStr.contains(QChar('='))) {
value.clear(); value.clear();
for (int i=1; i<fileStr.split(QChar('=')).count(); i++) for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
value.append(fileStr.split(QChar('='))[i]); value.append(fileStr.split(QChar('='))[i]);
rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('=')); rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
if (confFile.atEnd()) break; }
if (configFile.atEnd()) break;
} }
confFile.close(); configFile.close();
configuration = updateConfiguration(rawConfig); configuration = updateConfiguration(rawConfig);
return; return;

4
sources/gui/src/language.cpp
View File

@ -72,8 +72,8 @@ QString Language::defineLanguageFromFile(const QString configPath)
if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue; if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue; if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue; if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
if ((!fileStr.contains(QChar('='))) && (!configFile.atEnd())) continue; if (fileStr.contains(QChar('=')))
settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1]; settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
if (configFile.atEnd()) break; if (configFile.atEnd()) break;
} }
configFile.close(); configFile.close();

4
sources/gui/src/settingswindow.cpp
View File

@ -361,8 +361,8 @@ QMap<QString, QString> SettingsWindow::getSettings()
if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue; if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue; if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue; if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
if ((!fileStr.contains(QChar('='))) && (!configFile.atEnd())) continue; if (fileStr.contains(QChar('=')))
settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1]; settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
if (configFile.atEnd()) break; if (configFile.atEnd()) break;
} }
configFile.close(); configFile.close();

35
sources/plasmoid/netctl.cpp
View File

@ -114,24 +114,25 @@ QMap<QString, QString> Netctl::readDataEngineConfiguration()
QString fileName = KGlobal::dirs()->findResource("config", "netctl.conf"); QString fileName = KGlobal::dirs()->findResource("config", "netctl.conf");
if (debug) qDebug() << "[PLASMOID]" << "[readDataEngineConfiguration]" << ":" << "Configuration file" << fileName; if (debug) qDebug() << "[PLASMOID]" << "[readDataEngineConfiguration]" << ":" << "Configuration file" << fileName;
QFile confFile(fileName); QFile configFile(fileName);
if (!confFile.open(QIODevice::ReadOnly)) if (!configFile.open(QIODevice::ReadOnly))
return updateDataEngineConfiguration(rawConfig); return updateDataEngineConfiguration(rawConfig);
QString fileStr; QString fileStr;
QStringList value; QStringList value;
while (true) { while (true) {
fileStr = QString(confFile.readLine()).trimmed(); fileStr = QString(configFile.readLine()).trimmed();
if ((fileStr.isEmpty()) && (!confFile.atEnd())) continue; if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!confFile.atEnd())) continue; if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!confFile.atEnd())) continue; if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
if ((!fileStr.contains(QChar('='))) && (!confFile.atEnd())) continue; if (fileStr.contains(QChar('='))) {
value.clear(); value.clear();
for (int i=1; i<fileStr.split(QChar('=')).count(); i++) for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
value.append(fileStr.split(QChar('='))[i]); value.append(fileStr.split(QChar('='))[i]);
rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('=')); rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
if (confFile.atEnd()) break; }
if (configFile.atEnd()) break;
} }
confFile.close(); configFile.close();
return updateDataEngineConfiguration(rawConfig); return updateDataEngineConfiguration(rawConfig);
} }
@ -144,14 +145,14 @@ void Netctl::writeDataEngineConfiguration(const QMap<QString, QString> settings)
QMap<QString, QString> config = updateDataEngineConfiguration(settings); QMap<QString, QString> config = updateDataEngineConfiguration(settings);
QString fileName = KGlobal::dirs()->locateLocal("config", "netctl.conf"); QString fileName = KGlobal::dirs()->locateLocal("config", "netctl.conf");
if (debug) qDebug() << "[PLASMOID]" << "[writeDataEngineConfiguration]" << ":" << "Configuration file" << fileName; if (debug) qDebug() << "[PLASMOID]" << "[writeDataEngineConfiguration]" << ":" << "Configuration file" << fileName;
QFile confFile(fileName); QFile configFile(fileName);
if (!confFile.open(QIODevice::WriteOnly)) if (!configFile.open(QIODevice::WriteOnly))
return; return;
for (int i=0; i<config.keys().count(); i++) { for (int i=0; i<config.keys().count(); i++) {
QByteArray string = (config.keys()[i] + QString("=") + config[config.keys()[i]] + QString("\n")).toUtf8(); QByteArray string = (config.keys()[i] + QString("=") + config[config.keys()[i]] + QString("\n")).toUtf8();
confFile.write(string); configFile.write(string);
} }
confFile.close(); configFile.close();
} }