mirror of
https://github.com/arcan1s/awesome-widgets.git
synced 2025-07-22 18:19:56 +00:00
system source, some code improvements
This commit is contained in:
@ -19,6 +19,8 @@
|
||||
#include "networksource.h"
|
||||
|
||||
#include <QNetworkInterface>
|
||||
#include <QProcess>
|
||||
#include <QTextCodec>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
@ -28,6 +30,12 @@ NetworkSource::NetworkSource(QObject *_parent, const QStringList &_args)
|
||||
{
|
||||
Q_ASSERT(_args.count() == 0);
|
||||
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_process = new QProcess(nullptr);
|
||||
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
|
||||
connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
|
||||
[=](int, QProcess::ExitStatus) { return updateSsid(); });
|
||||
m_process->waitForFinished(0);
|
||||
}
|
||||
|
||||
|
||||
@ -41,23 +49,9 @@ QVariant NetworkSource::data(const QString &_source)
|
||||
{
|
||||
qCDebug(LOG_ESS) << "Source" << _source;
|
||||
|
||||
if (_source == "network/current/name") {
|
||||
QString device = "lo";
|
||||
QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces();
|
||||
qCInfo(LOG_ESS) << "Devices" << rawInterfaceList;
|
||||
for (auto &interface : rawInterfaceList) {
|
||||
if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack))
|
||||
|| (interface.flags().testFlag(QNetworkInterface::IsPointToPoint)))
|
||||
continue;
|
||||
if (interface.addressEntries().isEmpty())
|
||||
continue;
|
||||
device = interface.name();
|
||||
break;
|
||||
}
|
||||
return device;
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
if (!m_values.contains(_source))
|
||||
run();
|
||||
return m_values.take(_source);
|
||||
}
|
||||
|
||||
|
||||
@ -72,16 +66,66 @@ QVariantMap NetworkSource::initialData(const QString &_source) const
|
||||
data["name"] = "Current network device name";
|
||||
data["type"] = "QString";
|
||||
data["units"] = "";
|
||||
} else if (_source == "network/current/ssid") {
|
||||
data["min"] = "";
|
||||
data["max"] = "";
|
||||
data["name"] = "Current SSID name";
|
||||
data["type"] = "QString";
|
||||
data["units"] = "";
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
|
||||
void NetworkSource::run()
|
||||
{
|
||||
m_values["network/current/name"] = NetworkSource::getCurrentDevice();
|
||||
m_process->start("iwgetid -r");
|
||||
}
|
||||
|
||||
|
||||
QStringList NetworkSource::sources() const
|
||||
{
|
||||
QStringList sources;
|
||||
sources.append("network/current/name");
|
||||
sources.append("network/current/ssid");
|
||||
|
||||
return sources;
|
||||
}
|
||||
|
||||
|
||||
void NetworkSource::updateSsid()
|
||||
{
|
||||
qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
|
||||
QString qdebug
|
||||
= QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
|
||||
qCInfo(LOG_ESS) << "Error" << qdebug;
|
||||
QString qoutput
|
||||
= QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
|
||||
qCInfo(LOG_ESS) << "Output" << qoutput;
|
||||
|
||||
m_values["network/current/ssid"] = qoutput;
|
||||
}
|
||||
|
||||
|
||||
QString NetworkSource::getCurrentDevice()
|
||||
{
|
||||
qCDebug(LOG_ESS) << "Get current devices";
|
||||
|
||||
QString device = "lo";
|
||||
auto rawInterfaceList = QNetworkInterface::allInterfaces();
|
||||
qCInfo(LOG_ESS) << "Devices" << rawInterfaceList;
|
||||
|
||||
for (auto &interface : rawInterfaceList) {
|
||||
if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack))
|
||||
|| (interface.flags().testFlag(QNetworkInterface::IsPointToPoint)))
|
||||
continue;
|
||||
if (interface.addressEntries().isEmpty())
|
||||
continue;
|
||||
device = interface.name();
|
||||
break;
|
||||
}
|
||||
|
||||
return device;
|
||||
}
|
||||
|
Reference in New Issue
Block a user