arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

update to new process api

Browse Source
This commit is contained in:
Evgenii Alekseev 2020-11-01 14:33:17 +03:00
parent 8eaf444a25
commit e81d765098
9 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/awesome-widget/plugin/awactions.cpp
View File

@ -78,13 +78,13 @@ bool AWActions::isDebugEnabled()
} }
bool AWActions::runCmd(const QString &_cmd) bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
{ {
qCDebug(LOG_AW) << "Cmd" << _cmd; qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
sendNotification(QString("Info"), i18n("Run %1", _cmd)); sendNotification(QString("Info"), i18n("Run %1", _cmd));
return QProcess::startDetached(_cmd); return QProcess::startDetached(_cmd, _args);
} }

2
sources/awesome-widget/plugin/awactions.h
View File

@ -35,7 +35,7 @@ public:
Q_INVOKABLE void checkUpdates(const bool _showAnyway = false); Q_INVOKABLE void checkUpdates(const bool _showAnyway = false);
Q_INVOKABLE static QString getFileContent(const QString &_path); Q_INVOKABLE static QString getFileContent(const QString &_path);
Q_INVOKABLE static bool isDebugEnabled(); Q_INVOKABLE static bool isDebugEnabled();
Q_INVOKABLE static bool runCmd(const QString &_cmd); Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);
Q_INVOKABLE static void showLegacyInfo(); Q_INVOKABLE static void showLegacyInfo();
Q_INVOKABLE static void showReadme(); Q_INVOKABLE static void showReadme();
// configuration slots // configuration slots

2
sources/awesomewidgets/extscript.cpp
View File

@ -346,7 +346,7 @@ void ExtScript::startProcess()
cmdList.append(prefix()); cmdList.append(prefix());
cmdList.append(executable()); cmdList.append(executable());
qCInfo(LOG_LIB) << "Run cmd" << cmdList.join(' '); qCInfo(LOG_LIB) << "Run cmd" << cmdList.join(' ');
m_process->start(cmdList.join(' ')); m_process->start("sh", QStringList() << "-c" << cmdList);
} }

5
sources/awesomewidgets/extupgrade.cpp
View File

@ -205,9 +205,8 @@ void ExtUpgrade::writeConfiguration() const
void ExtUpgrade::startProcess() void ExtUpgrade::startProcess()
{ {
QString cmd = QString("sh -c \"%1\"").arg(executable()); qCInfo(LOG_LIB) << "Run cmd" << executable();
qCInfo(LOG_LIB) << "Run cmd" << cmd; m_process->start("sh", QStringList() << "-c" << executable());
m_process->start(cmd);
} }

5
sources/extsysmonsources/gpuloadsource.cpp
View File

@ -104,10 +104,11 @@ void GPULoadSource::run()
if ((m_device != "nvidia") && (m_device != "ati")) if ((m_device != "nvidia") && (m_device != "ati"))
return; return;
// build cmd // build cmd
QString cmd = m_device == "nvidia" ? "nvidia-smi -q -x" : "aticonfig --od-getclocks"; QString cmd = m_device == "nvidia" ? "nvidia-smi" : "aticonfig";
auto args = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-getclocks"});
qCInfo(LOG_ESS) << "cmd" << cmd; qCInfo(LOG_ESS) << "cmd" << cmd;
m_process->start(cmd); m_process->start(cmd, args);
} }

5
sources/extsysmonsources/gputempsource.cpp
View File

@ -83,10 +83,11 @@ void GPUTemperatureSource::run()
if ((m_device != "nvidia") && (m_device != "ati")) if ((m_device != "nvidia") && (m_device != "ati"))
return; return;
// build cmd // build cmd
QString cmd = m_device == "nvidia" ? "nvidia-smi -q -x" : "aticonfig --od-gettemperature"; QString cmd = m_device == "nvidia" ? "nvidia-smi" : "aticonfig";
auto args = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-gettemperature"});
qCInfo(LOG_ESS) << "cmd" << cmd; qCInfo(LOG_ESS) << "cmd" << cmd;
m_process->start(cmd); m_process->start(cmd, args);
} }

10
sources/extsysmonsources/hddtempsource.cpp
View File

@ -32,7 +32,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *_parent, const QStringList &
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_devices = _args.at(0).split(',', Qt::SkipEmptyParts); m_devices = _args.at(0).split(',', Qt::SkipEmptyParts);
m_cmd = _args.at(1); m_cmd = _args.at(1).split(' '); // lets hope no one put cmd with spaces here lol
m_smartctl = m_cmd.contains("smartctl"); m_smartctl = m_cmd.contains("smartctl");
qCInfo(LOG_ESS) << "Parse as smartctl" << m_smartctl; qCInfo(LOG_ESS) << "Parse as smartctl" << m_smartctl;
@ -77,8 +77,12 @@ QVariant HDDTemperatureSource::data(const QString &_source)
QString device = _source; QString device = _source;
device.remove("hdd/temperature"); device.remove("hdd/temperature");
// run cmd // run cmd
if (m_processes[device]->state() == QProcess::NotRunning) if (m_processes[device]->state() == QProcess::NotRunning) {
m_processes[device]->start(QString("%1 %2").arg(m_cmd).arg(device)); auto cmd = m_cmd.first();
auto args = m_cmd.mid(1);
args.append(device);
m_processes[device]->start(cmd, args);
}
return m_values[device]; return m_values[device];
} }

2
sources/extsysmonsources/hddtempsource.h
View File

@ -45,7 +45,7 @@ private:
// properties // properties
QHash<QString, QProcess *> m_processes; QHash<QString, QProcess *> m_processes;
// configuration and values // configuration and values
QString m_cmd; QStringList m_cmd;
QStringList m_devices; QStringList m_devices;
bool m_smartctl; bool m_smartctl;
QHash<QString, QVariant> m_values; QHash<QString, QVariant> m_values;

2
sources/extsysmonsources/networksource.cpp
View File

@ -84,7 +84,7 @@ QVariantMap NetworkSource::initialData(const QString &_source) const
void NetworkSource::run() void NetworkSource::run()
{ {
m_values["network/current/name"] = NetworkSource::getCurrentDevice(); m_values["network/current/name"] = NetworkSource::getCurrentDevice();
m_process->start("iwgetid -r"); m_process->start("iwgetid", QStringList() << "-r");
} }